Build a better completion lookup. Fixed automatic bracket inserting on the way

Author: halirutan

resources/de/halirutan/mathematica/codeinsight/completion/symbolInformationV11_0_1.properties

@@ -3717,7 +3717,7 @@ System`MandelbrotSetMemberQ=1369;Protected ReadProtected;MandelbrotSetMemberQ;{_
 System`MandelbrotSetPlot=1695;Protected ReadProtected;MandelbrotSetPlot;{Optional[{_, _}], OptionsPattern[]};{AlignmentPoint, AspectRatio, Axes, AxesLabel, AxesOrigin, AxesStyle, Background, BaselinePosition, BaseStyle, ColorFunction, ColorFunctionScaling, ColorOutput, ContentSelectable, CoordinatesToolOptions, DisplayFunction, Epilog, EscapeRadius, FormatType, Frame, FrameLabel, FrameStyle, FrameTicks, FrameTicksStyle, GridLines, GridLinesStyle, ImageMargins, ImagePadding, ImageResolution, ImageSize, ImageSizeRaw, LabelStyle, MaxIterations, Method, PerformanceGoal, PlotLabel, PlotLegends, PlotRange, PlotRangeClipping, PlotRangePadding, PlotRegion, PlotTheme, PreserveImageOptions, Prolog, RotateLabel, Ticks, TicksStyle}
 System`MangoldtLambda=0;Protected ReadProtected;MangoldtLambda;{_}
 System`ManhattanDistance=1462;Protected;ManhattanDistance;{_, _}
-System`Manipulate=3257;Protected ReadProtected;Manipulate;{FunctionInformation`Private`expr_, FunctionInformation`Private`uspec__, OptionsPattern[]};{Alignment, AppearanceElements, AutoAction, AutorunSequencing, BaselinePosition, BaseStyle, Bookmarks, ContentSize, ContinuousAction, ControlAlignment, ControllerLinking, ControllerMethod, ControllerPath, ControlPlacement, ControlType, DefaultBaseStyle, DefaultLabelStyle, Deinitialization, Deployed, Evaluator, Frame, FrameLabel, FrameMargins, ImageMargins, Initialization, InterpolationOrder, LabelStyle, LocalizeVariables, Method, Paneled, PreserveImageOptions, RotateLabel, SaveDefinitions, ShrinkingDelay, SynchronousInitialization, SynchronousUpdating, TouchscreenAutoZoom, TouchscreenControlPlacement, TrackedSymbols, UndoTrackedVariables, UnsavedVariables, UntrackedVariables};{Manipulate, {2, Infinity}, Lexical}
+System`Manipulate=3257;Protected ReadProtected;Manipulate;{_, __, OptionsPattern[]};{Alignment, AppearanceElements, AutoAction, AutorunSequencing, BaselinePosition, BaseStyle, Bookmarks, ContentSize, ContinuousAction, ControlAlignment, ControllerLinking, ControllerMethod, ControllerPath, ControlPlacement, ControlType, DefaultBaseStyle, DefaultLabelStyle, Deinitialization, Deployed, Evaluator, Frame, FrameLabel, FrameMargins, ImageMargins, Initialization, InterpolationOrder, LabelStyle, LocalizeVariables, Method, Paneled, PreserveImageOptions, RotateLabel, SaveDefinitions, ShrinkingDelay, SynchronousInitialization, SynchronousUpdating, TouchscreenAutoZoom, TouchscreenControlPlacement, TrackedSymbols, UndoTrackedVariables, UnsavedVariables, UntrackedVariables};{Manipulate, {2, Infinity}, Lexical}
 System`Manipulator=2608;Protected ReadProtected;Manipulator;{_., Optional[{_, _, _.}], OptionsPattern[]};{AnimationDirection, AnimationRate, AnimationRunning, AnimationTimeIndex, Appearance, AppearanceElements, AutoAction, BaselinePosition, BaseStyle, ContinuousAction, DefaultOptions, Enabled, Exclusions, ImageMargins, ImageSize, LabelStyle, PausedTime}
 System`MannedSpaceMissionData=1956;Protected ReadProtected;MannedSpaceMissionData;{_., _., _.}
 System`MannWhitneyTest=0;Protected ReadProtected;MannWhitneyTest;{_, _., _., OptionsPattern[]};{AlternativeHypothesis, Method, SignificanceLevel, VerifyTestAssumptions, MaxIterations}

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

@@ -57,17 +57,13 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
     }
 
     String prefix = findCurrentText(parameters, parameters.getPosition());
-    CamelHumpMatcher matcher = new CamelHumpMatcher(prefix, false);
+    CamelHumpMatcher matcher = new CamelHumpMatcher(prefix, true);
 
     CompletionResultSet result2 = result.withPrefixMatcher(matcher);
-    for (String name : symbols.keySet()) {
-      SymbolInformation symbol = symbols.get(name);
-      LookupElementBuilder elm = LookupElementBuilder
-          .create(symbol.context.compareTo("System`") == 0 ? symbol.nameWithoutContext : symbol.name)
-          .withInsertHandler(MathematicaBracketInsertHandler.getInstance())
-          .withTypeText(symbol.context)
-          .withPresentableText(symbol.nameWithoutContext);
-      result2.addElement(PrioritizedLookupElement.withPriority(elm, symbol.importance));
+
+    for (SymbolInformation info : symbols.values()) {
+      BuiltinSymbolLookupElement lookup = new BuiltinSymbolLookupElement(info);
+      result2.addElement(PrioritizedLookupElement.withPriority(lookup, info.importance));
     }
   }
 }

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

