Implemented simple caching of file-functions in the PsiFile used for auto-completion

Author: halirutan

src/de/halirutan/mathematica/codeinsight/completion/CommentCompletionProvider.java

@@ -30,8 +30,10 @@
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.text.StringTokenizer;
 import de.halirutan.mathematica.lang.MathematicaLanguage;
+import de.halirutan.mathematica.lang.psi.api.MathematicaPsiFile;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import static com.intellij.patterns.PlatformPatterns.psiComment;
@@ -47,7 +49,7 @@ public class CommentCompletionProvider extends MathematicaCompletionProvider {
       "Section", "Subsection", "Subsubsection", "Text", "Package", "Title", "Subtitle", "Subsubtitle", "Chapter", "Subchapter", "Subsubsubsection", "Subsubsubsubsubsection",
   };
 
-  static final public String[] COMMENT_TAGS = {
+  private static final String[] COMMENT_TAGS = {
       "Name", "Title", "Author", "Date", "Summary", "Context",
       "Package Version", "Copyright", "Keywords", "Source",
       "Mathematica Version", "Limitation", "Discussion"};
@@ -82,10 +84,11 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
       }
 
       final PsiFile file = parameters.getOriginalFile();
-      GlobalDefinitionCompletionProvider provider = new GlobalDefinitionCompletionProvider();
-      file.accept(provider);
-      for (String functionName : provider.getFunctionsNames()) {
-        resultWithPrefix.addElement(LookupElementBuilder.create(functionName));
+      if (file instanceof MathematicaPsiFile) {
+        final Set<String> cachedDefinitions = ((MathematicaPsiFile) file).getCachedDefinitions();
+        for (String definition : cachedDefinitions) {
+          resultWithPrefix.addElement(LookupElementBuilder.create(definition));
+        }
       }
     }
   }

src/de/halirutan/mathematica/codeinsight/completion/VariableNameCompletion.java

@@ -25,20 +25,19 @@
 import com.intellij.codeInsight.completion.*;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.patterns.PsiElementPattern.Capture;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiRecursiveElementVisitor;
 import com.intellij.psi.ResolveState;
-import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.containers.hash.HashSet;
 import com.intellij.util.indexing.FileBasedIndex;
 import de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex;
 import de.halirutan.mathematica.index.packageexport.PackageExportSymbol;
+import de.halirutan.mathematica.lang.psi.api.MathematicaPsiFile;
 import de.halirutan.mathematica.lang.psi.api.Symbol;
 import org.jetbrains.annotations.NotNull;
 
@@ -74,34 +73,23 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
       final PsiFile containingFile = parameters.getOriginalFile();
       List<Symbol> variants = Lists.newArrayList();
 
