Resolve fragment references under progress in annotator to ensure WebStorm 2017.3 compatibility (#115)

Author: jimkyndemeyer

src/main/com/intellij/lang/jsgraphql/ide/annotator/JSGraphQLAnnotator.java

@@ -59,6 +59,18 @@ public JSGraphQLAnnotationResult collectInformation(@NotNull PsiFile file, @NotN
                 if (buffer.length() > 0) {
                     final String environment = JSGraphQLLanguageInjectionUtil.getEnvironment(file);
                     final AnnotationsResponse annotations = JSGraphQLNodeLanguageServiceClient.getAnnotations(buffer.toString(), file.getProject(), environment);
+                    if(annotations != null) {
+                        for (Annotation annotation : annotations.getAnnotations()) {
+                            LogicalPosition from = getLogicalPosition(annotation.getFrom());
+                            int fromOffset = editor.logicalPositionToOffset(from);
+                            final PsiElement errorElement = getPsiElementAtErrorOffset(file, fromOffset);
+                            if(errorElement instanceof JSGraphQLErrorContextAware) {
+                                final String message = StringUtils.substringBefore(annotation.getMessage(), "\n");
+                                final JSGraphQLErrorContextAware errorContextAware = (JSGraphQLErrorContextAware) errorElement;
+                                annotation.setErrorInContext(errorContextAware.isErrorInContext(message));
+                            }
+                        }
+                    }
                     return new JSGraphQLAnnotationResult(annotations, editor);
                 }
             } else if(file instanceof JSGraphQLSchemaFile) {
@@ -108,19 +120,16 @@ public void visitElement(PsiElement element) {
                     return;
                 }
                 for (Annotation annotation : annotationsReponse.getAnnotations()) {
+                    if(!annotation.isErrorInContext()) {
+                        continue;
+                    }
                     LogicalPosition from = getLogicalPosition(annotation.getFrom());
                     LogicalPosition to = getLogicalPosition(annotation.getTo());
                     int fromOffset = editor.logicalPositionToOffset(from);
                     int toOffset = editor.logicalPositionToOffset(to);
                     HighlightSeverity severity = "error".equals(annotation.getSeverity()) ? HighlightSeverity.ERROR : HighlightSeverity.WARNING;
                     if (fromOffset < toOffset) {
                         final String message = StringUtils.substringBefore(annotation.getMessage(), "\n");
-                        final PsiElement errorElement = getPsiElementAtErrorOffset(file, fromOffset);
-                        if(errorElement instanceof JSGraphQLErrorContextAware) {
-                            if(!((JSGraphQLErrorContextAware) errorElement).isErrorInContext(message)) {
-                                continue;
-                            }
-                        }
                         holder.createAnnotation(severity, TextRange.create(fromOffset, toOffset), message);
                         errors.add(new JSGraphQLErrorResult(message, fileName, annotation.getSeverity(), from.line+1, from.column+1)); // +1 is for UI lines/columns
                     }

src/main/com/intellij/lang/jsgraphql/languageservice/api/Annotation.java

@@ -15,6 +15,8 @@ public class Annotation {
     private Pos from;
     private Pos to;
 
+    private boolean errorInContext = true;
+
     public String getMessage() {
         return message;
     }
@@ -34,4 +36,12 @@ public Pos getFrom() {
     public Pos getTo() {
         return to;
     }
+
+    public boolean isErrorInContext() {
+        return errorInContext;
+    }
+
+    public void setErrorInContext(boolean errorInContext) {
+        this.errorInContext = errorInContext;
+    }
 }