Code cleanup GraphQLPsiSearchHelper

Author: vepanimas

src/main/com/intellij/lang/jsgraphql/ide/completion/GraphQLCompletionContributor.java

@@ -491,7 +491,7 @@ protected void addCompletions(@NotNull final CompletionParameters parameters,
                 if (directiveLocations != null) {
                     final Set<String> currentLocations = Sets.newHashSet();
                     directiveLocations.getDirectiveLocationList().forEach(location -> currentLocations.add(location.getText()));
-                    final PsiFile builtInSchema = GraphQLPsiSearchHelper.getService(completionElement.getProject()).getBuiltInSchema();
+                    final PsiFile builtInSchema = GraphQLPsiSearchHelper.getInstance(completionElement.getProject()).getBuiltInSchema();
 
                     builtInSchema.accept(new PsiRecursiveElementVisitor() {
                         @Override
@@ -718,7 +718,7 @@ protected void addCompletions(@NotNull final CompletionParameters parameters,
                         // fragment must be compatible with the type in scope
                         final TypeDefinitionRegistry typeDefinitionRegistry = GraphQLSchemaProvider.getInstance(completionElement.getProject()).getTolerantRegistry(parameters.getOriginalFile());
 
-                        final List<GraphQLFragmentDefinition> knownFragmentDefinitions = GraphQLPsiSearchHelper.getService(completionElement.getProject()).getKnownFragmentDefinitions(parameters.getOriginalFile());
+                        final List<GraphQLFragmentDefinition> knownFragmentDefinitions = GraphQLPsiSearchHelper.getInstance(completionElement.getProject()).getKnownFragmentDefinitions(parameters.getOriginalFile());
                         for (GraphQLFragmentDefinition fragmentDefinition : knownFragmentDefinitions) {
                             final String name = fragmentDefinition.getName();
                             if (name != null) {

src/main/com/intellij/lang/jsgraphql/ide/project/GraphQLPsiSearchHelper.java

@@ -33,7 +33,7 @@ protected GraphQLDefaultSchemaNode(Project project, GraphQLSchemasRootNode graph
         myName = "Default project-wide schema";
         getPresentation().setLocationString(project.getPresentableUrl());
         getPresentation().setIcon(JSGraphQLIcons.Files.GraphQLSchema);
-        final GraphQLFile defaultProjectFile = GraphQLPsiSearchHelper.getService(myProject).getDefaultProjectFile();
+        final GraphQLFile defaultProjectFile = GraphQLPsiSearchHelper.getInstance(myProject).getDefaultProjectFile();
         final GraphQLSchemaProvider registry = GraphQLSchemaProvider.getInstance(myProject);
         myValidatedSchema = registry.getValidatedSchema(defaultProjectFile);
     }

src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLDefaultSchemaNode.java

@@ -65,7 +65,7 @@ public static GraphQLReferenceService getService(@NotNull Project project) {
     }
 
     public GraphQLReferenceService(@NotNull final Project project) {
-        psiSearchHelper = GraphQLPsiSearchHelper.getService(project);
+        psiSearchHelper = GraphQLPsiSearchHelper.getInstance(project);
         project.getMessageBus().connect().subscribe(PsiManagerImpl.ANY_PSI_CHANGE_TOPIC, new AnyPsiChangeListener.Adapter() {
             @Override
             public void beforePsiChanged(boolean isPhysical) {
@@ -213,7 +213,7 @@ PsiReference resolveFieldReference(GraphQLReferencePsiElement element, GraphQLFi
         final String name = element.getName();
         Ref<PsiReference> reference = new Ref<>();
         if (name != null) {
-            final GraphQLPsiSearchHelper graphQLPsiSearchHelper = GraphQLPsiSearchHelper.getService(element.getProject());
+            final GraphQLPsiSearchHelper graphQLPsiSearchHelper = GraphQLPsiSearchHelper.getInstance(element.getProject());
             if (name.startsWith("__")) {
                 // __typename or introspection fields __schema and __type which implicitly extends the query root type
                 graphQLPsiSearchHelper.getBuiltInSchema().accept(new PsiRecursiveElementVisitor() {

src/main/com/intellij/lang/jsgraphql/ide/references/GraphQLReferenceService.java

@@ -18,7 +18,7 @@
 public class GraphQLRenameVetoCondition implements Condition<PsiElement> {
     @Override
     public boolean value(PsiElement psiElement) {
-        final PsiFile builtInSchema = GraphQLPsiSearchHelper.getService(psiElement.getProject()).getBuiltInSchema();
+        final PsiFile builtInSchema = GraphQLPsiSearchHelper.getInstance(psiElement.getProject()).getBuiltInSchema();
         return builtInSchema == psiElement.getContainingFile();
     }
-}
+}

src/main/com/intellij/lang/jsgraphql/ide/rename/GraphQLRenameVetoCondition.java

@@ -34,7 +34,7 @@ private static boolean doExecute(PsiElement sourceElement, final Processor<? sup
         if (sourceElement instanceof GraphQLIdentifier && sourceElement.getParent() instanceof GraphQLTypeNameDefinition) {
             final GraphQLInterfaceTypeDefinition interfaceTypeDefinition = PsiTreeUtil.getParentOfType(sourceElement, GraphQLInterfaceTypeDefinition.class);
             if (interfaceTypeDefinition != null) {
-                GraphQLPsiSearchHelper.getService(sourceElement.getProject()).processElementsWithWord(sourceElement, sourceElement.getText(), namedElement -> {
+                GraphQLPsiSearchHelper.getInstance(sourceElement.getProject()).processElementsWithWord(sourceElement, sourceElement.getText(), namedElement -> {
                     ProgressManager.checkCanceled();
                     if (namedElement instanceof GraphQLIdentifier && PsiTreeUtil.getParentOfType(namedElement, GraphQLImplementsInterfaces.class) != null) {
                         final GraphQLTypeSystemDefinition typeSystemDefinition = PsiTreeUtil.getParentOfType(namedElement, GraphQLObjectTypeDefinition.class, GraphQLObjectTypeExtensionDefinition.class);

src/main/com/intellij/lang/jsgraphql/ide/search/GraphQLDefinitionsSearchExecutor.java

@@ -32,7 +32,7 @@ public PsiReference getReference() {
         final Ref<PsiReference> reference = new Ref<>();
         final GraphQLDirectiveLocationPsiElement psiElement = this;
         final String locationName = psiElement.getText();
-        GraphQLPsiSearchHelper.getService(getProject()).getBuiltInSchema().accept(new PsiRecursiveElementVisitor() {
+        GraphQLPsiSearchHelper.getInstance(getProject()).getBuiltInSchema().accept(new PsiRecursiveElementVisitor() {
             @Override
             public void visitElement(PsiElement element) {
                 if(element instanceof GraphQLEnumValue && element.getText().equals(locationName)) {

src/main/com/intellij/lang/jsgraphql/psi/impl/GraphQLDirectiveLocationPsiElement.java

@@ -48,7 +48,7 @@ public SearchScope getUseScope() {
             PsiElement context = psiFile.getContext();
             if(context != null && context.getLanguage() != this.getLanguage()) {
                 // this PSI element is part of injected GraphQL, so we have to expand the use scope which defaults to the current file only
-                useScope = useScope.union(GraphQLPsiSearchHelper.getService(getProject()).getUseScope(this));
+                useScope = useScope.union(GraphQLPsiSearchHelper.getInstance(getProject()).getUseScope(this));
             }
         }
         return useScope;