javac-wrapper: fixes after rebase and review

compiler/testData/javac/diagnostics/tests/Annotations.kt

@@ -15,6 +15,25 @@ public class x {
 
     @ann3((1 + 1))
     public String method2() { return null; }
+
+    @def
+    public String method3() { return null; }
+
+    @def(1)
+    public String method4() { return null; }
+
+    @def(firstDefault = "f", 5)
+    public String method5() { return null; }
+
+    @def(secondDefault = "s", 14)
+    public String method6() { return null; }
+
+    @def(firstDefault = "f", secondDefault = "s", 17)
+    public String method7() { return null; }
+
+    @def("1", "2", 3)
+    public String method8() { return null; }
+
 }
 
 // FILE: a/ann1.java
@@ -49,4 +68,13 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 @interface ann3 {
     public int value();
+}
+
+// FILE: a/def.java
+package a;
+
+public @interface def {
+    String firstDefault() default "firstDefault";
+    String secondDefault() default "secondDefault";
+    int notDefault();
 }

compiler/testData/javac/diagnostics/tests/Annotations.txt

@@ -36,12 +36,28 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
+    public final annotation class def : kotlin.Annotation {
+        public constructor def(/*0*/ firstDefault: kotlin.String = ..., /*1*/ secondDefault: kotlin.String = ..., /*2*/ notDefault: kotlin.Int)
+        public final val firstDefault: kotlin.String
+        public final val notDefault: kotlin.Int
+        public final val secondDefault: kotlin.String
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
     @a.ann(value = kotlin.String::class) public open class x {
         public constructor x()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         @a.ann2(i = 42, value = {a.ann1(a = "ab", i = 2), a.ann1(a = "b", i = 2), a.ann1(a = "c", i = 3)}) public open fun method(): kotlin.String!
         @a.ann3(value = 2) public open fun method2(): kotlin.String!
+        @a.def public open fun method3(): kotlin.String!
+        @a.def(value = 1) public open fun method4(): kotlin.String!
+        @a.def(firstDefault = "f", value = 5) public open fun method5(): kotlin.String!
+        @a.def(secondDefault = "s", value = 14) public open fun method6(): kotlin.String!
+        @a.def(firstDefault = "f", secondDefault = "s", value = 17) public open fun method7(): kotlin.String!
+        @a.def(value = 3) public open fun method8(): kotlin.String!
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }

compiler/testData/javac/diagnostics/tests/qualifiedExpression/PackageVsClass.kt

@@ -37,10 +37,6 @@ fun test(a_b: a.b) {
     val ab_c = t2()
     ab_c.<!UNRESOLVED_REFERENCE!>ab_c<!>()
     ab_c.a_bc()
-
-    val ab_c2: a.b.c = t2()
-    ab_c2.<!UNRESOLVED_REFERENCE!>ab_c<!>()
-    ab_c2.a_bc()
 }
 
 fun test2() = t().a_b()