Made completetion for cross-file references

Author: halirutan

src/de/halirutan/mathematica/actions/PackageExportChecker.java

@@ -1,69 +1,69 @@
-/*
- * Copyright (c) 2016 Patrick Scheibe
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package de.halirutan.mathematica.actions;
-
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataKeys;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.util.indexing.FileBasedIndex;
-import com.intellij.util.indexing.ID;
-import de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex;
-import de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex.FileKey;
-import de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex.Key;
-import de.halirutan.mathematica.index.packageexport.PackageExportSymbol;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author patrick (08.11.16).
- */
-public class PackageExportChecker extends AnAction {
-
-  @Override
-  public void actionPerformed(AnActionEvent e) {
-
-    final Project project = e.getProject();
-    if (project == null) {
-      return;
-    }
-
-    final VirtualFile currentFile = e.getDataContext().getData(DataKeys.VIRTUAL_FILE);
-    final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance();
-    final ID<Key, List<PackageExportSymbol>> indexId = MathematicaPackageExportIndex.INDEX_ID;
-    final Collection<Key> allKeys = fileBasedIndex.getAllKeys(indexId,project);
-
-    for (Key next : allKeys) {
-      final VirtualFile file = fileBasedIndex.findFileById(project, ((FileKey) next).getFileId());
-      System.out.printf("\nFILE: " + file.getPresentableName() + "\n-----------------------------------------\n");
-      final List<List<PackageExportSymbol>> values = fileBasedIndex.getValues(indexId, next, GlobalSearchScope.allScope(project));
-      for (List<PackageExportSymbol> list : values) {
-        for (PackageExportSymbol info : list) {
-          System.out.println(info.symbol + " (" + info.nameSpace +")");
-        }
-      }
-    }
-  }
-}
+///*
+// * Copyright (c) 2016 Patrick Scheibe
+// * Permission is hereby granted, free of charge, to any person obtaining a copy
+// * of this software and associated documentation files (the "Software"), to deal
+// * in the Software without restriction, including without limitation the rights
+// * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// * copies of the Software, and to permit persons to whom the Software is
+// * furnished to do so, subject to the following conditions:
+// *
+// * The above copyright notice and this permission notice shall be included in
+// * all copies or substantial portions of the Software.
+// *
+// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// * THE SOFTWARE.
+// */
+//
+//package de.halirutan.mathematica.actions;
+//
+//import com.intellij.openapi.actionSystem.AnAction;
+//import com.intellij.openapi.actionSystem.AnActionEvent;
+//import com.intellij.openapi.actionSystem.DataKeys;
+//import com.intellij.openapi.project.Project;
+//import com.intellij.openapi.vfs.VirtualFile;
+//import com.intellij.psi.search.GlobalSearchScope;
+//import com.intellij.util.indexing.FileBasedIndex;
+//import com.intellij.util.indexing.ID;
+//import de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex;
+//import de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex.FileKey;
+//import de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex.Key;
+//import de.halirutan.mathematica.index.packageexport.PackageExportSymbol;
+//
+//import java.util.Collection;
+//import java.util.List;
+//
+///**
+// * @author patrick (08.11.16).
+// */
+//public class PackageExportChecker extends AnAction {
+//
+//  @Override
+//  public void actionPerformed(AnActionEvent e) {
+//
+//    final Project project = e.getProject();
+//    if (project == null) {
+//      return;
+//    }
+//
+//    final VirtualFile currentFile = e.getDataContext().getData(DataKeys.VIRTUAL_FILE);
+//    final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance();
+//    final ID<Key, List<PackageExportSymbol>> indexId = MathematicaPackageExportIndex.INDEX_ID;
+//    final Collection<Key> allKeys = fileBasedIndex.getAllKeys(indexId,project);
+//
+//    for (Key next : allKeys) {
+//      final VirtualFile file = fileBasedIndex.findFileById(project, ((FileKey) next).getFileId());
+//      System.out.printf("\nFILE: " + file.getPresentableName() + "\n-----------------------------------------\n");
+//      final List<List<PackageExportSymbol>> values = fileBasedIndex.getValues(indexId, next, GlobalSearchScope.allScope(project));
+//      for (List<PackageExportSymbol> list : values) {
+//        for (PackageExportSymbol info : list) {
+//          System.out.println(info.symbol + " (" + info.nameSpace +")");
+//        }
+//      }
+//    }
+//  }
+//}

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

@@ -24,6 +24,8 @@
 import com.google.common.collect.Lists;
 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;
