WIP: Use IR for KotlinParser instead of PSI/FIR by Crustack · Pull Request #6325 · openrewrite/rewrite

Crustack · 2025-11-22T16:34:29Z

This is Work in Progress

What's changed?

Instead of relying on PSI/FIR for Kotlin Parsing, this proposes to leverage KotlinToJVMBytecodeCompiler.INSTANCE.analyze + JvmIrCodegenFactory.convertToIr to generate the IrFiles.

What's your motivation?

Improve Kotlin support

Anything in particular you'd like reviewers to focus on?

Since I am fairly new to the entire Kotlin Compiler eco-system and have only worked with PSI before, some input on the used methods to get the IrFiles is welcome.
Also since I haven't looked deeply into the KotlinTreeParserVisitor implementation yet, it would be good to know if we would still need PSI/FIR for some information or would IR be sufficient?

Anyone you would like to review specifically?

@shanman190

Have you considered any alternatives or workarounds?

No

Any additional context

TODOs:

Successfully generate IrFiles for the given source kotlin files (working KotlinTypeIrSignatureBuilderTest)
Remove firFile + nodes from KotlinSource (or will they be necessary still?)
Test KotlinTypeMapping with generated FirFiles
Remove firSessions from CompiledSource
Rewrite KotlinTreeParserVisitor via custom IrTreeVisitor?

Checklist

I've added unit tests to cover both positive and negative cases
I've read and applied the recipe conventions and best practices
I've used the IntelliJ IDEA auto-formatter on affected files

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

shanman190 · 2025-11-22T19:15:01Z

@PhilKes , thanks for the work here. However, this seems to be using the K1 compiler which would limit options toward Kotlin 2.x work and be going in reverse of where the new development is happening by the Kotlin team in the K2 compiler.

Crustack · 2025-11-23T12:37:19Z

@PhilKes , thanks for the work here. However, this seems to be using the K1 compiler which would limit options toward Kotlin 2.x work and be going in reverse of where the new development is happening by the Kotlin team in the K2 compiler.

Hi thanks for the feedback, I now updated the code to leverage the same logic as K2JvmCompiler does.
The KotlinTypeIrSignatureBuilderTest succeeds as it was before (IrProperty instead of IrField for KtFile's field).

My next step would be to try to update the build.gradle.kts kotlinVersion to 2.2.21, since I saw that the JVM Compiler Pipeline package was refactored once more (?).
I guess that would mean implementing a custom AbstractCliPipeline that uses the phases:
JvmConfigurationPipelinePhase then JvmFrontendPipelinePhase then JvmFir2IrPipelinePhase, which returns JvmFir2IrPipelineArtifact which includes the IrFiles

github-actions · 2025-11-23T12:41:01Z

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

 import java.util.regex.Pattern;
+import java.util.stream.Collectors;


Suggested change

import java.util.regex.Pattern;

import java.util.stream.Collectors;

import java.util.regex.Pattern;

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

rewrite-kotlin/src/main/kotlin/org/openrewrite/kotlin/KotlinIrTypeMapping.kt

Crustack · 2025-11-24T15:12:15Z

I updated the kotlinVersion for the dependenies to 2.2.21
Refactored the compilation code to use a custom JvmFir2IrPipeline which yields the FirFile + IrFiles.
Since I have not yet changed the KotlinTreeParserVisitor from PSI/FIR to IR I wanted to make sure all the tests still pass.
KotlinIrTypeMappingTest + KotlinParserTest

I noticed that e.g. for EqualsMethodUsageTest the compiler throws errors like: openRewriteFile0.kt:3:1: error: missing return statement

rewrite/rewrite-kotlin/src/test/java/org/openrewrite/kotlin/cleanup/EqualsMethodUsageTest.java

Lines 38 to 40 in 522827a

    
                         fun isSame(obj1 : String, obj2: String) : Boolean { 
        
                             val isSame = obj1.equals(obj2) 
        
                         }

Are these error supposed to be ignored, or do we always expect valid/complete Kotlin code?

Other than that I am checking what differences are in the generated FirFile before and after the compiler changes, since most recipe specific tests currently do not succeed, I am guessing there are some smaller changes to the structure and perhaps some of the K2JVMCompilerArguments still have to be fine-tuned but in general I think it looks promising so far.
Something that differs from before is that the FirSimpleFunctionImpl objects have controlFlowGraphReference= null and some other small differing fields that leads to the PsiElementAssociations having less entries in elementMap

github-actions · 2025-11-24T15:18:07Z

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

+                .filter(source -> {
+                    return !source.getSourcePath().getFileName().toString().startsWith("dependsOn-");
+                });


Suggested change

.filter(source -> {

return !source.getSourcePath().getFileName().toString().startsWith("dependsOn-");

});

.filter(source -> !source.getSourcePath().getFileName().toString().startsWith("dependsOn-"));

github-actions · 2025-11-24T15:18:07Z

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

-        configureBaseRoots(compilerConfiguration, arguments);
+        AtomicInteger idx = new AtomicInteger(0);
+        arguments.setFreeArgs(sources.stream()
+                        .map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(Collectors.toList()));


Suggested change

.map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(Collectors.toList()));

