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

[AA] Flatten composite scopes when building scope context for position

Browse Source 
^KTIJ-25048 Fixed
This commit is contained in:
aleksandrina-streltsova
2023-03-23 12:50:22 +02:00
committed by Space Team
parent 1c72ce173f
commit b23dbd359f
8 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -1274,6 +1274,12 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfLocalProperty.kt");
}
@Test
@TestMetadata("SelfNonLocalEnumEntry.kt")
public void testSelfNonLocalEnumEntry() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfNonLocalEnumEntry.kt");
}
@Test
@TestMetadata("SelfNonLocalMethod.kt")
public void testSelfNonLocalMethod() throws Exception {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
+8 -1
View File
@@ -193,7 +193,8 @@ internal class KtFirScopeProvider(
}
val firScopes = towerDataElementsIndexed.flatMap { (index, towerDataElement) ->
towerDataElement.getAvailableScopes().map { IndexedValue(index, it) }
val availableScopes = towerDataElement.getAvailableScopes().flatMap { flattenFirScope(it) }
availableScopes.map { IndexedValue(index, it) }
}
val scopes = firScopes.map { (index, firScope) ->
KtScopeWithKind(convertToKtScope(firScope), getScopeKind(firScope, index), token)
@@ -202,6 +203,12 @@ internal class KtFirScopeProvider(
return KtScopeContext(scopes, implicitReceivers, token)
}
private fun flattenFirScope(firScope: FirScope): List<FirScope> = when (firScope) {
is FirCompositeScope -> firScope.scopes.flatMap { flattenFirScope(it) }
is FirNameAwareCompositeScope -> firScope.scopes.flatMap { flattenFirScope(it) }
else -> listOf(firScope)
}
private fun convertToKtScope(firScope: FirScope): KtScope {
return when (firScope) {
is FirAbstractSimpleImportingScope -> KtFirNonStarImportingScope(firScope, builder)
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -1274,6 +1274,12 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfLocalProperty.kt");
}
@Test
@TestMetadata("SelfNonLocalEnumEntry.kt")
public void testSelfNonLocalEnumEntry() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfNonLocalEnumEntry.kt");
}
@Test
@TestMetadata("SelfNonLocalMethod.kt")
public void testSelfNonLocalMethod() throws Exception {
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -1158,6 +1158,12 @@ public class FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerate
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfLocalProperty.kt");
}
@Test
@TestMetadata("SelfNonLocalEnumEntry.kt")
public void testSelfNonLocalEnumEntry() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfNonLocalEnumEntry.kt");
}
@Test
@TestMetadata("SelfNonLocalMethod.kt")
public void testSelfNonLocalMethod() throws Exception {
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -1274,6 +1274,12 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfLocalProperty.kt");
}
@Test
@TestMetadata("SelfNonLocalEnumEntry.kt")
public void testSelfNonLocalEnumEntry() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfNonLocalEnumEntry.kt");
}
@Test
@TestMetadata("SelfNonLocalMethod.kt")
public void testSelfNonLocalMethod() throws Exception {
analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -1274,6 +1274,12 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfLocalProperty.kt");
}
@Test
@TestMetadata("SelfNonLocalEnumEntry.kt")
public void testSelfNonLocalEnumEntry() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfNonLocalEnumEntry.kt");
}
@Test
@TestMetadata("SelfNonLocalMethod.kt")
public void testSelfNonLocalMethod() throws Exception {
analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfNonLocalEnumEntry.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
enum class E {
/**
* [A<caret>A]
*/
AA, BB;
companion object {
fun f() {}
}
}
analysis/analysis-api/testData/referenceResolve/kDoc/localContext/SelfNonLocalEnumEntry.txt
Vendored
+2
View File
@@ -0,0 +1,2 @@
Resolved to:
0: (in E) AA