set with keyword updated

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

@@ -17,10 +17,7 @@ public abstract class Node implements INode {
   }
 
   final static Set<String> ONLY_KOTLIN_KEYWORDS = new HashSet<String>(Arrays.asList(
-    "namespace", "in", "val", "var", "when", "object",
+    "namespace", "as", "type", "val", "var", "fun", "is", "in", "object", "when", "trait", "This"
-    "out", "in", "is", "as", "ref", "override",
-    "open", "attribute", "lazy", "set", "get",
-    "fun", "where", "by", "trait", "type", "This"
   ));
 
   public final static Set<String> PRIMITIVE_TYPES = new HashSet<String>(Arrays.asList(

testData/ast/callChainExpression/statement/sout.kt

@@ -1 +1 @@
-System.`out`?.println("Hello, world")
+System.out?.println("Hello, world")

testData/ast/constructors/file/customerBuilder.kt

@@ -38,8 +38,8 @@ public open class User() {
 class object {
 open public fun main() : Unit {
 var customer : Customer? = org.test.customer.CustomerBuilder().WithFirstName("Homer")?.WithLastName("Simpson")?.Build()
-System.`out`?.println(customer?.getFirstName())
+System.out?.println(customer?.getFirstName())
-System.`out`?.println(customer?.getLastName())
+System.out?.println(customer?.getLastName())
 }
 }
 }

testData/ast/enum/class/runnableImplementation.kt

@@ -5,6 +5,6 @@ RED
 YELLOW
 BLUE
 override public fun run() : Unit {
-System.`out`?.println(("name()=" + name() + ", toString()=" + toString()))
+System.out?.println(("name()=" + name() + ", toString()=" + toString()))
 }
 }

testData/ast/identifier/statement/keywords.jav

@@ -1,5 +1 @@
-int
+int namespace, as, type, val, var, fun, is, in, object, when, trait, This;
-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

@@ -1,23 +1,12 @@
 var `namespace` : Int
-var `in` : Int
+var `as` : Int
+var `type` : 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 `is` : Int
-var `by` : Int
+var `in` : Int
+var `object` : Int
+var `when` : Int
 var `trait` : Int
-var `type` : Int
 var `This` : Int

testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt

@@ -21,7 +21,7 @@ break@test
 }
 }
 }
-System.`out`?.println((if (foundIt)
+System.out?.println((if (foundIt)
 "Found it"
 else
 "Didn't find it"))

testData/ast/methodCallExpression/statement/callWithKeywords.kt

@@ -1 +1 @@
-`when`(`open`, `trait`)
+`when`(open, `trait`)

testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt

@@ -1,5 +1,5 @@
 java.lang.Runnable() {
 override public fun run() : Unit {
-System.`out`?.println("Run")
+System.out?.println("Run")
 }
 }