-      GlobalDefinitionCompletionProvider visitor = new GlobalDefinitionCompletionProvider();
-      containingFile.accept(visitor);
-      for (String name : visitor.getFunctionsNames()) {
-        String possibleBuiltIn = name.contains("`") ? name : "Symbol`" + name;
-        if (!NAMES.contains(possibleBuiltIn)) {
-          result.addElement(PrioritizedLookupElement.withPriority(LookupElementBuilder.create(name), GLOBAL_VARIABLE_PRIORITY));
+      if (containingFile instanceof MathematicaPsiFile) {
+        final Set<String> cachedDefinitions = ((MathematicaPsiFile) containingFile).getCachedDefinitions();
+        for (String definition : cachedDefinitions) {
+          result.addElement(PrioritizedLookupElement.withPriority(LookupElementBuilder.create(definition), GLOBAL_VARIABLE_PRIORITY));
         }
       }
 
       ImportedContextVisitor importVisitor = new ImportedContextVisitor();
       callingSymbol.getContainingFile().accept(importVisitor);
-      final java.util.HashSet<String> importedContexts = importVisitor.getImportedContexts();
+//      final java.util.HashSet<String> importedContexts = importVisitor.getImportedContexts();
       final FileBasedIndex index = FileBasedIndex.getInstance();
       final Collection<PackageExportSymbol> allKeys = index.getAllKeys(MathematicaPackageExportIndex.INDEX_ID, project);
       for (PackageExportSymbol key : allKeys) {
         if (key.isExported()) {
           result.addElement(PrioritizedLookupElement.withPriority(LookupElementBuilder.create(key.getSymbol()).appendTailText("(" + key.getFileName() + ")",true), GLOBAL_VARIABLE_PRIORITY));
         }
       }
-//      for (String  key : allKeys) {
-//        final MList<MList<PackageExportSymbol>> values = index.getValues(MathematicaPackageExportIndex.INDEX_ID, key, GlobalSearchScope.allScope(callingSymbol.getProject()));
-//        for (MList<PackageExportSymbol> value : values) {
-//          for (PackageExportSymbol packageExportSymbol : value) {
-//            //TODO: Implement adding completions
-////            if(packageExportSymbol.nameSpace.equals())
-//          }
-//        }
-//      }
 
 
       final LocalDefinitionCompletionProvider processor = new LocalDefinitionCompletionProvider(callingSymbol);

src/de/halirutan/mathematica/lang/psi/api/MathematicaPsiFile.java

@@ -22,9 +22,15 @@
 package de.halirutan.mathematica.lang.psi.api;
 
 import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
 
 /**
  * Created with IntelliJ IDEA. User: patrick Date: 1/3/13 Time: 12:09 PM Purpose:
  */
 public interface MathematicaPsiFile extends PsiFile, Expression {
+  void cacheDefinition(@NotNull String name);
+
+  Set<String> getCachedDefinitions();
 }

src/de/halirutan/mathematica/lang/psi/impl/MathematicaPsiFileImpl.java

@@ -21,6 +21,7 @@
 
 package de.halirutan.mathematica.lang.psi.impl;
 
+import com.google.common.collect.Sets;
 import com.intellij.extapi.psi.PsiFileBase;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.FileViewProvider;
@@ -32,15 +33,41 @@
 import de.halirutan.mathematica.lang.psi.api.MathematicaPsiFile;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Created with IntelliJ IDEA. User: patrick Date: 1/3/13 Time: 12:09 PM Purpose:
  */
 public class MathematicaPsiFileImpl extends PsiFileBase implements MathematicaPsiFile {
 
+  private final Set<String> myFileDefintions = Sets.newHashSet();
+  private boolean myRecacheDefinitions = false;
+
   public MathematicaPsiFileImpl(@NotNull FileViewProvider viewProvider) {
     super(viewProvider, MathematicaLanguage.INSTANCE);
   }
 
+  @Override
+  public void cacheDefinition(@NotNull final String name) {
+    if (myRecacheDefinitions) {
+      myFileDefintions.clear();
+      myRecacheDefinitions = false;
+    }
+    myFileDefintions.add(name);
+  }
+
+  @Override
+  public void subtreeChanged() {
+    super.subtreeChanged();
+    myRecacheDefinitions = true;
+  }
+
+  @Override
+  public Set<String> getCachedDefinitions() {
+    return myFileDefintions;
+  }
+
   @NotNull
   @Override
   public FileType getFileType() {

src/de/halirutan/mathematica/lang/resolve/MathematicaSymbolResolver.java

@@ -33,6 +33,7 @@
 import com.intellij.util.indexing.FileBasedIndex;
 import de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex;
 import de.halirutan.mathematica.index.packageexport.PackageExportSymbol;
+import de.halirutan.mathematica.lang.psi.api.MathematicaPsiFile;
 import de.halirutan.mathematica.lang.psi.api.Symbol;
 import de.halirutan.mathematica.lang.psi.impl.LightBuiltInSymbol;
 import de.halirutan.mathematica.lang.psi.impl.LightUndefinedSymbol;
@@ -59,18 +60,22 @@ public SymbolResolveResult resolve(@NotNull Symbol ref, boolean incompleteCode)
     }
 
     LocalDefinitionResolveProcessor processor = new LocalDefinitionResolveProcessor(ref);
-    PsiTreeUtil.treeWalkUp(processor, ref, ref.getContainingFile(), ResolveState.initial());
+    final PsiFile containingFile = ref.getContainingFile();
+    PsiTreeUtil.treeWalkUp(processor, ref, containingFile, ResolveState.initial());
     final Symbol referringSymbol = processor.getMyReferringSymbol();
     if (referringSymbol != null) {
       return new SymbolResolveResult(referringSymbol, processor.getMyLocalization(), true);
     }
 
     GlobalDefinitionResolveProcessor globalProcessor = new GlobalDefinitionResolveProcessor(ref);
-    PsiTreeUtil.processElements(ref.getContainingFile(), globalProcessor);
+    PsiTreeUtil.processElements(containingFile, globalProcessor);
 
 
     final PsiElement globalDefinition = globalProcessor.getMyReferringSymbol();
     if (globalDefinition != null) {
+      if (containingFile instanceof MathematicaPsiFile) {
+        ((MathematicaPsiFile) containingFile).cacheDefinition(globalDefinition.getText());
+      }
       return new SymbolResolveResult(globalDefinition, MScope.FILE_SCOPE, true);
     }
 

src/de/halirutan/mathematica/lang/resolve/processors/LocalDefinitionResolveProcessor.kt

@@ -100,7 +100,7 @@ class LocalDefinitionResolveProcessor(private val myStartElement: Symbol) : Base
      * found in [MScope].
      *
      *
-     * Secondly I check the patterns in e.g. <code>f@var_:=...</code>  for `SetDelayed` and `TagSetDelayed`.
+     * Secondly I check the patterns in e.g. <code>f@var_:=...!</code>  for `SetDelayed` and `TagSetDelayed`.
      *
      *
      * Finally, `RuleDelayed` constructs are checked.