azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR][AA] Rely more on isInBestCandidates flag KtFirReferenceShortener

Browse Source 
After the KT-61568 has been fixed, `isInBestCandidates`
correctly works in more cases, and can be more
reliably used in `KtFirReferenceShortener`

^KTIJ-26808 Fixed
^KTIJ-26840 Fixed
This commit is contained in:
Roman Golyshev
2023-08-30 18:26:59 +02:00
committed by teamcity
parent ac102dedac
commit 1766c68e9c
7 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt
+3 -24
View File
@@ -977,31 +977,10 @@ private class ElementsToShortenCollector(
if (candidates.mapNotNull { it.candidate.originScope }
.hasScopeCloserThan(scopeForQualifiedAccess, expressionInScope)) return false
val candidatesWithinSamePriorityScopes = candidates.filter { it.candidate.originScope == scopeForQualifiedAccess }
if (candidatesWithinSamePriorityScopes.isEmpty() || candidatesWithinSamePriorityScopes.size == 1) return true
/**
* This is a conservative decision to avoid false positives.
*
* TODO: Figure out the priorities among `candidatesWithinSamePriorityScopes` and determine if [firQualifiedAccess] matches the
* one with the highest priority. At this moment, we have some counter examples that [OverloadCandidate.isInBestCandidates] is true
* and its symbol matches [firQualifiedAccess], but we cannot shorten it.
*
* For example:
* package foo
* class Foo {
* fun test() {
* // It references FIRST. Removing `foo` lets it reference SECOND. However, the one has true for
* // [OverloadCandidate.isInBestCandidates] is FIRST. Therefore, making a decision based on `isInBestCandidates` can
* // cause false positives i.e., shortening changes the referenced symbol.
* <caret>foo.myRun {
* 42
* }
* }
* }
* inline fun <R> myRun(block: () -> R): R = block() // FIRST
* inline fun <T, R> T.myRun(block: T.() -> R): R = block() // SECOND
*/
return false
// TODO isInBestCandidates should probably be used more actively to filter candidates
return candidatesWithinSamePriorityScopes.isEmpty() ||
candidatesWithinSamePriorityScopes.singleOrNull()?.isInBestCandidates == true
}
private fun processPropertyAccess(firPropertyAccess: FirPropertyAccessExpression) {
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java
Generated
+12
View File
@@ -298,6 +298,12 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated ext
runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/kdocUnresolved.kt");
}
@Test
@TestMetadata("memberVsCompanionObjectMemberConflict.kt")
public void testMemberVsCompanionObjectMemberConflict() throws Exception {
runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/memberVsCompanionObjectMemberConflict.kt");
}
@Test
@TestMetadata("multipleImport.kt")
public void testMultipleImport() throws Exception {
@@ -436,6 +442,12 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated ext
runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/shortenAlreadyImportedFunction4.kt");
}
@Test
@TestMetadata("staticMethodFromBaseClassConflict.kt")
public void testStaticMethodFromBaseClassConflict() throws Exception {
runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortener/staticMethodFromBaseClassConflict.kt");
}
@Test
@TestMetadata("superClass.kt")
public void testSuperClass() throws Exception {