Delegate semicolons to plugins when possible (#471)

* Delegate statement semicolon appending to plugins when possible

* Update Kotlin tests (now without semicolons)

* Add cautionary tale

Author: sschr15

plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinChooser.java

@@ -43,7 +43,9 @@ public boolean isLanguage(StructClass cl) {
         StructAnnotationAttribute attr = cl.getAttribute((Key<StructAnnotationAttribute>) key);
         for (AnnotationExprent anno : attr.getAnnotations()) {
           if (anno.getClassName().equals("kotlin/Metadata")) {
-            setContextVariables(cl);
+            // Line removed as it slows down decompilation significantly, and it doesn't seem to break anything
+            //TODO double-check if it breaks anything
+//            setContextVariables(cl);
             return true;
           }
         }

plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinWriter.java

@@ -93,6 +93,11 @@ public KotlinWriter() {
     javadocProvider = (IFabricJavadocProvider) DecompilerContext.getProperty(IFabricJavadocProvider.PROPERTY_NAME);
   }
 
+  @Override
+  public boolean endsWithSemicolon(Exprent expr) {
+    return false;
+  }
+
   private boolean invokeProcessors(TextBuffer buffer, ClassNode node) {
     ClassWrapper wrapper = node.getWrapper();
     if (wrapper == null) {

plugins/kotlin/testData/results/pkg/TestAnyType.dec

@@ -3,10 +3,10 @@ package pkg
 public class TestAnyType {
    public fun test(param: Any): Int {
       if (param is java.lang.String) {// 5
-         return (param as java.lang.String).length();// 6
+         return (param as java.lang.String).length()// 6
       } else {
-         System.out.println(param);// 9
-         return 0;// 11
+         System.out.println(param)// 9
+         return 0// 11
       }
    }
 }

plugins/kotlin/testData/results/pkg/TestBitwiseFunctions.dec

@@ -2,27 +2,27 @@ package pkg
 
 public class TestBitwiseFunctions {
    public fun and(a: Int, b: Int): Int {
-      return a and b;// 5
+      return a and b// 5
    }
 
    public fun or(a: Int, b: Int): Int {
-      return a or b;// 9
+      return a or b// 9
    }
 
    public fun xor(a: Int, b: Int): Int {
-      return a xor b;// 13
+      return a xor b// 13
    }
 
    public fun shl(a: Int, b: Int): Int {
-      return a shl b;// 17
+      return a shl b// 17
    }
 
    public fun shr(a: Int, b: Int): Int {
-      return a shr b;// 21
+      return a shr b// 21
    }
 
    public fun ushr(a: Int, b: Int): Int {
-      return a ushr b;// 25
+      return a ushr b// 25
    }
 }
 

plugins/kotlin/testData/results/pkg/TestClassDec.dec

@@ -2,15 +2,15 @@ package pkg
 
 public class TestClassDec {
    public fun pkg.TestClassDec.Vec2iVal.dot(v: pkg.TestClassDec.Vec2iVal): Int {
-      return `$this$dot`.getX() * v.getX() + `$this$dot`.getY() * v.getY();// 11
+      return `$this$dot`.getX() * v.getX() + `$this$dot`.getY() * v.getY()// 11
    }
 
    public fun test() {
-      new TestClassDec.EmptyDec();
-      val vec: TestClassDec.Vec2iVal = new TestClassDec.Vec2iVal(1, 2);// 16
-      val vec1: TestClassDec.Vec2iVal = new TestClassDec.Vec2iVal(2, 4);// 17
-      System.out.println(vec.getX());// 19
-      System.out.println(this.dot(vec, vec1));// 20
+      new TestClassDec.EmptyDec()
+      val vec: TestClassDec.Vec2iVal = new TestClassDec.Vec2iVal(1, 2)// 16
+      val vec1: TestClassDec.Vec2iVal = new TestClassDec.Vec2iVal(2, 4)// 17
+      System.out.println(vec.getX())// 19
+      System.out.println(this.dot(vec, vec1))// 20
    }// 21
 
    public class EmptyDec
@@ -22,8 +22,8 @@ public class TestClassDec {
       public final val y: Int
 
       init {
-         this.x = x;// 7
-         this.y = y;
+         this.x = x// 7
+         this.y = y
       }
    }
 
@@ -35,8 +35,8 @@ public class TestClassDec {
          internal set
 
       init {
-         this.x = x;// 6
-         this.y = y;
+         this.x = x// 6
+         this.y = y
       }
    }
 }

plugins/kotlin/testData/results/pkg/TestClassicStringInterpolation.dec

@@ -4,23 +4,23 @@ public class TestClassicStringInterpolation {
    public final val x: Int = 5// 16
 
    public fun stringInterpolation(x: Int, y: String) {
-      System.out.println("$x $y");// 5
+      System.out.println("$x $y")// 5
    }// 6
 
    public fun testConstant(x: Int) {
-      System.out.println("$x 5");// 9
+      System.out.println("$x 5")// 9
    }// 10
 
    public fun testExpression(x: Int) {
-      System.out.println("$x ${x + 1}");// 13
+      System.out.println("$x ${x + 1}")// 13
    }// 14
 
    public fun testProperty() {
-      System.out.println("${this.x}!");// 18
+      System.out.println("${this.x}!")// 18
    }// 19
 
    public fun testLiteralClass() {
-      System.out.println("${TestClassicStringInterpolation::class.java}!");// 22
+      System.out.println("${TestClassicStringInterpolation::class.java}!")// 22
    }// 23
 }
 

plugins/kotlin/testData/results/pkg/TestCompanionObject.dec

@@ -2,19 +2,19 @@ package pkg
 
 public class TestCompanionObject {
    public fun notInCompanion() {
-      System.out.println("notInCompanion");// 5
+      System.out.println("notInCompanion")// 5
    }// 6
 
    @JvmStatic
    @JvmSynthetic
    fun `access$getCompanionVal$cp`(): java.lang.String {
-      return companionVal;
+      return companionVal
    }
 
    @JvmStatic
    @JvmSynthetic
    fun `access$getCompanionValJvmStatic$cp`(): java.lang.String {
-      return companionValJvmStatic;// 3
+      return companionValJvmStatic// 3
    }
 
    public companion object {
@@ -24,11 +24,11 @@ public class TestCompanionObject {
       public final val companionValJvmStatic: String
 
       public fun inCompanion() {
-         System.out.println("inCompanion");// 15
+         System.out.println("inCompanion")// 15
       }// 16
 
       public fun inCompanionJvmStatic() {
-         System.out.println("inCompanionJvmStatic");// 20
+         System.out.println("inCompanionJvmStatic")// 20
       }// 21
    }
 }

plugins/kotlin/testData/results/pkg/TestComparison.dec

@@ -2,27 +2,27 @@ package pkg
 
 public class TestComparison {
    public fun test2(a: Any, b: Any): Boolean {
-      return a == b;// 5
+      return a == b// 5
    }
 
    public fun test3(a: Any, b: Any): Boolean {
-      return a === b;// 9
+      return a === b// 9
    }
 
    public fun testNull2(a: Any?): Boolean {
-      return a == null;// 13
+      return a == null// 13
    }
 
    public fun testNull3(a: Any?): Boolean {
-      return a == null;// 17
+      return a == null// 17
    }
 
    public fun testNullDouble2(a: Any?, b: Any?): Boolean {
-      return a == b;// 21
+      return a == b// 21
    }
 
    public fun testNullDouble3(a: Any?, b: Any?): Boolean {
-      return a === b;// 25
+      return a === b// 25
    }
 }
 

plugins/kotlin/testData/results/pkg/TestCompileTimeErrors.dec

@@ -2,26 +2,26 @@ package pkg
 
 public class TestCompileTimeErrors {
    public fun <I, O> test(i: I): O where O : I, O : pkg.TestCompileTimeErrors.Test {
-      throw new NotImplementedError(null, 1, null);// 10
+      throw new NotImplementedError(null, 1, null)// 10
    }
 
    public fun test2(i: Int?): pkg.TestCompileTimeErrors.Test? {
       return if (i == null) null else new TestCompileTimeErrors.Test(i) {
          private final Integer testValue;
 
          {
-            this.testValue = `$i`;// 16
+            this.testValue = `$i`// 16
          }// 14
 
          public Integer getTestValue() {
-            return this.testValue;// 15
+            return this.testValue// 15
          }
 
          /** @deprecated */
          // $VF: synthetic method
          public static void getTestValue$annotations() {
          }
-      };
+      }
    }
 
    public interface Test {

plugins/kotlin/testData/results/pkg/TestConstructors.dec

@@ -2,11 +2,11 @@ package pkg
 
 public class TestConstructors private constructor() {
    public constructor(a: Int) : this() {// 4
-      System.out.println("a = $a");// 5
+      System.out.println("a = $a")// 5
    }// 6
 
    public constructor(a: Int, b: Int) : this(a) {// 8
-      System.out.println("b = $b");// 9
+      System.out.println("b = $b")// 9
    }// 10
 }