javac-wrapper: refactoring, fixes and tests

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
+    }
+}