continue work on KT-458

70b7810c30 fixed parser

this commit fixes typer

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclaration.java

@@ -19,7 +19,12 @@ public abstract class JetNamedDeclaration extends JetDeclaration implements PsiN
     @Override
     public String getName() {
         PsiElement identifier = getNameIdentifier();
-        return identifier != null ? identifier.getText() : null;
+        if (identifier != null) {
+            String text = identifier.getText();
+            return text != null ? JetPsiUtil.unquoteIdentifier(text) : null;
+        } else {
+            return null;
+        }
     }
 
     @Override

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java

@@ -73,4 +73,30 @@ public class JetPsiUtil {
         }
         return null;
     }
+
+    @NotNull
+    public static String unquoteIdentifier(@NotNull String quoted) {
+        if (quoted.indexOf('`') < 0) {
+            return quoted;
+        }
+
+        if (quoted.startsWith("`") && quoted.endsWith("`") && quoted.length() >= 2) {
+            return quoted.substring(1, quoted.length() - 1);
+        } else {
+            return quoted;
+        }
+    }
+    
+    @NotNull
+    public static String unquoteIdentifierOrFieldReference(@NotNull String quoted) {
+        if (quoted.indexOf('`') < 0) {
+            return quoted;
+        }
+
+        if (quoted.startsWith("$")) {
+            return "$" + unquoteIdentifier(quoted.substring(1));
+        } else {
+            return unquoteIdentifier(quoted);
+        }
+    }
 }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java

@@ -30,10 +30,7 @@ public class JetSimpleNameExpression extends JetReferenceExpression {
             return null;
         }
         String text = referencedNameElement.getNode().getText();
-        if (text.startsWith("`") && text.endsWith("`") && text.length() >= 2) {
+        return text != null ? JetPsiUtil.unquoteIdentifierOrFieldReference(text) : null;
-            return text.substring(1, text.length()-1);
-        }
-        return text;
     }
 
     @Nullable @IfNotParsed

compiler/testData/checkerWithErrorTypes/quick/Dollar.jet

@@ -0,0 +1,15 @@
+namespace dollar
+
+open class `$$$$$`() {
+}
+open class `$`() {
+}
+open class `$$`(`$$$$` : `$$$$$`?) : `$`() {
+    val `$$$` : `$$$$$`?
+    {
+        $`$$$` = `$$$$`
+    }
+    open public fun `$$$$$$`() : `$$$$$`? {
+        return `$$$`
+    }
+}

compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java

@@ -0,0 +1,27 @@
+package org.jetbrains.jet.lang.psi;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+/**
+ * @author Stepan Koltsov
+ */
+public class JetPsiUtilTest extends TestCase {
+    
+    public void testUnquotedIdentifier() {
+        Assert.assertEquals("", JetPsiUtil.unquoteIdentifier(""));
+        Assert.assertEquals("a2", JetPsiUtil.unquoteIdentifier("a2"));
+        Assert.assertEquals("", JetPsiUtil.unquoteIdentifier("``"));
+        Assert.assertEquals("a2", JetPsiUtil.unquoteIdentifier("`a2`"));
+    }
+
+    public void testUnquotedIdentifierOrFieldReference() {
+        Assert.assertEquals("", JetPsiUtil.unquoteIdentifierOrFieldReference(""));
+        Assert.assertEquals("a2", JetPsiUtil.unquoteIdentifierOrFieldReference("a2"));
+        Assert.assertEquals("", JetPsiUtil.unquoteIdentifierOrFieldReference("``"));
+        Assert.assertEquals("a2", JetPsiUtil.unquoteIdentifierOrFieldReference("`a2`"));
+        Assert.assertEquals("$a2", JetPsiUtil.unquoteIdentifierOrFieldReference("$a2"));
+        Assert.assertEquals("$a2", JetPsiUtil.unquoteIdentifierOrFieldReference("$`a2`"));
+    }
+
+}