@@ -0,0 +1,98 @@
+/*
+ * 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.codeinsight.completion;
+
+import com.intellij.codeInsight.completion.InsertionContext;
+import com.intellij.codeInsight.lookup.Lookup;
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.codeInsight.lookup.LookupElementPresentation;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDocumentManager;
+import de.halirutan.mathematica.codeinsight.completion.SymbolInformationProvider.SymbolInformation;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author patrick (30.11.16).
+ */
+public class BuiltinSymbolLookupElement extends LookupElement {
+
+  private final SymbolInformation myInfo;
+  private static final char OPEN_BRACKET = '[';
+  private static final char CLOSING_BRACKET = ']';
+
+  public BuiltinSymbolLookupElement(SymbolInformation info) {
+    myInfo = info;
+  }
+
+  @NotNull
+  @Override
+  public String getLookupString() {
+    if ("System`".equals(myInfo.context)) {
+      return myInfo.nameWithoutContext;
+    }
+    return myInfo.name;
+  }
+
+  @Override
+  public void renderElement(LookupElementPresentation presentation) {
+    presentation.setItemText(getLookupString());
+    presentation.setItemTextBold(myInfo.function);
+    presentation.setTailText(myInfo.function ? "[" + myInfo.getCallPattern() + "]" : "", true);
+    presentation.setTypeText(myInfo.context);
+  }
+
+  @Override
+  public boolean isCaseSensitive() {
+    return true;
+  }
+
+  @Override
+  public void handleInsert(InsertionContext context) {
+      Editor editor = context.getEditor();
+      Document document = editor.getDocument();
+      context.commitDocument();
+
+      char completionChar = context.getCompletionChar();
+      context.setAddCompletionChar(false);
+
+      if (completionChar == Lookup.COMPLETE_STATEMENT_SELECT_CHAR) {
+        if (myInfo.function) {
+          document.insertString(context.getTailOffset(), Character.toString(OPEN_BRACKET));
+          editor.getCaretModel().moveToOffset(context.getTailOffset());
+          document.insertString(context.getTailOffset(), Character.toString(CLOSING_BRACKET));
+        } else {
+          document.insertString(context.getTailOffset(), " ");
+          editor.getCaretModel().moveToOffset(context.getTailOffset());
+        }
+
+      }
+
+      if (completionChar == ' ') {
+        context.setAddCompletionChar(true);
+      }
+
+    final Project project = context.getProject();
+    PsiDocumentManager.getInstance(project).commitDocument(document);
+  }
+}

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

@@ -104,7 +104,7 @@ public static class SymbolInformation {
     public String context;
     public String nameWithoutContext;
 
-    public SymbolInformation(String nameIn, String nameWithoutContextIn, String contextIn, int importanceIn, String callPatternIn, boolean functionIn, String[] attributesIn, String[] optionsIn) {
+    SymbolInformation(String nameIn, String nameWithoutContextIn, String contextIn, int importanceIn, String callPatternIn, boolean functionIn, String[] attributesIn, String[] optionsIn) {
       this.name = nameIn;
       this.nameWithoutContext = nameWithoutContextIn;
       this.context = contextIn;
@@ -115,6 +115,17 @@ public SymbolInformation(String nameIn, String nameWithoutContextIn, String cont
       this.options = optionsIn;
     }
 
+    /**
+     * Removes the braces around the call patter
+     * @return call pattern without braces
+     */
+    String getCallPattern() {
+      if (callPattern.length() > 2 && callPattern.matches("\\{.*}")) {
+        return callPattern.substring(1, callPattern.length() - 1);
+      }
+      return "";
+    }
+
   }
 
 }