javac-wrapper: refactoring, fixes and tests

compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.kt

@@ -1,6 +1,6 @@
 // FILE: A.java
 public interface A {
-    public class A_
+    public class A_ {}
 }
 
 // FILE: 1.kt
@@ -24,4 +24,4 @@ class Y: B {
     companion object {
         val b: <!UNRESOLVED_REFERENCE!>B_<!> = <!UNRESOLVED_REFERENCE!>B_<!>()
     }
-}
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/oneInterfaceManyTimes.kt

@@ -17,14 +17,14 @@ open class K : C(), I
 
 // FILE: D.java
 
-public class D extends K, I {
+public class D extends K implements I {
     static int c = 1;
     static void baz() {}
 }
 
 // FILE: E.java
 
-public class E extends D, I {
+public class E extends D implements I {
     static int a = 1;
 }
 

compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsCompanion.kt

@@ -24,7 +24,7 @@ class C: B() {
 // FILE: X.java
 public class X extends B {
     static double foo() {
-        return 1.0
+        return 1.0;
     }
 }
 
@@ -33,4 +33,4 @@ class Y: X() {
     init {
         val a: Double = foo()
     }
-}
+}

compiler/testData/diagnostics/tests/scopes/kt1942.txt

@@ -1,5 +1,16 @@
 package
 
+package a {
+
+    public open class C {
+        public constructor C()
+        public/*package*/ final var myValue: kotlin.Int
+        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
+    }
+}
+
 package d {
 
     public final class A : a.C {

compiler/testData/diagnostics/tests/scopes/protectedVisibility/innerClassInJava.txt

@@ -11,3 +11,20 @@ package k1 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
+package p1 {
+
+    public open class BaseClass {
+        public constructor BaseClass()
+        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
+
+        protected/*protected and package*/ open inner class ProtSubClass {
+            public constructor ProtSubClass()
+            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
+        }
+    }
+}

compiler/testData/diagnostics/tests/scopes/protectedVisibility/javaInheritedInKotlin.kt

@@ -14,7 +14,7 @@ public class JavaClass {
 }
 
 // FILE: foo/JavaClassSamePackage.java
-package foo
+package foo;
 
 public class JavaClassSamePackage extends bar.JavaClass {
     protected static void bar2() {}

compiler/testData/diagnostics/tests/scopes/protectedVisibility/javaInheritedInKotlin.txt

@@ -1,5 +1,23 @@
 package
 
+package bar {
+
+    public open class JavaClass {
+        public constructor JavaClass()
+        protected/*protected and package*/ final var field: kotlin.String!
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        protected/*protected and package*/ open fun foo(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        // Static members
+        protected/*protected static*/ final var CONST1: kotlin.String!
+        protected/*protected static*/ final var CONST2: kotlin.String!
+        protected/*protected static*/ open fun bar1(): kotlin.Unit
+        protected/*protected static*/ open fun bar2(): kotlin.Unit
+    }
+}
+
 package foo {
     public fun test(/*0*/ a: foo.KotlinClass, /*1*/ b: foo.KotlinClass2): kotlin.Unit
 

compiler/testData/diagnostics/tests/scopes/protectedVisibility/kt7971.txt

@@ -1,5 +1,16 @@
 package
 
+package module1 {
+
+    public abstract class AbstractModule</*0*/ S : kotlin.Any!> {
+        public constructor AbstractModule</*0*/ S : kotlin.Any!>()
+        protected/*protected and package*/ open fun </*0*/ T : kotlin.Any!> bind(/*0*/ clazz: java.lang.Class<T!>!): S!
+        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
+    }
+}
+
 package module2 {
     public fun </*0*/ T> javaClass(): java.lang.Class<T>
 

compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructorJavaDifferentPackage.txt

@@ -7,3 +7,15 @@ public final class B4 : abc.A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
+package abc {
+
+    public open class A {
+        protected/*protected and package*/ constructor A()
+        public constructor A(/*0*/ x: kotlin.Double)
+        protected/*protected and package*/ constructor A(/*0*/ x: kotlin.Int)
+        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
+    }
+}

compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticPropertyExtensions.txt

@@ -21,3 +21,17 @@ public final class Data {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
+package abc {
+
+    public open class A {
+        public constructor A()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open fun getAbc(): kotlin.Int
+        public open fun getBar(): kotlin.String!
+        protected/*protected and package*/ open fun getFoo(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        protected/*protected and package*/ open fun setBar(/*0*/ x: kotlin.String!): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}

compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.txt

@@ -18,3 +18,14 @@ public final class Data {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
+package abc {
+
+    public open class A {
+        public constructor A()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        protected/*protected and package*/ open fun foo(/*0*/ x: java.lang.Runnable!): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}

compiler/testData/diagnostics/tests/scopes/visibility2.javac.txt

@@ -0,0 +1,96 @@
+package
+
+package a {
+    private fun foo(): kotlin.Unit
+    public fun makeA(): a.A
+
+    private open class A {
+        public constructor A()
+        public final fun bar(): kotlin.Unit
+        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
+    }
+
+    private object PO {
+        private constructor PO()
+        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
+    }
+}
+
+package b {
+    public fun test(): kotlin.Unit
+
+    public final class B : a.A {
+        public constructor B()
+        invisible_fake final override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
+        invisible_fake open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        invisible_fake open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        invisible_fake open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public final class NewClass : java.util.ArrayList<java.lang.Integer> {
+        public constructor NewClass()
+        invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>!
+        protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
+        invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
+        public open override /*1*/ /*fake_override*/ val size: kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: java.lang.Integer): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: java.lang.Integer): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
+        invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+        public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: java.lang.Integer): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
+        invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): java.lang.Integer!
+        public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
+        invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
+        invisible_fake open override /*1*/ /*fake_override*/ fun ensureExplicitCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        invisible_fake open override /*1*/ /*fake_override*/ fun fastRemove(/*0*/ p0: kotlin.Int): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): java.lang.Integer
+        invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: java.lang.Integer): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<java.lang.Integer>
+        public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: java.lang.Integer): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<java.lang.Integer>
+        public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<java.lang.Integer>
+        invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
+        invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
+        invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
+        invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: java.lang.Integer): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): java.lang.Integer
+        protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: java.lang.Integer): java.lang.Integer
+        public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<java.lang.Integer>
+        public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
+        public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+        public open override /*1*/ fun toString(): kotlin.String
+        public open override /*1*/ /*fake_override*/ fun trimToSize(): kotlin.Unit
+        invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit
+    }
+
+    public final class Q {
+        public constructor Q()
+        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
+
+        public final class W {
+            public constructor W()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final fun foo(): kotlin.Unit
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+}

compiler/testData/diagnostics/tests/scopes/visibility2.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-
+// JAVAC_EXPECTED_FILE
 //FILE:a.kt
 package a