Add $ as the char of popup parameter completion

Author: Yanglin

META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2" url="https://github.com/seventh7/intellij-mybatis-plugin">
     <id>com.seventh7.plugin.mybatis</id>
     <name>MyBatis plugin</name>
-    <version>2.21</version>
+    <version>2.22</version>
     <vendor email="insist.day@gmail.com" url="https://github.com/seventh7">Yanglin</vendor>
 
     <description><![CDATA[
@@ -10,6 +10,10 @@
       ]]></description>
 
     <change-notes><![CDATA[
+      <h4>2.22</h4>
+      <ul>
+          <li>Add '$' as the beginning char of popup parameter completion</li>
+      </ul>
       <h4>2.21</h4>
       <ul>
           <li>Rebuild mapper model</li>

src/com/seventh7/mybatis/action/MybatisTypedHandler.java

@@ -31,12 +31,19 @@ public Result checkAutoPopup(char charTyped, final Project project, final Editor
 
   @Override
   public Result charTyped(char c, final Project project, @NotNull final Editor editor, @NotNull PsiFile file) {
+    if (c != '{') {
+      return Result.CONTINUE;
+    }
     int index = editor.getCaretModel().getOffset() - 2;
+    if (index < 0) {
+      return Result.CONTINUE;
+    }
+    char beginningChar = editor.getDocument().getText().charAt(index);
+    if (beginningChar != '#' && beginningChar != '$') {
+      return Result.CONTINUE;
+    }
     PsiFile topLevelFile = InjectedLanguageUtil.getTopLevelFile(file);
-    boolean parameterCase = c == '{' &&
-                            index >= 0 &&
-                            editor.getDocument().getText().charAt(index) == '#' &&
-                            file instanceof SqlFile &&
+    boolean parameterCase = file instanceof SqlFile &&
                             DomUtils.isMybatisFile(topLevelFile);
     if (parameterCase) {
       autoPopupParameter(project, editor);

src/com/seventh7/mybatis/contributor/SqlParamCompletionContributor.java

@@ -51,7 +51,7 @@ private boolean shouldAddElement(PsiFile file, int offset) {
     String text = file.getText();
     for (int i = offset - 1; i > 0; i--) {
       char c = text.charAt(i);
-      if (c == '{' && text.charAt(i - 1) == '#') return true;
+      if (c == '{' && (text.charAt(i - 1) == '#' || text.charAt(i - 1) == '$')) return true;
     }
     return false;
   }