Small fix in finding the references in strings

Author: halirutan

resources/META-INF/plugin.xml

@@ -166,7 +166,7 @@
         implementation="de.halirutan.mathematica.codeinsight.inspections.MathematicaInspectionProvider"/>
 
     <psi.referenceContributor language="Mathematica" implementation="de.halirutan.mathematica.parsing.psi.MathematicaReferenceContributor"/>
-    <renamePsiElementProcessor implementation="de.halirutan.mathematica.refactoring.MathematicaPsiRenameProcessor"/>
+    <!--<renamePsiElementProcessor implementation="de.halirutan.mathematica.refactoring.MathematicaPsiRenameProcessor"/>-->
 
 
     <!--<applicationService serviceInterface="de.halirutan.mathematica.MathematicaSettings" serviceImplementation="de.halirutan.mathematica.MathematicaSettings"/>-->

src/de/halirutan/mathematica/parsing/psi/MathematicaStringReferenceProvider.java

@@ -69,7 +69,7 @@ public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNu
           final Expression symbol = ((MessageName) messageElement).getSymbol();
           if (symbol instanceof Symbol) {
             String usageText = element.getText();
-            final String symbolName = Matcher.quoteReplacement(((Symbol) symbol).getSymbolName());
+            final String symbolName = Matcher.quoteReplacement(((Symbol) symbol).getFullSymbolName());
             Pattern symbolNamePattern = StringUsageReference.getSymbolPattern(symbolName);
             final Matcher matcher = symbolNamePattern.matcher(usageText);
             while (matcher.find()) {

src/de/halirutan/mathematica/parsing/psi/api/Symbol.java

@@ -47,6 +47,11 @@ public interface Symbol extends PsiNameIdentifierOwner {
    */
   String getSymbolName();
 
+  /**
+   * Returns the full name of the symbol with context.
+   * @return Symbol name with context
+   */
+  String getFullSymbolName();
   /**
    * Returns true if the <em>definition element</em> of this symbol was already resolved and is up to date. If this
    * returns true then you can call {@link #getResolveElement()} to get the place of definition or {@link

src/de/halirutan/mathematica/parsing/psi/impl/SymbolImpl.java

@@ -104,6 +104,11 @@ public String getSymbolName() {
     }
   }
 
+  @Override
+  public String getFullSymbolName() {
+    return getName();
+  }
+
   @Nullable
   @Override
   public PsiElement getNameIdentifier() {

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

@@ -68,15 +68,20 @@ public void testUsage() throws Exception {
     myFixture.checkResult("newFunc::usage = \"newFunc is a function called like newFunc[]\";");
   }
 
-  // This test fails du to a bug in idea
-//  @Test
-//  public void testDollarVariables() throws Exception {
-//    myFixture.configureByText(MathematicaFileType.INSTANCE,
-//        "var$ = 1;\n" +
-//            "var$<caret> + var$");
-//    myFixture.renameElementAtCaret("$var$");
-//    myFixture.checkResult("$var$ = 1;\n" +
-//        "$var$ + $var$");
-//  }
+  public void testUsage2() throws Exception {
+    myFixture.configureByText(MathematicaFileType.INSTANCE,
+        "func<caret>::usage = \"func is a function called like func[]\";");
+    myFixture.renameElementAtCaret("newFunc");
+    myFixture.checkResult("newFunc::usage = \"newFunc is a function called like newFunc[]\";");
+  }
+
+  public void testDollarVariables() throws Exception {
+    myFixture.configureByText(MathematicaFileType.INSTANCE,
+        "var$ = 1;\n" +
+            "var$<caret> + var$");
+    myFixture.renameElementAtCaret("$var$");
+    myFixture.checkResult("$var$ = 1;\n" +
+        "$var$ + $var$");
+  }
 
 }