.map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(toList()));

rewrite-kotlin/src/main/kotlin/org/openrewrite/kotlin/KotlinIrTypeMapping.kt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions · 2025-11-25T11:21:11Z

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

+                .filter(source -> {
+                    return !source.getSourcePath().getFileName().toString().startsWith("dependsOn-");
+                });


Suggested change

.filter(source -> {

return !source.getSourcePath().getFileName().toString().startsWith("dependsOn-");

});

.filter(source -> !source.getSourcePath().getFileName().toString().startsWith("dependsOn-"));

github-actions · 2025-11-25T11:21:11Z

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

-        configureBaseRoots(compilerConfiguration, arguments);
+        AtomicInteger idx = new AtomicInteger(0);
+        arguments.setFreeArgs(sources.stream()
+                        .map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(Collectors.toList()));


Suggested change

.map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(Collectors.toList()));

.map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(toList()));

…ed FirFiles

github-actions · 2025-11-25T12:00:46Z

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

+                .filter(source -> {
+                    return !source.getSourcePath().getFileName().toString().startsWith("dependsOn-");
+                });


Suggested change

.filter(source -> {

return !source.getSourcePath().getFileName().toString().startsWith("dependsOn-");

});

.filter(source -> !source.getSourcePath().getFileName().toString().startsWith("dependsOn-"));

github-actions · 2025-11-25T12:00:46Z

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

-        addJvmClasspathRoot(compilerConfiguration, PathUtil.getResourcePathForClass(AnnotationTarget.class));
+        AtomicInteger idx = new AtomicInteger(0);
+        arguments.setFreeArgs(sources.stream()
+                        .map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(Collectors.toList()));


Suggested change

.map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(Collectors.toList()));

.map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(toList()));

github-actions · 2025-11-25T12:00:47Z

rewrite-kotlin/src/main/java/org/openrewrite/kotlin/internal/KotlinIrTreeParserVisitor.java

+
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.util.*;


Suggested change

import java.util.*;

import java.util.ArrayList;

import java.util.List;

github-actions · 2025-11-25T12:00:47Z

rewrite-kotlin/src/main/java/org/openrewrite/kotlin/internal/KotlinIrTreeParserVisitor.java

+        }
+        JContainer<Expression> init = JContainer.build(Space.EMPTY, elems, Markers.EMPTY);
+        JavaType arrType = typeMapping.type(irVararg);
+        return new J.NewArray(randomId(), Space.EMPTY, Markers.EMPTY, null, Collections.emptyList(), init, arrType);


Suggested change

return new J.NewArray(randomId(), Space.EMPTY, Markers.EMPTY, null, Collections.emptyList(), init, arrType);

return new J.NewArray(randomId(), Space.EMPTY, Markers.EMPTY, null, emptyList(), init, arrType);

github-actions · 2025-11-25T12:00:47Z

rewrite-kotlin/src/test/java/org/openrewrite/kotlin/internal/KotlinIrTreeParserVisitorTest.java

@@ -0,0 +1,48 @@
+package org.openrewrite.kotlin.internal;


Suggested change

package org.openrewrite.kotlin.internal;

/*

* Copyright 2025 the original author or authors.

* <p>

* Licensed under the Apache License, Version 2.0 (the "License");

* you may not use this file except in compliance with the License.

* You may obtain a copy of the License at

* <p>

* https://www.apache.org/licenses/LICENSE-2.0

* <p>

* Unless required by applicable law or agreed to in writing, software

* distributed under the License is distributed on an "AS IS" BASIS,

* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

* See the License for the specific language governing permissions and

* limitations under the License.

*/

