Uast, Lint: Update and fix tests

plugins/uast-java/testData/render/ControlStructures.txt

@@ -1,20 +1,20 @@
-default class _Dummy_ {
-    default class ControlStructures {
-        public fun main(args: String[]): void {
+package_local class _Dummy_ {
+    package_local class ControlStructures {
+        public static fun main(args: String[]): void {
             if (args.length === 0) {
                 return
             }
 
-            var mode: String = (args.length === 1) ? ("singleArg") : ("multiArgs")
+            local var mode: String = (args.length === 1) ? ("singleArg") : ("multiArgs")
             for (arg : args) {
                 System.out.println(arg)
             }
 
-            for (var i: int = 0; i < args.length; ++i) {
+            for (local var i: int = 0; i < args.length; ++i) {
                 System.out.println(i + ": " + args[i])
             }
 
-            var i: int = 0
+            local var i: int = 0
             while (i < args.length) {
                 System.out.println("Index " + i)
                 i++
@@ -28,6 +28,5 @@ default class _Dummy_ {
             while (i < args.length)
 
         }
-
     }
 }

plugins/uast-java/testData/render/Lambda.txt

@@ -1,17 +1,17 @@
-default class _Dummy_ {
-    default class Lambda {
-        default fun example(): void {
+package_local class _Dummy_ {
+    package_local class Lambda {
+        package_local fun example(): void {
             doJob({ arg: String ->
                 arg + arg
             }, "Mary")
         }
 
-        default fun doJob(job: Job, arg: String): void {
+        package_local fun doJob(job: Job, arg: String): void {
             System.out.println(job.doJob(arg))
         }
-
     }
-    default abstract static interface Job {
-        public fun doJob(arg: String): String = EmptyExpression
+
+    package_local abstract static interface Job {
+        public abstract fun doJob(arg: String): String
     }
 }

plugins/uast-java/testData/render/NestedClasses.txt

@@ -1,14 +1,13 @@
-default class _Dummy_ {
-    default class NestedClasses {
+package_local class _Dummy_ {
+    package_local class NestedClasses {
         public static class Nested {
-            default fun func1(): void {
+            package_local fun func1(): void {
             }
-
         }
-        public class Inner {
-            default fun func2(): void {
-            }
 
+        public class Inner {
+            package_local fun func2(): void {
+            }
         }
     }
 }

plugins/uast-java/testData/render/Simple.txt

@@ -1,6 +1,6 @@
-default class _Dummy_ {
-    default class Simple {
-        var name: String
+package_local class _Dummy_ {
+    package_local class Simple {
+        private var name: String
 
         public fun <init>(name: String) {
             this.name = name
@@ -13,6 +13,5 @@ default class _Dummy_ {
         public fun setName(name: String): void {
             this.name = name
         }
-
     }
 }

plugins/uast-java/testData/render/SpecialExpressions.txt

@@ -1,15 +1,15 @@
-default class _Dummy_ {
-    default class SpecialExpressions {
-        default fun test(): boolean {
-            assert 5 > 3 : EmptyExpression
-            assert 5 > 3 : "Message"
-            synchronized this : {
+package_local class _Dummy_ {
+    package_local class SpecialExpressions {
+        package_local fun test(): boolean {
+            <assert>(5 > 3)
+            <assert>(5 > 3, "Message")
+            {
                 System.out.println("A")
             }
 
-            var a: int = 5
-            var b: int = 7
-            var c: int
+            local var a: int = 5
+            local var b: int = 7
+            local var c: int
             while (a > 0) {
                 if (a === 3) {
                     break
@@ -24,7 +24,7 @@ default class _Dummy_ {
 
             this.test()
             super.hashCode()
-            var x: String
+            local var x: String
             switch (a)
             {
                 1 ->
@@ -49,20 +49,16 @@ default class _Dummy_ {
             try {
                 Thread.sleep(1000)
             }
-
             catch (e) {
             }
-
             finally {
                 a = 3
             }
-
             {
                 a = 5
             }
 
             return true
         }
-
     }
 }