Use KSP2 #350

eygraber · 2024-02-08T02:35:00Z

No description provided.

kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/Util.kt

kotlin-inject-compiler/test/src/main/kotlin/me/tatarka/inject/ProjectCompiler.kt

eygraber · 2024-11-15T00:56:17Z

@evant I updated all dependencies to latest versions, but looks like google/ksp#1854 is still an issue, as well as some issues with typealiases which might be related to https://kotlinlang.slack.com/archives/C013BA8EQSE/p1716431911867909. I tested with 2.1.0-RC and both issues are present there as well.

I probably won't have much time to dedicate to this for the next few months, in case there's anyone who'd like to pick it up.

ting-yuan · 2024-11-19T22:59:55Z

The exception KtInvalidLifetimeOwnerAccessException: Access to invalid KtAlwaysAccessibleLifetimeToken: PSI has changed since creation, was thrown in the second round in the SymbolProcessor.finish()

invoke:79, AbstractKSDeclarationImpl$containingFile$2 (com.google.devtools.ksp.impl.symbol.kotlin)
invoke:78, AbstractKSDeclarationImpl$containingFile$2 (com.google.devtools.ksp.impl.symbol.kotlin)
lambda 'synchronized' in 'value':74, SynchronizedLazyImpl (kotlin)
getValue:69, SynchronizedLazyImpl (kotlin)
getContainingFile:78, AbstractKSDeclarationImpl (com.google.devtools.ksp.impl.symbol.kotlin)
lambda 'apply' in 'addOriginatingElement':95, KSAstProvider (me.tatarka.kotlin.ast)
addOriginatingElement:94, KSAstProvider (me.tatarka.kotlin.ast)
lambda 'forEach' in 'generate':27, KmpComponentCreateGenerator (me.tatarka.inject.compiler)
forEach:1863, KmpComponentCreateGenerator (me.tatarka.inject.compiler)
lambda 'apply' in 'generate':23, KmpComponentCreateGenerator (me.tatarka.inject.compiler)
lambda 'with' in 'generate':22, KmpComponentCreateGenerator (me.tatarka.inject.compiler)
generate:18, KmpComponentCreateGenerator (me.tatarka.inject.compiler)
lambda 'forEach' in 'generateKmpComponentCreateFiles':40, ProcessKmpComponentCreateKt (me.tatarka.inject.compiler.ksp)
forEach:216, ProcessKmpComponentCreateKt (me.tatarka.inject.compiler.ksp)
generateKmpComponentCreateFiles:39, ProcessKmpComponentCreateKt (me.tatarka.inject.compiler.ksp)
finish:113, InjectProcessor (me.tatarka.inject.compiler.ksp)
lambda 'forEach' in 'execute':586, KotlinSymbolProcessing (com.google.devtools.ksp.impl)
execute$stub_for_inlining$32:1863, KotlinSymbolProcessing (com.google.devtools.ksp.impl)
forEach:1863, KotlinSymbolProcessing (com.google.devtools.ksp.impl)
execute:586, KotlinSymbolProcessing (com.google.devtools.ksp.impl)
...

whereas the corresponding element of createNative was from the first round:

lambda 'with' in 'processKmpComponentCreate':29, ProcessKmpComponentCreateKt (me.tatarka.inject.compiler.ksp)
processKmpComponentCreate:16, ProcessKmpComponentCreateKt (me.tatarka.inject.compiler.ksp)
process$lambda$3:69, InjectProcessor (me.tatarka.inject.compiler.ksp)
invoke:-1, InjectProcessor$$Lambda/0x00007f43f947f670 (me.tatarka.inject.compiler.ksp)
calcNext:171, FilteringSequence$iterator$1 (kotlin.sequences)
hasNext:194, FilteringSequence$iterator$1 (kotlin.sequences)
toList:813, SequencesKt___SequencesKt (kotlin.sequences)
process:70, InjectProcessor (me.tatarka.inject.compiler.ksp)
invoke:552, KotlinSymbolProcessing$execute$1$1 (com.google.devtools.ksp.impl)
invoke:550, KotlinSymbolProcessing$execute$1$1 (com.google.devtools.ksp.impl)
closeFilesOnException:409, IncrementalContextBase (ksp.com.google.devtools.ksp.common)
lambda 'forEach' in 'execute':550, KotlinSymbolProcessing (com.google.devtools.ksp.impl)
forEach:1863, KotlinSymbolProcessing (com.google.devtools.ksp.impl)
execute:549, KotlinSymbolProcessing (com.google.devtools.ksp.impl)
...

