Cleanup

7 files changed, 34 insertions, 42 deletions

diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
index fcf1fd1a69a..d8a4db4ed45 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
@@ -16,7 +16,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * This class is used for the extension (in plugin.xml) to enable "Go To Symbol" feature.
+ * This class is used for the extension (in plugin.xml) to enable the "Go To Symbol" feature.
  *
  * @author Shahar Ariel
  */
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java
index f2b38a61844..a54ac47c442 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java
@@ -25,7 +25,7 @@ public class SdFileType extends LanguageFileType {
     
     @Override
     public String getDescription() {
-        return "Sd language file";
+        return "A Vespa schema file";
     }
     
     @Override
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java
index cba1bd04ce4..f1cbc026230 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java
@@ -43,12 +43,11 @@ import java.util.List;
  */
 public class SdUtil {
     
-    public static HashMap<String, List<PsiElement>> createMacrosMap(SdFile file) {
+    public static HashMap<String, List<PsiElement>> createFunctionsMap(SdFile file) {
         HashMap<String, List<PsiElement>> macrosMap = new HashMap<>();
-        for (SdRankProfileDefinition rankProfile : PsiTreeUtil
-            .findChildrenOfType(file, SdRankProfileDefinition.class)) {
-            for (SdFunctionDefinition macro : PsiTreeUtil.findChildrenOfType(rankProfile, SdFunctionDefinition.class)) {
-                macrosMap.computeIfAbsent(macro.getName(), k -> new ArrayList<>()).add(macro);
+        for (SdRankProfileDefinition rankProfile : PsiTreeUtil.findChildrenOfType(file, SdRankProfileDefinition.class)) {
+            for (SdFunctionDefinition function : PsiTreeUtil.findChildrenOfType(rankProfile, SdFunctionDefinition.class)) {
+                macrosMap.computeIfAbsent(function.getName(), k -> new ArrayList<>()).add(function);
             }
         }
         return macrosMap;
@@ -78,13 +77,13 @@ public class SdUtil {
         return ref != null ? ref.resolve() : null;
     }
     
-    public static String createFunctionDescription(SdFunctionDefinition macro) {
-        SdRankProfileDefinition rankProfile = PsiTreeUtil.getParentOfType(macro, SdRankProfileDefinition.class);
+    public static String createFunctionDescription(SdFunctionDefinition function) {
+        SdRankProfileDefinition rankProfile = PsiTreeUtil.getParentOfType(function, SdRankProfileDefinition.class);
         String rankProfileName;
         if (rankProfile != null) {
             rankProfileName = rankProfile.getName();
-            List<SdArgumentDefinition> args = macro.getArgumentDefinitionList();
-            StringBuilder text = new StringBuilder(rankProfileName + "." + macro.getName() + "(");
+            List<SdArgumentDefinition> args = function.getArgumentDefinitionList();
+            StringBuilder text = new StringBuilder(rankProfileName + "." + function.getName() + "(");
             for (int i = 0; i < args.size(); i++) {
                 text.append(args.get(i).getName());
                 if (i < args.size() - 1) {
@@ -94,7 +93,7 @@ public class SdUtil {
             text.append(")");
             return text.toString();
         } else {
-            return macro.getName();
+            return function.getName();
         }
     }
     
@@ -141,30 +140,30 @@ public class SdUtil {
             return result;
         }
         
-        // If element is the macro's name in the macro definition, return the macro definition
+        // If element is the function's name in the function definition, return the function definition
         if (element.getParent() instanceof SdFunctionDefinition) {
             result.add((SdDeclaration) element.getParent());
             return result;
         }
         
-        // Check if element is inside a macro body
+        // Check if element is inside a function body
         SdFunctionDefinition macroParent = PsiTreeUtil.getParentOfType(element, SdFunctionDefinition.class);
         if (macroParent != null) {
             for (SdArgumentDefinition arg : PsiTreeUtil.findChildrenOfType(macroParent, SdArgumentDefinition.class)) {
-                if (name.equals(arg.getName())) { // if the element was declared as an argument of the macro
+                if (name.equals(arg.getName())) { // if the element was declared as an argument of the function
                     result.add(arg);
                     return result;
                 }
             }
         }
         
-        // If element is a macro's name, return the most specific declaration of the macro
+        // If element is a function's name, return the most specific declaration of the function
         if (((SdIdentifier) element).isFunctionName(file, name)) {
             PsiElement curRankProfile = PsiTreeUtil.getParentOfType(element, SdRankProfileDefinition.class);
             while (curRankProfile != null) {
-                for (SdFunctionDefinition macro : PsiTreeUtil.collectElementsOfType(curRankProfile, SdFunctionDefinition.class)) {
-                    if (macro.getName() != null && macro.getName().equals(name)) {
-                        result.add(macro);
+                for (SdFunctionDefinition function : PsiTreeUtil.collectElementsOfType(curRankProfile, SdFunctionDefinition.class)) {
+                    if (function.getName() != null && function.getName().equals(name)) {
+                        result.add(function);
                         return result;
                     }
                 }
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
index 51a2e2490b3..a7abb9db57e 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
@@ -25,7 +25,7 @@ public class SdDocumentSummaryGroupingRule extends SingleParentUsageGroupingRule
     
         while (psiElement != null) {
             if (psiElement instanceof SdDocumentSummaryDefinition) {
-                final SdDocumentSummaryDefinition componentElement = (SdDocumentSummaryDefinition) psiElement;
+                SdDocumentSummaryDefinition componentElement = (SdDocumentSummaryDefinition) psiElement;
                 return new SdUsageGroup(componentElement);
             }
             psiElement = psiElement.getParent();
@@ -33,4 +33,5 @@ public class SdDocumentSummaryGroupingRule extends SingleParentUsageGroupingRule
     
         return null;
     }
+
 }
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
index 07807cd36f8..20b3a725446 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
@@ -4,7 +4,6 @@ package ai.vespa.intellij.schema.findUsages;
 import com.intellij.find.findUsages.FindUsagesHandler;
 import com.intellij.find.findUsages.FindUsagesOptions;
 import com.intellij.openapi.application.ReadAction;
-import com.intellij.openapi.application.ReadActionProcessor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
@@ -27,53 +26,45 @@ import java.util.List;
  */
 public class SdFindUsagesHandler extends FindUsagesHandler {
     
-    protected HashMap<String, List<PsiElement>> macrosMap;
+    private final HashMap<String, List<PsiElement>> functionsMap;
     
     protected SdFindUsagesHandler(PsiElement psiElement) {
         super(psiElement);
         PsiFile file = psiElement.getContainingFile();
-        macrosMap = file instanceof SdFile ? SdUtil.createMacrosMap((SdFile) psiElement.getContainingFile()) : new HashMap<>();
+        functionsMap = file instanceof SdFile ? SdUtil.createFunctionsMap((SdFile) psiElement.getContainingFile())
+                                              : new HashMap<>();
     }
     
     @Override
     public boolean processElementUsages(PsiElement elementToSearch,
                                         Processor<? super UsageInfo> processor,
                                         FindUsagesOptions options) {
-        final ReadActionProcessor<PsiReference> refProcessor = new ReadActionProcessor<>() {
-            @Override
-            public boolean processInReadAction(final PsiReference ref) {
-                return processor.process(new UsageInfo(ref));
-            }
-        };
-        
-        final SearchScope scope = options.searchScope;
-        
-        final boolean searchText = options.isSearchForTextOccurrences && scope instanceof GlobalSearchScope;
+        SearchScope scope = options.searchScope;
+        boolean searchText = options.isSearchForTextOccurrences && scope instanceof GlobalSearchScope;
         
         if (options.isUsages) {
             if (!(elementToSearch instanceof SdFunctionDefinition)) {
                 boolean success =
-                    ReferencesSearch.search(createSearchParameters(elementToSearch, scope, options)).forEach(refProcessor);
+                    ReferencesSearch.search(createSearchParameters(elementToSearch, scope, options))
+                                    .forEach((PsiReference ref) -> processor.process(new UsageInfo(ref)));
                 if (!success) return false;
             } else {
                 String macroName = ReadAction.compute( ((SdFunctionDefinition) elementToSearch)::getName);
                 
-                for (PsiElement macroImpl : macrosMap.get(macroName)) {
+                for (PsiElement macroImpl : functionsMap.get(macroName)) {
                     boolean success =
-                        ReferencesSearch.search(createSearchParameters(macroImpl, scope, options)).forEach(refProcessor);
+                        ReferencesSearch.search(createSearchParameters(macroImpl, scope, options))
+                                        .forEach((PsiReference ref) -> processor.process(new UsageInfo(ref)));
                     if (!success) return false;
                 }
             }
         }
         if (searchText) {
-            if (options.fastTrack != null) {
+            if (options.fastTrack != null)
                 options.fastTrack.searchCustom(consumer -> processUsagesInText(elementToSearch, processor, (GlobalSearchScope)scope));
-            }
-            else {
+            else
                 return processUsagesInText(elementToSearch, processor, (GlobalSearchScope)scope);
-            }
         }
-        
         return true;
     }
     
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
index 7735255a84e..83143f2d4a4 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
@@ -58,6 +58,7 @@ public class SdUsageGroup implements UsageGroup {
         return canNavigate();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public int compareTo(UsageGroup usageGroup) {
 //        return getPresentableGroupText().compareToIgnoreCase(usageGroup.getPresentableGroupText());
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
index 3dae0d8c818..524b9c31302 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
@@ -34,7 +34,7 @@ public abstract class SdCallTreeStructure extends HierarchyTreeStructure {
         super(project, new SdCallHierarchyNodeDescriptor(null, element, true));
         myScopeType = currentScopeType;
         myFile = (SdFile) element.getContainingFile();
-        macrosMap = SdUtil.createMacrosMap(myFile);
+        macrosMap = SdUtil.createFunctionsMap(myFile);
         ranksHeritageMap = new HashMap<>();
     }