MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] KTIJ-36810 Provide extra comments for canBeRedundantCompanionReference and isRedundantCompanionReference functions

Browse Source 
GitOrigin-RevId: cd87a74f66c936c2e0ec2e70a38c07325ddd8fc8
This commit is contained in:
Roman Golyshev
2026-02-11 19:56:09 +00:00
committed by intellij-monorepo-bot
parent 4ab118e15e
commit f0269e1da8
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/base/analysis-api/analysis-api-utils/src/org/jetbrains/kotlin/idea/base/analysis/api/utils/shortenRedundantCompanionReferenceUtils.kt
+22
View File
@@ -65,18 +65,32 @@ private fun KtSimpleNameExpression.isCompanionReferenceToShorten(): Boolean {
return candidate.canBeRedundantCompanionReference() && candidate.isRedundantCompanionReference()
}
/**
* Checks if [this] reference can **potentially** point to a redundant companion reference.
*
* Does not do any actual resolve, for that see [isRedundantCompanionReference].
*/
@ApiStatus.Internal
fun KtSimpleNameExpression.canBeRedundantCompanionReference(): Boolean {
val element = this
val parent = element.parent as? KtDotQualifiedExpression ?: return false
if (parent.getStrictParentOfType<KtImportDirective>() != null) return false
/**
* See comment about two levels of parents in [isRedundantCompanionReference]
*/
val grandParent = parent.parent as? KtElement
val selectorExpression = parent.selectorExpression
if (element == selectorExpression && grandParent !is KtDotQualifiedExpression) return false
return element == selectorExpression || element.text != (selectorExpression as? KtNameReferenceExpression)?.text
}
/**
* Checks if [this] reference is **actually** a redundant companion reference.
*
* For that, it is required to do resolve to ensure that the semantics of the code do not change.
*/
context(_: KaSession)
@ApiStatus.Internal
fun KtSimpleNameExpression.isRedundantCompanionReference(): Boolean {
@@ -95,12 +109,20 @@ fun KtSimpleNameExpression.isRedundantCompanionReference(): Boolean {
if (referenceName != objectDeclaration.name) return false
/**
* We need two levels of parents here because we need to reconstruct
* expressions like `Foo.Companion.bar()` into `Foo.bar()`.
* [grandParent] is responsible for the whole
* `Foo.Companion.bar()` expression in this case.
*/
val grandParent = parent.parent as? KtElement
val selectorExpression = parent.selectorExpression
val (oldTargetExpression, simplifiedText) = if (grandParent is KtDotQualifiedExpression && this == selectorExpression) {
// Case for `Foo.Companion.bar()` -> `Foo.bar()` transformation
grandParent.selectorExpression to (parent.receiverExpression.text + "." + grandParent.selectorExpression?.text)
} else {
// Case for `Companion.bar()` -> `bar()` transformation
parent.selectorExpression to parent.selectorExpression!!.text
}