Move highlighting classes to a corresponding package

vepanimas · vepanimas · commit 3bbd44db4ecb · 2020-12-29T05:47:54.000+03:00
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -63,7 +63,7 @@
     <projectService serviceImplementation="com.intellij.lang.jsgraphql.ide.project.graphqlconfig.GraphQLConfigManager" />
     <projectService serviceImplementation="com.intellij.lang.jsgraphql.ide.editor.GraphQLIntrospectionService" />
     <projectService serviceInterface="com.intellij.lang.jsgraphql.ide.project.graphqlconfig.GraphQLConfigGlobMatcher" serviceImplementation="com.intellij.lang.jsgraphql.ide.project.graphqlconfig.GraphQLConfigGlobMatcherImpl" />
-    <projectService serviceImplementation="com.intellij.lang.jsgraphql.ide.GraphQLRelayModernAnnotationFilter" />
+    <projectService serviceImplementation="com.intellij.lang.jsgraphql.frameworks.relay.GraphQLRelayModernAnnotationFilter" />
     <projectService serviceImplementation="com.intellij.lang.jsgraphql.v1.ide.editor.JSGraphQLQueryContextCaretListener" />
 
     <!-- Indexing -->
@@ -73,14 +73,14 @@
     <!-- Startup -->
     <postStartupActivity implementation="com.intellij.lang.jsgraphql.endpoint.ide.startup.GraphQLStartupActivity" />
     <postStartupActivity implementation="com.intellij.lang.jsgraphql.ide.project.graphqlconfig.GraphQLConfigProjectStartupActivity" />
-    <postStartupActivity implementation="com.intellij.lang.jsgraphql.ide.project.relay.GraphQLRelayModernEnableStartupActivity" />
+    <postStartupActivity implementation="com.intellij.lang.jsgraphql.frameworks.relay.GraphQLRelayModernEnableStartupActivity" />
 
     <!-- Syntax and error highlighting -->
-    <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"/>
+    <lang.syntaxHighlighterFactory language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.highlighting.GraphQLSyntaxHighlighterFactory"/>
+    <annotator language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.highlighting.GraphQLSyntaxAnnotator" />
+    <annotator language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.validation.GraphQLValidationAnnotator" />
+    <annotator language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.validation.GraphQLSchemaValidationAnnotator" />
+    <colorSettingsPage implementation="com.intellij.lang.jsgraphql.ide.highlighting.GraphQLColorSettingsPage"/>
 
     <!-- Formatting and folding -->
     <lang.formatter language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.formatter.GraphQLFormattingModelBuilder"/>
@@ -89,7 +89,7 @@
     <lang.foldingBuilder language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.editor.GraphQLFoldingBuilder"/>
 
     <!-- Editing -->
-    <lang.braceMatcher language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.GraphQLBraceMatcher" />
+    <lang.braceMatcher language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.editor.GraphQLBraceMatcher" />
     <lang.quoteHandler language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.editor.GraphQLQuoteHandler" />
     <lang.commenter language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.editor.GraphQLCommenter"/>
     <enterHandlerDelegate implementation="com.intellij.lang.jsgraphql.ide.formatter.GraphQLEnterInEmptyListHandler"/>
diff --git a/src/main/com/intellij/lang/jsgraphql/frameworks/relay/GraphQLRelayModernAnnotationFilter.java b/src/main/com/intellij/lang/jsgraphql/frameworks/relay/GraphQLRelayModernAnnotationFilter.java
@@ -5,7 +5,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide;
+package com.intellij.lang.jsgraphql.frameworks.relay;
 
 import com.intellij.lang.jsgraphql.GraphQLSettings;
 import com.intellij.lang.jsgraphql.psi.GraphQLArguments;