package org.openrewrite.kotlin.internal;

github-actions · 2025-11-25T12:00:47Z

rewrite-kotlin/src/test/java/org/openrewrite/kotlin/internal/KotlinIrTreeParserVisitorTest.java

+          "K.CompilationUnit of KotlinIrTreeParserVisitor does not match output of KotlinTreeParserVisitor"
+        );
+    }
+}


Suggested change

}

}

Crustack · 2025-11-25T12:54:33Z

Since its not prudent trying to update Kotlin-Compiler and move from PSI/FIR to IR in one PR, I am closing this in favor of: #6338
After it is finished I will probably open another PR to start working on moving to IR based parsing

WIP: Compile Kotlin to IR

c652b57

github-project-automation bot added this to OpenRewrite Nov 22, 2025

github-project-automation bot moved this to In Progress in OpenRewrite Nov 22, 2025

moderne-meeseeks bot assigned Crustack Nov 22, 2025

Crustack marked this pull request as draft November 22, 2025 16:34

github-actions bot reviewed Nov 22, 2025

View reviewed changes

rewrite-kotlin/src/main/java/org/openrewrite/kotlin/KotlinParser.java Outdated Show resolved Hide resolved

test: update KotlinTypeIrSignatureBuilderTest

5ea19eb

github-actions bot reviewed Nov 22, 2025

View reviewed changes

rewrite-kotlin/src/main/java/org/openrewrite/kotlin/KotlinParser.java Outdated Show resolved Hide resolved

WIP: use K2Compiler

aec61ae

github-actions bot reviewed Nov 23, 2025

View reviewed changes

Crustack added 3 commits November 24, 2025 13:00

WIP: use Compiler Pipeline

d18f6a6

WIP: restore setting FirFile and FirSession

777ed91

WIP: cleanup KotlinParser and KotlinSource

81f47dc

github-actions bot reviewed Nov 24, 2025

View reviewed changes

timtebeek mentioned this pull request Nov 25, 2025

Support Kotlin openrewrite/rewrite-jackson#51

Closed

timtebeek added kotlin parser labels Nov 25, 2025

Apply suggestions from code review

b24c298

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot reviewed Nov 25, 2025

View reviewed changes

Crustack added 2 commits November 25, 2025 12:55

WIP: KotlinIrTreeParserVisitor

7f3b77c

WIP: Add JvmFirPipeline since JvmFir2IrPipelinePhase returns unresolv…

7d5d0a7

…ed FirFiles

github-actions bot reviewed Nov 25, 2025

View reviewed changes

Crustack mentioned this pull request Nov 25, 2025

Use K2Compiler via JvmFirPipeline to support Kotlin v2 #6338

Closed

9 tasks

Crustack closed this Nov 25, 2025

github-project-automation bot moved this from In Progress to Done in OpenRewrite Nov 25, 2025

		import java.util.regex.Pattern;
		import java.util.stream.Collectors;

	.map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(Collectors.toList()));
	.map(source -> tempFile(ctx, source, idx.getAndIncrement())).collect(toList()));

	import java.util.*;
	import java.util.ArrayList;
	import java.util.List;

	return new J.NewArray(randomId(), Space.EMPTY, Markers.EMPTY, null, Collections.emptyList(), init, arrType);
	return new J.NewArray(randomId(), Space.EMPTY, Markers.EMPTY, null, emptyList(), init, arrType);

-package org.openrewrite.kotlin.internal;
+/*
+ * Copyright 2025 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.kotlin.internal;

Conversation

Crustack commented Nov 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

This is Work in Progress

What's changed?

What's your motivation?

Anything in particular you'd like reviewers to focus on?

Anyone you would like to review specifically?

Have you considered any alternatives or workarounds?

Any additional context

Checklist

Uh oh!

Uh oh!

Uh oh!

shanman190 commented Nov 22, 2025

Uh oh!

Crustack commented Nov 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot Nov 23, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Crustack commented Nov 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot Nov 24, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Nov 24, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Crustack commented Nov 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Crustack commented Nov 22, 2025 •

edited

Loading

Crustack commented Nov 23, 2025 •

edited

Loading

Crustack commented Nov 24, 2025 •

edited

Loading