Merge branch 'develop/1.12.0' into feature/kotlin/loop-changes

Author: sschr15

plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KTypes.java

@@ -166,6 +166,16 @@ public static String getKotlinType(VarType type, boolean includeOuterClasses) {
   }
 
   private static String mapJavaTypeToKotlin(String type) {
+    if (type.startsWith("?")) {
+      if (type.equals("?")) {
+        return "*";
+      } else if (type.startsWith("? extends ")) {
+        return "out " + type.substring("? extends ".length());
+      } else if (type.startsWith("? super ")) {
+        return "in " + type.substring("? super ".length());
+      }
+    }
+
     if (type.endsWith("[]")) {
       String baseType = type.substring(0, type.length() - 2);
       return switch (baseType) {
@@ -191,6 +201,12 @@ private static String mapJavaTypeToKotlin(String type) {
         boolean appendDot = false;
         for (String part : parts) {
           Matcher matcher = GENERICS_PATTERN.matcher(part);
+
+          if (appendDot) {
+            sb.append(".");
+          }
+          appendDot = true;
+
           if (matcher.matches()) {
             sb.append(mapJavaTypeToKotlin(matcher.group(1)));
             sb.append("<");
@@ -204,11 +220,7 @@ private static String mapJavaTypeToKotlin(String type) {
             }
             sb.append(">");
           } else {
-            if (appendDot) {
-              sb.append(".");
-            }
             sb.append(part);
-            appendDot = true;
           }
         }
         yield sb.toString();