Fixed names validator for renaming

Author: halirutan

src/de/halirutan/mathematica/refactoring/MathematicaNamesValidator.java

@@ -25,6 +25,9 @@
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * For Mathematica syntax, we need special identifier rules because a variable in Mathematica can contain context
  * back-ticks. Therefore, this is a valid variable C`B`a.
@@ -36,61 +39,33 @@
  */
 public class MathematicaNamesValidator implements NamesValidator {
 
+  private Pattern mySymbolPattern;
+
+  @SuppressWarnings("WeakerAccess")
+  public MathematicaNamesValidator() {
+    final String nc = "\\\\\\[[a-zA-Z]+\\]";
+    final String symbol = "([$a-zA-Z]|" + nc + ")([$a-zA-Z0-9]|" + nc + ")*";
+    final String withContext = "`?(" + symbol + "`)*" + symbol;
+    mySymbolPattern = Pattern.compile(withContext);
+
+  }
+
   @Override
   public boolean isKeyword(@NotNull final String name, final Project project) {
     return false;
   }
 
-  private enum VariableState {
-    PREFIX_BACK_TICK,
-    SYMBOL_START,
-    SYMBOL_INNER
-  }
-
   /**
    * Makes it possible that a variable can contain back-ticks.
    *
-   * @param name
-   *     name of the variable you like to check
-   * @param project
-   *     project where the call comes from
+   * @param name    name of the variable you like to check
+   * @param project project where the call comes from
    * @return true if name is a valid Mathematica identifier
    */
   @Override
   public boolean isIdentifier(@NotNull final String name, final Project project) {
-    final int len = name.length();
-    if (len == 0) return false;
-
-    VariableState state = VariableState.PREFIX_BACK_TICK;
-
-    for (int i = 1; i < len; i++) {
-      final char ch = name.charAt(i);
-      switch (state) {
-        case PREFIX_BACK_TICK:
-          if (!(Character.isLetter(ch) || ch == '$' || ch == '`')) return false;
-          else state = VariableState.SYMBOL_START;
-          break;
-        case SYMBOL_START:
-          if (!(Character.isLetter(ch) || ch == '$')) return false;
-          else state = VariableState.SYMBOL_INNER;
-          break;
-        case SYMBOL_INNER:
-          if (!(Character.isLetterOrDigit(ch) || ch == '$')) {
-            // several context parts of a variable are separated by a back-tick, but a back-tick cannot be the
-            // last part, because then it wouldn't be a valid identifier
-            if (ch == '`' && i != len - 1) {
-              state = VariableState.SYMBOL_START;
-              break;
-            } else {
-              return false;
-            }
-          }
-          break;
-        default:
-          return false;
-      }
-    }
-    return true;
+    Matcher matcher = mySymbolPattern.matcher(name);
+    return matcher.matches();
   }
 
 }

tests/de/halirutan/mathematica/refactoring/MathematicaNamesValidatorTest.java

@@ -0,0 +1,64 @@
+/*
+ * 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.refactoring;
+
+import org.junit.Test;
+
+import java.util.ResourceBundle;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author patrick (27.12.16).
+ */
+public class MathematicaNamesValidatorTest {
+
+  private ResourceBundle myNamedCharacters = ResourceBundle.getBundle("de.halirutan.mathematica.codeinsight.completion.namedCharacters");
+  private ResourceBundle mySymbols = ResourceBundle.getBundle("de.halirutan.mathematica.codeinsight.completion.symbolInformationV11_0_1");
+
+  private String myCounterExamples[] = {
+      "Internal`",
+      "0Symbol",
+      "Internal`3",
+      "Developer`ToPacketArray`"
+  };
+
+  @Test
+  public void testIsIdentifier() throws Exception {
+    MathematicaNamesValidator validator = new MathematicaNamesValidator();
+    for (String nc : myNamedCharacters.keySet()) {
+      assertTrue(validator.isIdentifier("\\[" + nc + "]", null));
+    }
+
+    for (String symbol : mySymbols.keySet()) {
+      assertTrue(symbol, validator.isIdentifier(symbol, null));
+    }
+
+    for (String badSymbol : myCounterExamples) {
+      assertFalse(badSymbol, validator.isIdentifier(badSymbol, null));
+    }
+
+    assertTrue(validator.isIdentifier("Internal`testvar",null));
+  }
+
+}