Please avoid caching and using the elements across rounds.

evant · 2024-11-19T23:49:51Z

@eygraber ^ probably due to

kotlin-inject/kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/InjectProcessor.kt

Line 35 in 7f7dcd9

    
           private val kmpComponentCreateFunctionsByComponentType = mutableMapOf<AstClass, MutableList<AstFunction>>()

we should change it to only store the KSName like we do for other deferred symbols.

eygraber · 2024-11-20T00:04:48Z

Yup, I started working on that. Not sure if I'm doing something wrong because I'm getting other errors but at least the KtInvalidLifetimeOwnerAccessException seems to have stopped 😄

eygraber · 2024-11-20T01:26:29Z

@evant I believe the latest commit fixes the KtInvalidLifetimeOwnerAccessException issue.

There is still an issue with typealiases (probably related to google/ksp#1921).

Most of the RoundsTests are failing because of a change in dev.zacsweers.kctfork:ksp:0.6.0 where the messages are split between a messages: String property, and a diagnosticMessages: List<DiagnosticMessage>. diagnosticMessages is used in messagesWithSeverity (which is what we call to get the error output), however the errors that we are looking for only appear in messages.

eygraber · 2024-11-20T01:32:19Z

kotlin-inject-compiler/test/src/test/kotlin/me/tatarka/inject/test/FailureTest.kt

@@ -1495,7 +1495,7 @@ class FailureTest {
                """.trimIndent()
            ).compile()
        }.output().all {
-            contains("e: [ksp] Cannot find an @Inject constructor or provider for: Foo")
+            contains("Cannot find an @Inject constructor or provider for: Foo")


@evant The e: [ksp] prefix wasn't present anymore; it was a toString representation of DiagnosticMessage

vRallev · 2024-11-21T05:39:14Z

The workaround for #447 isn't user friendly.

eygraber · 2024-11-21T05:57:09Z

Agreed, I'm updating the issue you filed on KSP.

evant · 2024-11-22T00:52:20Z

Maybe circleci caches need to be cleaned?

you can invalidate the cache by changing the cache_key at

kotlin-inject/.circleci/config.yml

Line 62 in 7f7dcd9

cache_key: linux

&

kotlin-inject/.circleci/config.yml

Line 82 in 7f7dcd9

cache_key: macos

btw thanks @eygraber for keeping up with this

eygraber · 2024-11-22T02:14:16Z

It looks like this happens when running tests after assemble. I'll dig in further.

evant · 2024-11-22T01:26:24Z

...ject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/KmpComponentCreateGenerator.kt

+data class KmpComponentCreateFunctionInfo(
+    val name: String,
+    val annotations: List<AnnotationSpec>,
+    val visibility: KModifier,
+    val receiverParameterType: TypeName?,
+    val parameters: List<Pair<String, TypeName>>,
+    val parametersTemplate: String,
+    val parameterNames: List<String>,
+)


Copying everything out of the ast to preserve it between rounds seems really not ideal to me, and I worry about how it'd interact with symbols that are only resolvable in future rounds. Not going to block the pr on this since I haven't looked into enough to come up with a better way, but I'll try to investigate that when I get a chance.

I agree. The fastest way I could think of to do this was to defer all functions found with resolver.getSymbolsWithAnnotation and then call resolver.getSymbolsWithAnnotation in finish and generate everything there.

Not sure if that's frowned upon in KSP, so I'm also working on a solution that generates a file per function so that nothing needs to be cached. The difficulty there is naming the generated file because it's easy to end up with multiple files named the same.

evant · 2024-11-22T01:26:47Z

...ject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/KmpComponentCreateGenerator.kt

@@ -24,36 +43,37 @@ class KmpComponentCreateGenerator(
                addFunction(
                    FunSpec
                        .builder(kmpComponentCreateFunction.name)
-                        .addOriginatingElement(kmpComponentCreateFunction)
+//                        .addOriginatingElement(kmpComponentCreateFunction)


mean to leave commented out?

Mistake 😅

evant · 2024-11-22T01:30:50Z

kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Util.kt

+fun AstType.isPair(): Boolean = packageName == "kotlin" && simpleName == "Pair"
+fun AstType.isFunctionOrTypeAliasOfFunction() = isFunction() || isTypeAlias() && resolvedType().isFunction()


Does resolvedType().isFunction() need to be recursive to handle a type alias to a type alias?

eygraber · 2024-11-22T07:03:41Z

CI is blocked by google/ksp#2230. Alternatively we can update the script to run clean in between assemble and check, and revert that once the KSP issue is resolved.

Outstanding questions are:

Is it OK if kotlin-inject doesn't work with KSP1 anymore?
Is it OK to defer all KmpComponentCreate functions to the last round, or is a different solution needed?

evant · 2024-11-22T07:25:25Z

Is it OK if kotlin-inject doesn't work with KSP1 anymore?

I've seen enough issues that I think it would be good to have overlap supporting both for a bit. What breaks here with ksp1? I don't know if it'll easy to detect which one you are using but we could add an additional option to enable it for now

eygraber · 2024-11-22T07:41:08Z

Actually it looks like it ~~does~~ might work with KSP1. The integration tests are all passing, but about half of the unit tests fail. Maybe I'm not configuring kotlin-compile-testing correctly, or maybe the tests are actually failing, it's hard to say for sure.

eygraber · 2024-11-22T07:50:12Z

Got some inspiration from https://github.com/amzn/kotlin-inject-anvil/blob/main/compiler-utils/src/testFixtures/kotlin/software/amazon/lastmile/kotlin/inject/anvil/Compilation.kt and figured it out 😄

The only unit tests failing now are the ones that check for a specific error format that changed from KSP1 to KSP2, so I'm thinking that it is fine.

eygraber · 2024-11-22T19:35:18Z

Updated the unit and integration tests to run with both KSP1 and KSP2.

evant · 2024-11-23T20:40:31Z

CI is blocked by google/ksp#2230

looks like it's already fixed! I'm ok with throwing a clean on ci for now until that's released though

eygraber · 2024-11-23T23:12:38Z

Updated, hopefully that's all that's needed.

- Avoids issues until google/ksp#2231 is released

eygraber force-pushed the ksp2 branch from e7e20e7 to e2d59eb Compare February 8, 2024 02:35

eygraber commented Feb 8, 2024

View reviewed changes

kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/Util.kt Outdated Show resolved Hide resolved

eygraber force-pushed the ksp2 branch from 9e0f787 to 94bb741 Compare February 15, 2024 20:50

eygraber force-pushed the ksp2 branch 2 times, most recently from ba8f1eb to bbcc6b9 Compare March 8, 2024 02:26

eygraber force-pushed the ksp2 branch from bbcc6b9 to c70cbc9 Compare March 25, 2024 14:42

eygraber force-pushed the ksp2 branch 4 times, most recently from c2775ad to d5e308f Compare April 11, 2024 01:43

eygraber force-pushed the ksp2 branch 3 times, most recently from 9f0d6ec to ede41bd Compare May 7, 2024 20:40

eygraber force-pushed the ksp2 branch from ede41bd to d3e1d28 Compare May 17, 2024 23:03

evant reviewed Jun 17, 2024

View reviewed changes

kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/Util.kt Outdated Show resolved Hide resolved

kotlin-inject-compiler/test/src/main/kotlin/me/tatarka/inject/ProjectCompiler.kt Outdated Show resolved Hide resolved

eygraber force-pushed the ksp2 branch 3 times, most recently from bb53268 to 009a7e7 Compare June 17, 2024 17:05

evant reviewed Jun 18, 2024

View reviewed changes

kotlin-inject-compiler/test/src/main/kotlin/me/tatarka/inject/ProjectCompiler.kt Outdated Show resolved Hide resolved

kotlin-inject-compiler/test/src/main/kotlin/me/tatarka/inject/ProjectCompiler.kt Outdated Show resolved Hide resolved

eygraber force-pushed the ksp2 branch 2 times, most recently from 761cad1 to f52527a Compare July 11, 2024 21:34

eygraber force-pushed the ksp2 branch 2 times, most recently from 8fb90a7 to 82ddb23 Compare November 15, 2024 00:41

eygraber force-pushed the ksp2 branch from 82ddb23 to 2e7720b Compare November 20, 2024 01:17

eygraber commented Nov 20, 2024

View reviewed changes

eygraber added 4 commits November 20, 2024 23:36

Fix test failures due to logging

108a409

Fix typealiases for function injection

d6b8dbc

Fix typealiases with type parameters

19cfbef

KSP2 returns synthetic constructors for objects

243b9bd

eygraber force-pushed the ksp2 branch from 7779b3b to 243b9bd Compare November 21, 2024 05:31

eygraber marked this pull request as ready for review November 21, 2024 05:34

eygraber requested a review from evant November 21, 2024 05:34

eygraber force-pushed the ksp2 branch from 0cf33d2 to 4b6b95b Compare November 22, 2024 01:54

evant reviewed Nov 22, 2024

View reviewed changes

eygraber added 2 commits November 22, 2024 00:14

Defer all KmpComponentCreate functions to the last round

319a8f8

Handle typealias to typealias

7e2924a

eygraber force-pushed the ksp2 branch from 4b6b95b to 7e2924a Compare November 22, 2024 06:49

eygraber added 2 commits November 22, 2024 14:11

Added a KSP1 target for unit tests

3b5f7a1

Add KSP1 integration tests

89dfb8a

Clean in between assemble and check on CI

80d2e88

- Avoids issues until google/ksp#2231 is released

eygraber force-pushed the ksp2 branch from a4aabf0 to 80d2e88 Compare November 24, 2024 00:54

eygraber added 3 commits November 27, 2024 18:52

Update Kotlin to 2.1.0

148b8b9

Update KSP to 2.1.0-1.0.29

5d530ba

Update kotlin-compile-testing

2165312

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use KSP2 #350

Use KSP2 #350

eygraber commented Feb 8, 2024 •

edited

Loading

eygraber commented Nov 15, 2024

ting-yuan commented Nov 19, 2024

evant commented Nov 19, 2024

eygraber commented Nov 20, 2024

eygraber commented Nov 20, 2024

eygraber Nov 20, 2024

vRallev commented Nov 21, 2024

eygraber commented Nov 21, 2024

evant commented Nov 22, 2024

eygraber commented Nov 22, 2024

evant Nov 22, 2024

eygraber Nov 22, 2024

evant Nov 22, 2024

eygraber Nov 22, 2024

evant Nov 22, 2024

eygraber commented Nov 22, 2024

evant commented Nov 22, 2024

eygraber commented Nov 22, 2024 •

edited

Loading

eygraber commented Nov 22, 2024

eygraber commented Nov 22, 2024

evant commented Nov 23, 2024

eygraber commented Nov 23, 2024

		fun AstType.isPair(): Boolean = packageName == "kotlin" && simpleName == "Pair"
		fun AstType.isFunctionOrTypeAliasOfFunction() = isFunction() \|\| isTypeAlias() && resolvedType().isFunction()

Use KSP2 #350

Are you sure you want to change the base?

Use KSP2 #350

Conversation

eygraber commented Feb 8, 2024 • edited Loading

eygraber commented Nov 15, 2024

ting-yuan commented Nov 19, 2024

evant commented Nov 19, 2024

eygraber commented Nov 20, 2024

eygraber commented Nov 20, 2024

eygraber Nov 20, 2024

Choose a reason for hiding this comment

vRallev commented Nov 21, 2024

eygraber commented Nov 21, 2024

evant commented Nov 22, 2024

eygraber commented Nov 22, 2024

evant Nov 22, 2024

Choose a reason for hiding this comment

eygraber Nov 22, 2024

Choose a reason for hiding this comment

evant Nov 22, 2024

Choose a reason for hiding this comment

eygraber Nov 22, 2024

Choose a reason for hiding this comment

evant Nov 22, 2024

Choose a reason for hiding this comment

eygraber commented Nov 22, 2024

evant commented Nov 22, 2024

eygraber commented Nov 22, 2024 • edited Loading

eygraber commented Nov 22, 2024

eygraber commented Nov 22, 2024

evant commented Nov 23, 2024

eygraber commented Nov 23, 2024

eygraber commented Feb 8, 2024 •

edited

Loading

eygraber commented Nov 22, 2024 •

edited

Loading