@@ -36,7 +38,6 @@
 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.MathematicaPackageExportIndex.Key;
 import de.halirutan.mathematica.index.packageexport.PackageExportSymbol;
 import de.halirutan.mathematica.lang.psi.api.Symbol;
 import org.jetbrains.annotations.NotNull;
@@ -67,6 +68,7 @@ void addTo(CompletionContributor contributor) {
   protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) {
     final Symbol callingSymbol = (Symbol) parameters.getPosition().getParent();
     final String callingSymbolName = callingSymbol.getFullSymbolName();
+    final Project project = callingSymbol.getProject();
 
     if (!parameters.isExtendedCompletion()) {
       final PsiFile containingFile = parameters.getOriginalFile();
@@ -85,16 +87,21 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
       callingSymbol.getContainingFile().accept(importVisitor);
       final java.util.HashSet<String> importedContexts = importVisitor.getImportedContexts();
       final FileBasedIndex index = FileBasedIndex.getInstance();
-      final Collection<Key> allKeys = index.getAllKeys(MathematicaPackageExportIndex.INDEX_ID, callingSymbol.getProject());
-      for (Key key : allKeys) {
-        final List<List<PackageExportSymbol>> values = index.getValues(MathematicaPackageExportIndex.INDEX_ID, key, GlobalSearchScope.allScope(callingSymbol.getProject()));
-        for (List<PackageExportSymbol> value : values) {
-          for (PackageExportSymbol packageExportSymbol : value) {
-            //TODO: Implement adding completions
-//            if(packageExportSymbol.nameSpace.equals())
-          }
+      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 List<List<PackageExportSymbol>> values = index.getValues(MathematicaPackageExportIndex.INDEX_ID, key, GlobalSearchScope.allScope(callingSymbol.getProject()));
+//        for (List<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/codeinsight/highlighting/MathematicaHighlightingAnnotator.java

@@ -26,6 +26,7 @@
 import com.intellij.lang.annotation.Annotation;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
+import com.intellij.openapi.editor.colors.CodeInsightColors;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.editor.markup.TextAttributes;
@@ -95,7 +96,7 @@ public void visitSymbol(final Symbol symbol) {
           setHighlighting(symbol, myHolder, MathematicaSyntaxHighlighterColors.IDENTIFIER);
           break;
         case NULL:
-          setHighlighting(symbol, myHolder, MathematicaSyntaxHighlighterColors.BAD_CHARACTER);
+          setHighlighting(symbol, myHolder, CodeInsightColors.WRONG_REFERENCES_ATTRIBUTES);
           break;
         case BUILT_IN:
           setHighlighting(symbol, myHolder, MathematicaSyntaxHighlighterColors.BUILTIN_FUNCTION);

src/de/halirutan/mathematica/index/packageexport/MathematicaPackageExportIndex.java

@@ -21,39 +21,40 @@
 
 package de.halirutan.mathematica.index.packageexport;
 
+import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.indexing.*;
 import com.intellij.util.indexing.FileBasedIndex.InputFilter;
-import com.intellij.util.io.DataExternalizer;
+import com.intellij.util.io.EnumeratorStringDescriptor;
 import com.intellij.util.io.IOUtil;
 import com.intellij.util.io.KeyDescriptor;
-import de.halirutan.mathematica.index.packageexport.MathematicaPackageExportIndex.Key;
+import de.halirutan.mathematica.lang.MathematicaLanguage;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
 import java.util.Map;
 
 /**
  * @author patrick (01.11.16).
  */
-public class MathematicaPackageExportIndex extends FileBasedIndexExtension<Key, List<PackageExportSymbol>> {
+public class MathematicaPackageExportIndex extends ScalarIndexExtension<PackageExportSymbol> {
 
-  public static final ID<Key,List<PackageExportSymbol>> INDEX_ID = ID.create("Mathematica.fileExports");
-  private static final int BASE_VERSION = 4;
+  public static final ID<PackageExportSymbol, Void> INDEX_ID = ID.create("Mathematica.fileExports");
+  private static final int BASE_VERSION = 7;
 
   @NotNull
   @Override
   public InputFilter getInputFilter() {
     return new InputFilter() {
       @Override
       public boolean acceptInput(@NotNull VirtualFile file) {
-        return "m".equals(file.getExtension());
+        final LanguageFileType fileType = MathematicaLanguage.INSTANCE.getAssociatedFileType();
+        return file.getFileType().equals(fileType);
       }
     };
   }
@@ -70,125 +71,40 @@ public boolean dependsOnFileContent() {
 
   @NotNull
   @Override
-  public ID<Key, List<PackageExportSymbol>> getName() {
+  public ID<PackageExportSymbol, Void> getName() {
     return INDEX_ID;
   }
 
   @NotNull
   @Override
-  public DataIndexer<Key, List<PackageExportSymbol>, FileContent> getIndexer() {
-    return new DataIndexer<Key, List<PackageExportSymbol>, FileContent>() {
+  public DataIndexer<PackageExportSymbol, Void, FileContent> getIndexer() {
+    return new DataIndexer<PackageExportSymbol, Void, FileContent>() {
       @NotNull
       @Override
-      public Map<Key, List<PackageExportSymbol>> map(@NotNull FileContent inputData) {
-        final Map<Key, List<PackageExportSymbol>> map = new HashMap<Key, List<PackageExportSymbol>>();
-        if (!"m".equals(inputData.getFile().getExtension())) return map;
+      public Map<PackageExportSymbol, Void> map(@NotNull FileContent inputData) {
+        final Map<PackageExportSymbol , Void> map = new HashMap<>();
         final PsiFile psiFile = inputData.getPsiFile();
         PackageClassifier visitor = new PackageClassifier();
         psiFile.accept(visitor);
-        map.put(new FileKey(inputData.getFile()), new ArrayList<PackageExportSymbol>(visitor.getListOfExportSymbols()));
-        return map;
-      }
-    };
-  }
-
-  @NotNull
-  @Override
-  public KeyDescriptor<Key> getKeyDescriptor() {
-    //noinspection AnonymousInnerClassWithTooManyMethods,OverlyComplexAnonymousInnerClass
-    return new KeyDescriptor<Key>() {
-      @Override
-      public int getHashCode(Key value) {
-        return value.hashCode();
-      }
-
-      @Override
-      public boolean isEqual(Key val1, Key val2) {
-        return val1.equals(val2);
-      }
+        final Collection<PackageExportSymbol> listOfExportSymbols = visitor.getListOfExportSymbols();
 
-      @Override
-      public void save(@NotNull DataOutput out, Key value) throws IOException {
-        value.writeValue(out);
-      }
-
-      @Override
-      public Key read(@NotNull DataInput in) throws IOException {
-        return new FileKey(in.readInt());
+        for (PackageExportSymbol symbol : listOfExportSymbols) {
+          map.putIfAbsent(symbol, null);
+        }
+        return map;
       }
     };
   }
 
   @NotNull
   @Override
-  public DataExternalizer<List<PackageExportSymbol>> getValueExternalizer() {
-    return new ListDataExternalizer();
+  public KeyDescriptor<PackageExportSymbol> getKeyDescriptor() {
+    return PackageExportSymbol.INSTANCE;
   }
 
   @Override
   public int getVersion() {
     return BASE_VERSION;
   }
 
-  public interface Key {
-    void writeValue(DataOutput out) throws IOException;
-  }
-
-  public static class FileKey implements Key {
-    private final int myFileId;
-    private String myFileName = "";
-
-    private FileKey(int fileId) {
-      myFileId = fileId;
-    }
-
-    private FileKey(VirtualFile file) {
-      myFileId = FileBasedIndex.getFileId(file);
-      myFileName = file.getName();
-    }
-
-    public String getFileName() {
-      return myFileName;
-    }
-
-    public int getFileId() {
-      return myFileId;
-    }
-
-    @Override
-    public void writeValue(DataOutput out) throws IOException {
-      out.writeInt(myFileId);
-    }
-
-    @Override
-    public int hashCode() {
-      return myFileId;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return obj instanceof FileKey && ((FileKey)obj).myFileId == myFileId;
-    }
-  }
-
-  private static class ListDataExternalizer implements DataExternalizer<List<PackageExportSymbol>> {
-    @Override
-    public void save(@NotNull DataOutput out, List<PackageExportSymbol> value) throws IOException {
-      out.writeInt(value.size());
-      for (PackageExportSymbol info : value) {
-        IOUtil.writeUTF(out, info.nameSpace);
-        IOUtil.writeUTF(out, info.symbol);
-      }
-    }
-
-    @Override
-    public List<PackageExportSymbol> read(@NotNull DataInput in) throws IOException {
-      int size = in.readInt();
-      ArrayList<PackageExportSymbol> info = new ArrayList<PackageExportSymbol>(size);
-      for (int i = 0; i < size; i++) {
-        info.add(new PackageExportSymbol(IOUtil.readUTF(in), IOUtil.readUTF(in)));
-      }
-      return info;
-    }
-  }
 }