Refactor the way bytecode offsets are tracked.

.github/workflows/build.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [11, 17, 19]
+        java: [17, 21]
     runs-on: ubuntu-22.04
     container:
       image: eclipse-temurin:${{ matrix.java }}

build.gradle

@@ -25,12 +25,12 @@ allprojects {
   group = 'org.vineflower'
 
   compileJava {
-    sourceCompatibility = '11'
-    targetCompatibility = '11'
+    sourceCompatibility = '17'
+    targetCompatibility = '17'
   }
 
   java.toolchain {
-    languageVersion = JavaLanguageVersion.of(11)
+    languageVersion = JavaLanguageVersion.of(17)
   }
 
   repositories {
@@ -56,7 +56,7 @@ allprojects {
 group = 'org.vineflower'
 archivesBaseName = 'vineflower'
 
-version = '1.10.0'
+version = '1.11.0'
 
 def ENV = System.getenv()
 version = version + (ENV.GITHUB_ACTIONS ? "" : "+local")

plugins/idea-not-null/testData/results/TestIdeaNotNull.dec

@@ -76,13 +76,17 @@ class 'pkg/TestIdeaNotNull' {
       f      9
       10      10
       11      10
+      12      10
+      13      10
       14      11
       1d      11
       1e      13
       1f      13
       20      13
       21      13
       22      13
+      23      13
+      24      13
       2c      14
       30      14
       34      14
@@ -145,11 +149,15 @@ class 'pkg/TestIdeaNotNull' {
       2a      33
       2b      33
       2c      33
+      2d      33
+      2e      33
       2f      34
       30      34
       31      34
       32      34
       33      34
+      34      34
+      35      34
       36      36
    }
 
@@ -168,6 +176,8 @@ class 'pkg/TestIdeaNotNull' {
       12      43
       13      43
       14      43
+      15      43
+      16      43
       1e      44
       22      44
       26      44
@@ -190,6 +200,8 @@ class 'pkg/TestIdeaNotNull' {
       e      53
       f      53
       10      53
+      11      53
+      12      53
       13      54
       1d      54
       1e      56
@@ -200,6 +212,8 @@ class 'pkg/TestIdeaNotNull' {
       23      56
       24      56
       25      56
+      26      56
+      27      56
       2f      57
       33      57
       37      57

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

@@ -1,24 +1,27 @@
 package org.vineflower.kotlin;
 
 import org.jetbrains.java.decompiler.api.plugin.PluginOptions;
-import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences.*;
 
-import java.util.Map;
-
 public interface KotlinOptions {
   @Name("Show public visibility")
   @Description("If a construct is public, show the public keyword")
   @Type(Type.BOOLEAN)
   String SHOW_PUBLIC_VISIBILITY = "kt-show-public";
 
-  @Name("Decompile Kotlin")
+  @Name("Enable Kotlin plugin")
   @Description("Decompile Kotlin classes as Kotlin instead of Java")
   @Type(Type.BOOLEAN)
-  String DECOMPILE_KOTLIN = "kt-decompile-kotlin";
+  String DECOMPILE_KOTLIN = "kt-enable";
+
+  @Name("Unknown default arg string")
+  @Description("String to use for unknown default arguments, or empty to not indicate unknown defaults")
+  @Type(Type.STRING)
+  String UNKNOWN_DEFAULT_ARG_STRING = "kt-unknown-defaults";
 
   static void addDefaults(PluginOptions.AddDefaults cons) {
     cons.addDefault(SHOW_PUBLIC_VISIBILITY, "1");
     cons.addDefault(DECOMPILE_KOTLIN, "1");
+    cons.addDefault(UNKNOWN_DEFAULT_ARG_STRING, "...");
   }
 }