improved quoting for identifier added

src/org/jetbrains/jet/j2k/ast/IdentifierImpl.java

@@ -7,6 +7,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class IdentifierImpl extends Expression implements Identifier {
   private final String myName;
+  private boolean myHasDollar;
   private boolean myNullable = true;
 
   public IdentifierImpl(String name) {
@@ -18,6 +19,12 @@ public class IdentifierImpl extends Expression implements Identifier {
     myNullable = nullable;
   }
 
+  public IdentifierImpl(String name, boolean hasDollar, boolean nullable) {
+    myName = name;
+    myHasDollar = hasDollar;
+    myNullable = nullable;
+  }
+
   @Override
   public String getName() {
     return myName;
@@ -37,11 +44,17 @@ public class IdentifierImpl extends Expression implements Identifier {
     return myNullable;
   }
 
+  private String ifNeedQuote(String name) {
+    if (ONLY_KOTLIN_KEYWORDS.contains(name) || name.contains("$"))
+      return quote(name);
+    return name;
+  }
+
   @NotNull
   @Override
   public String toKotlin() {
-    if (ONLY_KOTLIN_KEYWORDS.contains(myName))
+    if (myHasDollar)
-      return quote(myName);
+      return DOLLAR + ifNeedQuote(myName);
-    return myName;
+    return ifNeedQuote(myName);
   }
 }

src/org/jetbrains/jet/j2k/ast/Node.java

@@ -37,8 +37,9 @@ public abstract class Node implements INode {
   static final String COLON = ":";
   static final String IN = "in";
   static final String AT = "@";
+  static final String DOLLAR = "$";
   static final String BACKTICK = "`";
   static final String QUEST = "?";
   static final String COMMA_WITH_SPACE = "," + SPACE;
   static final String STAR = "*";
-}
+}

src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java

@@ -234,7 +234,7 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
     boolean isNullable = typeToType(expression.getType()).isNullable();
 
     final IdentifierImpl identifier = hasDollar ?
-      new IdentifierImpl("$" + expression.getReferenceName(), isNullable) :
+      new IdentifierImpl(expression.getReferenceName(), hasDollar, isNullable) :
       new IdentifierImpl(expression.getReferenceName(), isNullable);
     myResult = new CallChainExpression(
       expressionToExpression(expression.getQualifierExpression()),

testData/ast/identifier/expression/withDollar.jav

@@ -0,0 +1 @@
+$$$$$

testData/ast/identifier/expression/withDollar.kt

@@ -0,0 +1 @@
+`$$$$$`

testData/ast/identifier/file/finalFieldReference.jav

@@ -0,0 +1,13 @@
+class $$$$$ {}
+
+class $ {}
+
+class $$ extends $ {
+  final $$$$$ $$$;
+
+  public $$($$$$$ $$$$) {
+    $$$ = $$$$;
+  }
+  
+  public $$$$$ $$$$$$() {return $$$;}
+}

testData/ast/identifier/file/finalFieldReference.kt

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

testData/ast/identifier/statement/keywords.jav

@@ -0,0 +1,5 @@
+int
+namespace, in, val, var, when, object,
+out, in, is, as, ref, override,
+open, attribute, lazy, set, get,
+fun, where, by, trait, type, This;

testData/ast/identifier/statement/keywords.kt

@@ -0,0 +1,23 @@
+var `namespace` : Int
+var `in` : Int
+var `val` : Int
+var `var` : Int
+var `when` : Int
+var `object` : Int
+var `out` : Int
+var `in` : Int
+var `is` : Int
+var `as` : Int
+var `ref` : Int
+var `override` : Int
+var `open` : Int
+var `attribute` : Int
+var `lazy` : Int
+var `set` : Int
+var `get` : Int
+var `fun` : Int
+var `where` : Int
+var `by` : Int
+var `trait` : Int
+var `type` : Int
+var `This` : Int