Skip to content

Commit 8337de2

Browse files
jkschneiderbarbulescu
jkschneider
and
barbulescu
authored
Upgrade rewrite-kotlin to Kotlin 2 compiler (K2) (#6766)
* Upgrade rewrite-kotlin to Kotlin 2 compiler (K2) Kotlin 1 is EOL and doesn't work on Java 25 runtimes. This upgrades kotlin-compiler-embeddable from 1.9.25 to 2.2.0, migrating all K2 FIR API changes in-place without requiring a separate module. Co-Authored-By: Marius Barbulescu <marius.barbulescu@gmail.com>
1 parent 81ecb64 commit 8337de2

17 files changed

Lines changed: 351 additions & 352 deletions

‎rewrite-java-test/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
testImplementation("io.github.classgraph:classgraph:latest.release")
1717
testImplementation("org.junit-pioneer:junit-pioneer:2.0.0")
1818
testRuntimeOnly(project(":rewrite-java-21"))
19+
testRuntimeOnly("jakarta.persistence:jakarta.persistence-api:3.1.0")
1920
testRuntimeOnly("org.apache.hbase:hbase-shaded-client:2.4.11")
2021
testRuntimeOnly("com.google.guava:guava:latest.release")
2122
testRuntimeOnly("org.mapstruct:mapstruct:latest.release")

‎rewrite-kotlin/build.gradle.kts‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2-
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
42

53
plugins {
64
id("org.openrewrite.build.language-library")
75
kotlin("jvm") version "2.2.21"
86
}
97

10-
val kotlinVersion = "1.9.25"
8+
val kotlinVersion = "2.2.0"
119

1210
dependencies {
1311
compileOnly(project(":rewrite-core"))
@@ -33,15 +31,13 @@ dependencies {
3331
testImplementation("com.google.testing.compile:compile-testing:0.+")
3432

3533
// Kotlin libraries for KotlinDeprecationRecipeGenerator
36-
// Pin to versions compiled with Kotlin 1.9 metadata (compatible with parser's Kotlin 1.9.25 compiler)
3734
testRuntimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
3835
testRuntimeOnly("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3")
3936
}
4037

4138
recipeDependencies {
4239
// Kotlin libraries with @Deprecated(replaceWith=ReplaceWith(...)) annotations
4340
// Use the JVM variant artifact names since Kotlin multiplatform resolves to these
44-
// Pin to versions compiled with Kotlin 1.9 metadata (compatible with parser's Kotlin 1.9.25 compiler)
4541
testParserClasspath("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1")
4642
testParserClasspath("org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3")
4743
}
@@ -52,16 +48,23 @@ java {
5248
}
5349
}
5450

55-
tasks.withType<KotlinCompile>().configureEach {
51+
kotlin {
5652
compilerOptions {
57-
apiVersion = KotlinVersion.KOTLIN_1_9
58-
languageVersion = KotlinVersion.KOTLIN_1_9
59-
jvmTarget.set(if (name.contains("Test")) JvmTarget.JVM_21 else JvmTarget.JVM_1_8)
53+
jvmTarget.set(JvmTarget.JVM_1_8)
54+
}
55+
}
56+
57+
tasks.named<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>("compileTestKotlin") {
58+
compilerOptions {
59+
jvmTarget.set(JvmTarget.JVM_21)
6060
}
6161
}
6262

6363
tasks.withType<Test> {
6464
maxHeapSize = "6g"
65+
javaLauncher = javaToolchains.launcherFor {
66+
languageVersion = JavaLanguageVersion.of(21)
67+
}
6568
}
6669

6770

‎rewrite-kotlin/src/main/java/org/openrewrite/kotlin/Assertions.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,19 @@ private boolean isAllowedToHaveNullType(J.Identifier ident) {
476476
return inPackageDeclaration() || inImport() || isClassName() ||
477477
isMethodName() || isMethodInvocationName() || isFieldAccess(ident) || isBeingDeclared(ident) || isParameterizedType(ident) ||
478478
isNewClass(ident) || isTypeParameter() || isMemberReference(ident) || isCaseLabel() || isLabel() || isAnnotationField(ident) ||
479-
isInJavaDoc(ident) || isWhenLabel() || isUseSite();
479+
isInJavaDoc(ident) || isWhenLabel() || isUseSite() || isNamedArgument();
480+
}
481+
482+
private boolean isNamedArgument() {
483+
// Named argument identifiers (e.g., `s` in `foo(s = "hello")`) are labels, not variable references
484+
Cursor parent = getCursor().getParentTreeCursor();
485+
if (parent.getValue() instanceof J.Assignment) {
486+
Cursor grandparent = parent.getParentTreeCursor();
487+
Object gp = grandparent.getValue();
488+
return gp instanceof J.MethodInvocation || gp instanceof J.NewClass ||
489+
gp instanceof K.ConstructorInvocation;
490+
}
491+
return false;
480492
}
481493

482494
private boolean inPackageDeclaration() {

‎rewrite-kotlin/src/main/java/org/openrewrite/kotlin/KotlinParser.java‎

Lines changed: 96 additions & 117 deletions
Large diffs are not rendered by default.

‎rewrite-kotlin/src/main/java/org/openrewrite/kotlin/internal/KotlinPrinter.java‎

Lines changed: 56 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.openrewrite.marker.Marker;
3232
import org.openrewrite.marker.Markers;
3333

34+
import java.util.ArrayList;
3435
import java.util.List;
3536
import java.util.Objects;
3637
import java.util.Optional;
@@ -517,73 +518,82 @@ public J visitAnnotation(J.Annotation annotation, PrintOutputCapture<P> p) {
517518

518519
@Override
519520
public J visitBinary(J.Binary binary, PrintOutputCapture<P> p) {
520-
String keyword = "";
521+
// Collect left-recursive binary chain to avoid StackOverflow on deeply nested expressions.
522+
// For a left-associative tree like ((a + b) + c) + d, this collects [outer, middle, inner]
523+
// and prints them iteratively instead of recursively.
524+
List<J.Binary> chain = new ArrayList<>();
525+
J.Binary current = binary;
526+
while (true) {
527+
chain.add(current);
528+
if (current.getLeft() instanceof J.Binary) {
529+
current = (J.Binary) current.getLeft();
530+
} else {
531+
break;
532+
}
533+
}
534+
535+
// Print beforeSyntax for each binary, outermost first
536+
for (J.Binary b : chain) {
537+
beforeSyntax(b, Space.Location.BINARY_PREFIX, p);
538+
}
539+
540+
// Visit the leftmost non-binary expression
541+
visit(chain.get(chain.size() - 1).getLeft(), p);
542+
543+
// Unwind from innermost to outermost: print operator + right + afterSyntax
544+
for (int i = chain.size() - 1; i >= 0; i--) {
545+
J.Binary b = chain.get(i);
546+
visitSpace(b.getPadding().getOperator().getBefore(), Space.Location.BINARY_OPERATOR, p);
547+
p.append(binaryKeyword(b));
548+
visit(b.getRight(), p);
549+
afterSyntax(b, p);
550+
}
551+
return binary;
552+
}
553+
554+
private String binaryKeyword(J.Binary binary) {
521555
switch (binary.getOperator()) {
522556
case Addition:
523-
keyword = "+";
524-
break;
557+
return "+";
525558
case Subtraction:
526-
keyword = "-";
527-
break;
559+
return "-";
528560
case Multiplication:
529-
keyword = "*";
530-
break;
561+
return "*";
531562
case Division:
532-
keyword = "/";
533-
break;
563+
return "/";
534564
case Modulo:
535-
keyword = "%";
536-
break;
565+
return "%";
537566
case LessThan:
538-
keyword = "<";
539-
break;
567+
return "<";
540568
case GreaterThan:
541-
keyword = ">";
542-
break;
569+
return ">";
543570
case LessThanOrEqual:
544-
keyword = "<=";
545-
break;
571+
return "<=";
546572
case GreaterThanOrEqual:
547-
keyword = ">=";
548-
break;
573+
return ">=";
549574
case Equal:
550-
keyword = "==";
551-
break;
575+
return "==";
552576
case NotEqual:
553-
keyword = "!=";
554-
break;
577+
return "!=";
555578
case BitAnd:
556-
keyword = "and";
557-
break;
579+
return "and";
558580
case BitOr:
559-
keyword = "or";
560-
break;
581+
return "or";
561582
case BitXor:
562-
keyword = "xor";
563-
break;
583+
return "xor";
564584
case LeftShift:
565-
keyword = "shl";
566-
break;
585+
return "shl";
567586
case RightShift:
568-
keyword = "shr";
569-
break;
587+
return "shr";
570588
case UnsignedRightShift:
571-
keyword = "ushr";
572-
break;
589+
return "ushr";
573590
case Or:
574-
keyword = (binary.getMarkers().findFirst(LogicalComma.class).isPresent()) ? "," : "||";
575-
break;
591+
return binary.getMarkers().findFirst(LogicalComma.class).isPresent() ? "," : "||";
576592
case And:
577-
keyword = "&&";
578-
break;
593+
return "&&";
594+
default:
595+
return "";
579596
}
580-
beforeSyntax(binary, Space.Location.BINARY_PREFIX, p);
581-
visit(binary.getLeft(), p);
582-
visitSpace(binary.getPadding().getOperator().getBefore(), Space.Location.BINARY_OPERATOR, p);
583-
p.append(keyword);
584-
visit(binary.getRight(), p);
585-
afterSyntax(binary, p);
586-
return binary;
587597
}
588598

589599
@Override

‎rewrite-kotlin/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,28 +1039,30 @@ public J visitPropertyAccessor(KtPropertyAccessor accessor, ExecutionContext dat
10391039
type);
10401040

10411041
List<KtParameter> ktParameters = accessor.getValueParameters();
1042+
// In K2, LPAR/RPAR moved inside VALUE_PARAMETER_LIST, so use the list node for prefix/suffix
1043+
PsiElement paramList = accessor.getLeftParenthesis() != null ? accessor.getLeftParenthesis().getParent() : null;
10421044
if (!ktParameters.isEmpty()) {
10431045
if (ktParameters.size() != 1) {
10441046
throw new UnsupportedOperationException("TODO");
10451047
}
10461048

10471049
List<JRightPadded<Statement>> parameters = new ArrayList<>();
10481050
for (KtParameter ktParameter : ktParameters) {
1049-
Statement stmt = convertToStatement(ktParameter.accept(this, data).withPrefix(prefix(ktParameter.getParent())));
1051+
Statement stmt = convertToStatement(ktParameter.accept(this, data).withPrefix(suffix(accessor.getLeftParenthesis())));
10501052
parameters.add(padRight(stmt, prefix(accessor.getRightParenthesis())));
10511053
}
10521054

1053-
params = JContainer.build(prefix(accessor.getLeftParenthesis()), parameters, Markers.EMPTY);
1055+
params = JContainer.build(prefix(paramList), parameters, Markers.EMPTY);
10541056
} else {
10551057
params = JContainer.build(
1056-
prefix(accessor.getLeftParenthesis()),
1058+
prefix(paramList),
10571059
singletonList(padRight(new J.Empty(randomId(), prefix(accessor.getRightParenthesis()), Markers.EMPTY), Space.EMPTY)),
10581060
Markers.EMPTY
10591061
);
10601062
}
10611063

10621064
if (accessor.getReturnTypeReference() != null) {
1063-
markers = markers.addIfAbsent(new TypeReferencePrefix(randomId(), suffix(accessor.getRightParenthesis())));
1065+
markers = markers.addIfAbsent(new TypeReferencePrefix(randomId(), suffix(paramList)));
10641066
returnTypeExpression = accessor.getReturnTypeReference().accept(this, data).withPrefix(prefix(accessor.getReturnTypeReference()));
10651067
}
10661068

‎rewrite-kotlin/src/main/java/org/openrewrite/kotlin/internal/PsiTreePrinter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import lombok.AllArgsConstructor;
1919
import lombok.Data;
20-
import org.jetbrains.kotlin.KtFakeSourceElement;
20+
import org.jetbrains.kotlin.KtFakeSourceElementKind;
2121
import org.jetbrains.kotlin.KtRealPsiSourceElement;
2222
import org.jetbrains.kotlin.KtSourceElement;
2323
import org.jetbrains.kotlin.com.intellij.openapi.util.TextRange;
@@ -29,7 +29,7 @@
2929
import org.jetbrains.kotlin.fir.declarations.FirProperty;
3030
import org.jetbrains.kotlin.fir.expressions.*;
3131
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference;
32-
import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag;
32+
import org.jetbrains.kotlin.fir.types.ConeClassLikeLookupTag;
3333
import org.jetbrains.kotlin.fir.types.*;
3434
import org.jetbrains.kotlin.fir.visitors.FirDefaultVisitor;
3535
import org.jetbrains.kotlin.ir.IrElement;
@@ -488,7 +488,7 @@ public static String printFirElement(FirElement firElement) {
488488

489489
if (source instanceof KtRealPsiSourceElement) {
490490
sb.append("Real ");
491-
} else if (source instanceof KtFakeSourceElement) {
491+
} else if (source.getKind() instanceof KtFakeSourceElementKind) {
492492
sb.append("Fake ");
493493
} else {
494494
sb.append(source.getClass().getSimpleName());
@@ -547,7 +547,7 @@ private static String printConeKotlinType(ConeTypeProjection coneKotlinType) {
547547
return ((FirProperty) firElement).getName().toString();
548548
} else if (firElement instanceof FirResolvedTypeRef) {
549549
FirResolvedTypeRef resolvedTypeRef = (FirResolvedTypeRef) firElement;
550-
ConeKotlinType coneKotlinType = resolvedTypeRef.getType();
550+
ConeKotlinType coneKotlinType = resolvedTypeRef.getConeType();
551551
return printConeKotlinType(coneKotlinType);
552552
} else if (firElement instanceof FirResolvedNamedReference) {
553553
return ((FirResolvedNamedReference) firElement).getName().toString();
@@ -577,8 +577,8 @@ private static String printConeKotlinType(ConeTypeProjection coneKotlinType) {
577577
}
578578
return sb.toString();
579579
}
580-
} else if (firElement instanceof FirConstExpression) {
581-
Object value = ((FirConstExpression<?>) firElement).getValue();
580+
} else if (firElement instanceof FirLiteralExpression) {
581+
Object value = ((FirLiteralExpression) firElement).getValue();
582582
return value != null ? value.toString() : null;
583583
// return ((FirConstExpression<?>) firElement).getKind().toString();
584584
} else if (firElement instanceof FirWhenBranch) {

0 commit comments

Comments
 (0)
⚡