javac-wrapper: refactoring, fixes and tests

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