-
Notifications
You must be signed in to change notification settings - Fork 280
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
use psi based type reference to defer type resolution #1506
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 42 additions & 55 deletions
97
...i/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSClassifierReferenceImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,64 @@ | ||
| /* | ||
| * Copyright 2023 Google LLC | ||
| * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. | ||
| * | ||
| * 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 | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * 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 com.google.devtools.ksp.impl.symbol.kotlin | ||
|
|
||
| import com.google.devtools.ksp.IdKeyPair | ||
| import com.google.devtools.ksp.IdKeyTriple | ||
| import com.google.devtools.ksp.KSObjectCache | ||
| import com.google.devtools.ksp.symbol.* | ||
| import org.jetbrains.kotlin.analysis.api.types.KtClassType | ||
| import org.jetbrains.kotlin.analysis.api.types.KtClassTypeQualifier | ||
| import org.jetbrains.kotlin.analysis.api.types.KtTypeParameterType | ||
| import com.google.devtools.ksp.symbol.KSClassifierReference | ||
| import com.google.devtools.ksp.symbol.KSNode | ||
| import com.google.devtools.ksp.symbol.KSTypeArgument | ||
| import com.google.devtools.ksp.symbol.Location | ||
| import org.jetbrains.kotlin.psi.KtUserType | ||
|
|
||
| class KSClassifierReferenceImpl private constructor( | ||
| internal val ktType: KtClassType, | ||
| internal val index: Int, | ||
| override val parent: KSTypeReference? | ||
| val ktUserType: KtUserType, | ||
| override val parent: KSNode | ||
| ) : KSClassifierReference { | ||
| companion object : KSObjectCache<IdKeyTriple<KtClassType, Int, KSTypeReference?>, KSClassifierReferenceImpl>() { | ||
| fun getCached(ktType: KtClassType, index: Int, parent: KSTypeReference?) = | ||
| cache.getOrPut(IdKeyTriple(ktType, index, parent)) { KSClassifierReferenceImpl(ktType, index, parent) } | ||
| companion object : KSObjectCache<IdKeyPair<KtUserType, KSNode?>, KSClassifierReferenceImpl>() { | ||
| fun getCached(ktUserType: KtUserType, parent: KSNode) = | ||
| cache.getOrPut(IdKeyPair(ktUserType, parent)) { KSClassifierReferenceImpl(ktUserType, parent) } | ||
| } | ||
|
|
||
| private val classifierReference: KtClassTypeQualifier | ||
| get() = ktType.qualifiers[index] | ||
| override val origin = parent.origin | ||
|
|
||
| override val qualifier: KSClassifierReference? by lazy { | ||
| if (index == 0) { | ||
| null | ||
| } else { | ||
| getCached(ktType, index - 1, parent) | ||
| } | ||
| } | ||
|
|
||
| override fun referencedName(): String { | ||
| return classifierReference.name.asString() | ||
| override val location: Location by lazy { | ||
| ktUserType.toLocation() | ||
| } | ||
|
|
||
| override val typeArguments: List<KSTypeArgument> by lazy { | ||
| classifierReference.typeArguments.map { KSTypeArgumentImpl.getCached(it, this) } | ||
| } | ||
|
|
||
| override val origin: Origin = parent?.origin ?: Origin.SYNTHETIC | ||
|
|
||
| override val location: Location | ||
| get() = parent?.location ?: NonExistLocation | ||
|
|
||
| override fun toString(): String { | ||
| return referencedName() | ||
| } | ||
| } | ||
|
|
||
| class KSClassifierParameterImpl private constructor( | ||
| internal val ktType: KtTypeParameterType, | ||
| override val parent: KSTypeReference? | ||
| ) : KSClassifierReference { | ||
| companion object : KSObjectCache<IdKeyPair<KtTypeParameterType, KSTypeReference?>, KSClassifierParameterImpl>() { | ||
| fun getCached(ktType: KtTypeParameterType, parent: KSTypeReference?) = | ||
| KSClassifierParameterImpl.cache.getOrPut(IdKeyPair(ktType, parent)) { | ||
| KSClassifierParameterImpl(ktType, parent) | ||
| } | ||
| ktUserType.typeArguments.map { KSTypeArgumentImpl.getCached(it) } | ||
| // ktUserType.typeArguments.map { KSTypeArgumentKtImpl.getCached(it) } | ||
| } | ||
|
|
||
| override val qualifier: KSClassifierReference? = null | ||
|
|
||
| override fun referencedName(): String { | ||
| return ktType.name.asString() | ||
| return ktUserType.referencedName ?: "" | ||
| } | ||
|
|
||
| override val typeArguments: List<KSTypeArgument> | ||
| get() = emptyList() | ||
| override val origin: Origin | ||
| get() = parent?.origin ?: Origin.SYNTHETIC | ||
| override val location: Location | ||
| get() = parent?.location ?: NonExistLocation | ||
| override val qualifier: KSClassifierReference? by lazy { | ||
| if (ktUserType.qualifier == null) { | ||
| null | ||
| } else { | ||
| getCached(ktUserType.qualifier!!, parent) | ||
| } | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| return referencedName() | ||
| return ktUserType.referencedName + if (typeArguments.isNotEmpty()) "<${ | ||
| typeArguments.map { it.toString() }.joinToString(", ") | ||
| }>" else "" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the purpose of deferring and restoring, all type references in sources (be it java or kotlin) need to be implemented by
KSTypeReferenceImpl.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also,
KSCallableReferenceImplcan not takeKtFunctionalTypefor sources, because it is subject to change.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
KtCallableReference is left as TODO in this PR.