diff --git a/src/main/com/intellij/lang/jsgraphql/frameworks/relay/GraphQLRelayModernEnableStartupActivity.java b/src/main/com/intellij/lang/jsgraphql/frameworks/relay/GraphQLRelayModernEnableStartupActivity.java
@@ -5,7 +5,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide.project.relay;
+package com.intellij.lang.jsgraphql.frameworks.relay;
 
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.lang.jsgraphql.GraphQLSettings;
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/editor/GraphQLBraceMatcher.java b/src/main/com/intellij/lang/jsgraphql/ide/editor/GraphQLBraceMatcher.java
@@ -5,7 +5,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide;
+package com.intellij.lang.jsgraphql.ide.editor;
 
 import com.intellij.lang.BracePair;
 import com.intellij.lang.PairedBraceMatcher;
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/highlighting/GraphQLColorSettingsPage.java b/src/main/com/intellij/lang/jsgraphql/ide/highlighting/GraphQLColorSettingsPage.java
@@ -5,7 +5,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide;
+package com.intellij.lang.jsgraphql.ide.highlighting;
 
 import com.intellij.lang.jsgraphql.GraphQLIcons;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/highlighting/GraphQLSyntaxAnnotator.java b/src/main/com/intellij/lang/jsgraphql/ide/highlighting/GraphQLSyntaxAnnotator.java
@@ -5,7 +5,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide;
+package com.intellij.lang.jsgraphql.ide.highlighting;
 
 import com.intellij.lang.annotation.Annotation;
 import com.intellij.lang.annotation.AnnotationHolder;
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/highlighting/GraphQLSyntaxHighlighter.java b/src/main/com/intellij/lang/jsgraphql/ide/highlighting/GraphQLSyntaxHighlighter.java
@@ -5,7 +5,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide;
+package com.intellij.lang.jsgraphql.ide.highlighting;
 
 import com.intellij.lang.jsgraphql.GraphQLLexerAdapter;
 import com.intellij.lang.jsgraphql.psi.GraphQLElementTypes;
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/highlighting/GraphQLSyntaxHighlighterFactory.java b/src/main/com/intellij/lang/jsgraphql/ide/highlighting/GraphQLSyntaxHighlighterFactory.java
@@ -5,7 +5,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide;
+package com.intellij.lang.jsgraphql.ide.highlighting;
 
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/validation/GraphQLSchemaValidationAnnotator.java b/src/main/com/intellij/lang/jsgraphql/ide/validation/GraphQLSchemaValidationAnnotator.java
@@ -5,10 +5,11 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide;
+package com.intellij.lang.jsgraphql.ide.validation;
 
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
+import com.intellij.lang.jsgraphql.frameworks.relay.GraphQLRelayModernAnnotationFilter;
 import com.intellij.lang.jsgraphql.ide.project.GraphQLInjectionSearchHelper;
 import com.intellij.lang.jsgraphql.psi.*;
 import com.intellij.lang.jsgraphql.psi.impl.GraphQLDescriptionAware;
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/validation/GraphQLValidationAnnotator.java b/src/main/com/intellij/lang/jsgraphql/ide/validation/GraphQLValidationAnnotator.java
@@ -5,7 +5,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide;
+package com.intellij.lang.jsgraphql.ide.validation;
 
 import com.google.common.collect.Lists;
 import com.intellij.codeInsight.daemon.impl.quickfix.RenameElementFix;
@@ -16,6 +16,8 @@
 import com.intellij.lang.annotation.Annotation;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
+import com.intellij.lang.jsgraphql.ide.validation.fixes.GraphQLMissingTypeFix;
+import com.intellij.lang.jsgraphql.frameworks.relay.GraphQLRelayModernAnnotationFilter;
 import com.intellij.lang.jsgraphql.ide.project.GraphQLPsiSearchHelper;
 import com.intellij.lang.jsgraphql.psi.GraphQLArgument;
 import com.intellij.lang.jsgraphql.psi.GraphQLDirective;
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/validation/fixes/GraphQLMissingTypeFix.java b/src/main/com/intellij/lang/jsgraphql/ide/validation/fixes/GraphQLMissingTypeFix.java
@@ -5,7 +5,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-package com.intellij.lang.jsgraphql.ide;
+package com.intellij.lang.jsgraphql.ide.validation.fixes;
 
 import com.google.common.collect.Lists;
 import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
@@ -113,7 +113,7 @@ public String getFamilyName() {
         return "Create missing type definition";
     }
 
-    static List<GraphQLMissingTypeFix> getApplicableFixes(GraphQLIdentifier typeName) {
+    public static List<GraphQLMissingTypeFix> getApplicableFixes(GraphQLIdentifier typeName) {
         final List<GraphQLMissingTypeFix> fixes = Lists.newArrayList();
         final GraphQLInputValueDefinition inputValueDefinition = PsiTreeUtil.getParentOfType(typeName, GraphQLInputValueDefinition.class);
         if (inputValueDefinition != null) {
