Fixed compatibility with 211, split schema validation to a separate annotator

Author: vepanimas

gradle.properties

@@ -7,7 +7,7 @@ pluginGroup = com.intellij.lang.jsgraphql
 pluginName = JS GraphQL
 pluginVersion = 2.7.0
 pluginSinceBuild = 192.7142
-pluginUntilBuild = 203.*
+pluginUntilBuild = 211.*
 
 platformType = IU
 platformVersion = IU-LATEST-EAP-SNAPSHOT

resources/META-INF/plugin.xml

@@ -79,6 +79,7 @@
     <lang.syntaxHighlighterFactory language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.GraphQLSyntaxHighlighterFactory"/>
     <annotator language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.GraphQLSyntaxAnnotator" />
     <annotator language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.GraphQLValidationAnnotator" />
+    <annotator language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.GraphQLSchemaValidationAnnotator" />
     <colorSettingsPage implementation="com.intellij.lang.jsgraphql.ide.GraphQLColorSettingsPage"/>
 
     <!-- Formatting and folding -->

src/main/com/intellij/lang/jsgraphql/ide/GraphQLRelayModernAnnotationFilter.java

@@ -34,18 +34,18 @@ public static GraphQLRelayModernAnnotationFilter getService(@NotNull Project pro
 
 
     public boolean errorIsIgnored(PsiElement errorPsiElement) {
-        if (settings.isEnableRelayModernFrameworkSupport()) {
-            final GraphQLArguments graphQLArguments = PsiTreeUtil.getParentOfType(errorPsiElement, GraphQLArguments.class);
-            if (graphQLArguments != null) {
-                final GraphQLDirective directive = PsiTreeUtil.getParentOfType(errorPsiElement, GraphQLDirective.class);
-                if (directive != null) {
-                    final String directiveName = directive.getName();
-                    if ("argumentDefinitions".equals(directiveName) || "arguments".equals(directiveName)) {
-                        // ignore errors inside on the dynamically named arguments to @argumentDefinitions and @arguments
-                        // since the SDL can express this dynamic aspect
-                        return true;
-                    }
-                }
+        if (!settings.isEnableRelayModernFrameworkSupport()) {
+            return false;
+        }
+
+        final GraphQLArguments graphQLArguments = PsiTreeUtil.getParentOfType(errorPsiElement, GraphQLArguments.class);
+        if (graphQLArguments != null) {
+            final GraphQLDirective directive = PsiTreeUtil.getParentOfType(errorPsiElement, GraphQLDirective.class);
+            if (directive != null) {
+                final String directiveName = directive.getName();
+                // ignore errors inside on the dynamically named arguments to @argumentDefinitions and @arguments
+                // since the SDL can express this dynamic aspect
+                return "argumentDefinitions".equals(directiveName) || "arguments".equals(directiveName);
             }
         }
         return false;

src/main/com/intellij/lang/jsgraphql/ide/GraphQLSchemaValidationAnnotator.java

@@ -87,10 +87,8 @@ public void visitFieldDefinition(@NotNull GraphQLFieldDefinition fieldDefinition
 
             @Override
             public void visitInputValueDefinition(@NotNull GraphQLInputValueDefinition element) {
-
                 // first reset the bold font display from keywords such as input/type being used as field name
-                Annotation annotation = holder.createInfoAnnotation(element.getNameIdentifier(), null);
-                annotation.setEnforcedTextAttributes(TextAttributes.ERASE_MARKER);
+                resetAttributes(element.getNameIdentifier(), holder);
 
                 final GraphQLArgumentsDefinition arguments = PsiTreeUtil.getParentOfType(element, GraphQLArgumentsDefinition.class);
                 if (arguments != null) {
@@ -104,10 +102,8 @@ public void visitInputValueDefinition(@NotNull GraphQLInputValueDefinition eleme
 
             @Override
             public void visitArgument(@NotNull GraphQLArgument argument) {
-
                 // first reset the bold font display from keywords such as input/type being used as argument name
-                Annotation annotation = holder.createInfoAnnotation(argument.getNameIdentifier(), null);
-                annotation.setEnforcedTextAttributes(TextAttributes.ERASE_MARKER);
+                resetAttributes(argument.getNameIdentifier(), holder);
 
                 // then apply argument font style
                 applyTextAttributes(argument.getNameIdentifier(), ARGUMENT);
@@ -150,8 +146,7 @@ public void visitDirective(@NotNull GraphQLDirective directive) {
             @Override
             public void visitObjectField(@NotNull GraphQLObjectField objectField) {
                 // first reset the bold font display from keywords such as input/type being used as object field name
-                Annotation annotation = holder.createInfoAnnotation(objectField.getNameIdentifier(), null);
-                annotation.setEnforcedTextAttributes(TextAttributes.ERASE_MARKER);
+                resetAttributes(objectField.getNameIdentifier(), holder);
 
                 // then apply argument font style
                 applyTextAttributes(objectField.getNameIdentifier(), ARGUMENT);
@@ -164,4 +159,9 @@ private void applyTextAttributes(@Nullable PsiElement element, @NotNull TextAttr
             }
         });
     }
+
+    private void resetAttributes(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
+        Annotation annotation = holder.createInfoAnnotation(element, null);
+        annotation.setEnforcedTextAttributes(TextAttributes.ERASE_MARKER);
+    }
 }