replace this. by $ for fields inside anonymous initializers

src/org/jetbrains/jet/j2k/Converter.java

@@ -62,7 +62,7 @@ public class Converter {
     List<Statement> result = new LinkedList<Statement>();
     for (Field f : fields) {
       final String identifierToKotlin = f.getIdentifier().toKotlin();
-      result.add(new DummyStringStatement("this." + identifierToKotlin + " = " + identifierToKotlin));
+      result.add(new DummyStringStatement("$" + identifierToKotlin + " = " + identifierToKotlin));
     }
     return result;
   }
@@ -87,7 +87,7 @@ public class Converter {
     final IdentifierImpl name = new IdentifierImpl(psiClass.getName());
 
     // we create primary constructor
-    if (!psiClass.isEnum() && getPrimaryConstructor(psiClass) == null) {
+    if (!psiClass.isEnum() && !psiClass.isInterface() && getPrimaryConstructor(psiClass) == null) {
       final List<Field> finalOrWithEmptyInitializer = getFinalOrWithEmptyInitializer(fields);
       final Map<String, String> initializers = new HashMap<String, String>();
 

testData/ast/callChainExpression/file/libraryFieldCall.kt

@@ -3,7 +3,7 @@ class object {
 val ourOut : PrintStream?
 }
 {
-this.ourOut = ourOut
+$ourOut = ourOut
 }
 }
 open class User() {

testData/ast/callChainExpression/file/libraryStringFieldCall.kt

@@ -1,7 +1,7 @@
 open class Library(myString : String?) {
 public val myString : String?
 {
-this.myString = myString
+$myString = myString
 }
 }
 open class User() {

testData/ast/class/class/classWithMultiplyFields.kt

@@ -3,7 +3,7 @@ var a : String?
 var b : String?
 var c : String? = "abc"
 {
-this.a = a
-this.b = b
+$a = a
+$b = b
 }
 }

testData/ast/constructors/file/identifier.kt

@@ -22,8 +22,8 @@ open public fun getName() : String? {
 return myName
 }
 {
-this.myName = myName
-this.myHasDollar = myHasDollar
+$myName = myName
+$myHasDollar = myHasDollar
 }
 }
 public open class User() {

testData/ast/field/file/internalField.kt

@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 var f : Foo?
 {
-this.f = f
+$f = f
 }
 }

testData/ast/field/file/privateField.kt

@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 private var f : Foo?
 {
-this.f = f
+$f = f
 }
 }

testData/ast/field/file/protectedField.kt

@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 protected var f : Foo?
 {
-this.f = f
+$f = f
 }
 }

testData/ast/field/file/publicField.kt

@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 public var f : Foo?
 {
-this.f = f
+$f = f
 }
 }

testData/ast/field/file/valWithInit.kt

@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 val f : Foo? = Foo(1, 2)
 {
-this.f = f
+$f = f
 }
 }

testData/ast/field/file/varWithoutInit.kt

@@ -1,6 +1,6 @@
 open class C(f : Foo?) {
 var f : Foo?
 {
-this.f = f
+$f = f
 }
 }

testData/ast/trait/class/interfaceWithFields.kt

@@ -4,9 +4,4 @@ val IN : String? = "in"
 val AT : String? = "@"
 val COMMA_WITH_SPACE : String? = (COMMA + SPACE)
 }
-{
-this.IN = IN
-this.AT = AT
-this.COMMA_WITH_SPACE = COMMA_WITH_SPACE
-}
 }

testData/ast/trait/class/interfaceWithStaticFields.kt

@@ -4,9 +4,4 @@ public val IN : String? = "in"
 public val AT : String? = "@"
 public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)
 }
-{
-this.IN = IN
-this.AT = AT
-this.COMMA_WITH_SPACE = COMMA_WITH_SPACE
-}
 }