Improved completion of built-in symbols by removing the importance weighting. Fixed some smaller bugs in the completion engine

Author: halirutan

.idea/dictionaries/patrick.xml

@@ -1,3 +1,24 @@
+<!--
+  ~ Copyright (c) 2017 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.
+  -->
+
 <idea-plugin url="http://mathematicaplugin.halirutan.de" version="2">
   <id>de.halirutan.mathematica</id>
   <name>Mathematica Support</name>
@@ -174,7 +195,6 @@
                              instance="de.halirutan.mathematica.settings.MathematicaSettingsConfigurable"/>
     <gotoRelatedProvider
         implementation="de.halirutan.mathematica.codeinsight.navigation.MathematicaGotoRelatedProvider"/>
-
   </extensions>
 
   <actions>

resources/META-INF/plugin.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Patrick Scheibe
+ * Copyright (c) 2017 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
@@ -21,9 +21,12 @@
 
 package de.halirutan.mathematica.codeinsight.completion;
 
-import com.intellij.codeInsight.completion.*;
+import com.intellij.codeInsight.completion.CompletionContributor;
+import com.intellij.codeInsight.completion.CompletionParameters;
+import com.intellij.codeInsight.completion.CompletionResultSet;
+import com.intellij.codeInsight.completion.CompletionType;
+import com.intellij.codeInsight.completion.impl.BetterPrefixMatcher;
 import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
-import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.patterns.PsiElementPattern.Capture;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ProcessingContext;
@@ -57,13 +60,12 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
     }
 
     String prefix = findCurrentText(parameters, parameters.getPosition());
-    CamelHumpMatcher matcher = new CamelHumpMatcher(prefix, true);
-
+    BetterPrefixMatcher matcher = new BetterPrefixMatcher(new CamelHumpMatcher(prefix, true), 200);
     CompletionResultSet result2 = result.withPrefixMatcher(matcher);
 
     for (SymbolInformation info : symbols.values()) {
       BuiltinSymbolLookupElement lookup = new BuiltinSymbolLookupElement(info);
-      result2.addElement(PrioritizedLookupElement.withPriority(lookup, info.importance));
+      result2.addElement(lookup);
     }
   }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Patrick Scheibe
+ * Copyright (c) 2017 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
@@ -41,6 +41,8 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
+ * One particular lookup element of a built-in function or symbol. It handles the insert and lets users inserts
+ * completions ins various ways.
  * @author patrick (30.11.16).
  */
 @SuppressWarnings("AnonymousClassVariableHidesContainingMethodVariable")
@@ -132,8 +134,7 @@ public LookupElement[] calculateLookupItems(ExpressionContext context) {
                   }
                 });
               }
-              Template template = builder.buildInlineTemplate();
-              TemplateManager.getInstance(context.getProject()).startTemplate(context.getEditor(), template);
+              builder.run(context.getEditor(), true);
 
             }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Patrick Scheibe
+ * Copyright (c) 2017 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
@@ -24,19 +24,13 @@
 import com.intellij.codeInsight.completion.*;
 import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.intellij.patterns.PsiElementPattern;
 import com.intellij.patterns.PsiElementPattern.Capture;
 import com.intellij.psi.PsiComment;
-import com.intellij.psi.PsiElement;
 import com.intellij.util.ProcessingContext;
 import de.halirutan.mathematica.MathematicaLanguage;
-import de.halirutan.mathematica.parsing.MathematicaElementTypes;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashMap;
-
 import static com.intellij.patterns.PlatformPatterns.psiComment;
-import static com.intellij.patterns.PlatformPatterns.psiElement;
 
 /**
  * @author patrick (4/2/13)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Patrick Scheibe
+ * Copyright (c) 2017 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
@@ -25,21 +25,23 @@
 import com.intellij.codeInsight.lookup.Lookup;
 import com.intellij.codeInsight.lookup.impl.LookupImpl;
 import com.intellij.psi.PsiFile;
-import de.halirutan.mathematica.MathematicaLanguage;
+import de.halirutan.mathematica.filetypes.MathematicaFileType;
 import org.jetbrains.annotations.Nullable;
 
 /**
+ * This changes the behaviour of what happens with the completion pop-up when you press several chars.
+ * In Mathematica we want to insert completions with various braces (more than in Java) and additionally,
+ * we want the pop-up to stay open when we insert ` as it is a valid variable name part.
  * @author patrick (7/7/14)
  */
 public class MathematicaCharFilter extends CharFilter {
   @Nullable
   @Override
   public Result acceptChar(final char c, final int prefixLength, final Lookup lookup) {
-//    if (!lookup.isFocused()) return null;
     final PsiFile psiFile = lookup.getPsiFile();
-
-    if (psiFile != null && !psiFile.getViewProvider().getLanguages().contains(MathematicaLanguage.INSTANCE))
+    if (psiFile == null || !(psiFile.getFileType() instanceof MathematicaFileType)) {
       return null;
+    }
 
     switch (c) {
       case '[':

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Patrick Scheibe
+ * Copyright (c) 2017 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
@@ -57,7 +57,7 @@ class SmartContextAwareCompletion extends MathematicaCompletionProvider {
 
 
   private static final HashMap<String, SymbolInformation> ourSymbolInformation = SymbolInformationProvider.getSymbolNames();
-  private static final HashSet<String> ourOptionsWithSetDelayed = new HashSet<String>(Arrays.asList(new String[]{
+  private static final HashSet<String> ourOptionsWithSetDelayed = new HashSet<>(Arrays.asList(new String[]{
       "EvaluationMonitor", "StepMonitor", "DisplayFunction", "Deinitialization", "DisplayFunction",
       "DistributedContexts", "Initialization", "UnsavedVariables", "UntrackedVariables"
   }));
@@ -77,6 +77,9 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
       final Symbol head = (Symbol) ((FunctionCall) function).getHead();
       String functionName = head.getSymbolName();
       String functionContext = head.getMathematicaContext();
+      if (functionContext.equals("") && ourSymbolInformation.containsKey("System`" + functionName)) {
+        functionContext = "System`";
+      }
       final String key = functionContext + functionName;
       if (ourSymbolInformation.containsKey(key) && ourSymbolInformation.get(key).function) {
         final SymbolInformation functionInformation = ourSymbolInformation.get(key);
@@ -90,7 +93,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
       }
 
       if (functionName.equals("Message")) {
-        final Set<LookupElement> usages = new com.intellij.util.containers.hash.HashSet<LookupElement>();
+        final Set<LookupElement> usages = new com.intellij.util.containers.hash.HashSet<>();
 
         MathematicaRecursiveVisitor visitor = new MathematicaRecursiveVisitor() {