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

K2: Adjust Analysis API to the recent scope structure changes

Browse Source 
Namely, in the previous commit we merged two
(LOW and HIGH priority default start import scopes) into the single one

For more explanations, please look at the previous commit
This commit is contained in:
Denis.Zharkov
2023-06-22 12:59:21 +02:00
committed by Space Team
parent 01354c8ce5
commit 78e2d53f3c
23 changed files with 94 additions and 81 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/KtFirScopeProvider.kt
+1
View File
@@ -233,6 +233,7 @@ internal class KtFirScopeProvider(
return when (firScope) {
is FirAbstractSimpleImportingScope -> KtFirNonStarImportingScope(firScope, builder)
is FirAbstractStarImportingScope -> KtFirStarImportingScope(firScope, analysisSession)
is FirDefaultStarImportingScope -> KtFirDefaultStarImportingScope(firScope, analysisSession)
is FirPackageMemberScope -> createPackageScope(firScope.fqName)
is FirContainingNamesAwareScope -> KtFirDelegatingNamesAwareScope(firScope, builder)
else -> TODO(firScope::class.toString())
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirDefaultStarImportingScope.kt
+39
View File
@@ -0,0 +1,39 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.analysis.api.fir.scopes
import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession
import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
import org.jetbrains.kotlin.analysis.api.scopes.KtScopeNameFilter
import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtPackageSymbol
import org.jetbrains.kotlin.fir.scopes.impl.FirDefaultStarImportingScope
import org.jetbrains.kotlin.name.Name
internal class KtFirDefaultStarImportingScope(
firScope: FirDefaultStarImportingScope,
analysisSession: KtFirAnalysisSession,
) : KtFirBasedScope<FirDefaultStarImportingScope>(firScope, analysisSession.firSymbolBuilder) {
private val firstWrappedScope = KtFirStarImportingScope(firScope.first, analysisSession)
private val secondWrappedScope = KtFirStarImportingScope(firScope.second, analysisSession)
override fun getPackageSymbols(nameFilter: KtScopeNameFilter): Sequence<KtPackageSymbol> = withValidityAssertion {
emptySequence()
}
override fun getConstructors(): Sequence<KtConstructorSymbol> = withValidityAssertion { emptySequence() }
override fun getPossibleCallableNames(): Set<Name> = buildSet {
addAll(firstWrappedScope.getPossibleCallableNames())
addAll(secondWrappedScope.getPossibleCallableNames())
}
override fun getPossibleClassifierNames(): Set<Name> = buildSet {
addAll(firstWrappedScope.getPossibleClassifierNames())
addAll(secondWrappedScope.getPossibleClassifierNames())
}
}
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.pretty.txt
Vendored
+5 -6
View File
@@ -2,16 +2,15 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 2, empty
ExplicitStarImportingScope, index = 3, empty
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 6, empty
ExplicitSimpleImportingScope, index = 7, empty
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.txt
Vendored
+5 -6
View File
@@ -2,17 +2,16 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 2, empty
ExplicitStarImportingScope, index = 3, empty
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 6, empty
ExplicitSimpleImportingScope, index = 7, empty
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.pretty.txt
Vendored
+5 -7
View File
@@ -2,19 +2,17 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 2, empty
ExplicitStarImportingScope, index = 3, empty
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 7
ExplicitSimpleImportingScope, index = 6
classifiers: 1
class A
callables: 0
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.txt
Vendored
+5 -7
View File
@@ -2,19 +2,17 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 2, empty
ExplicitStarImportingScope, index = 3, empty
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 7
ExplicitSimpleImportingScope, index = 6
classifiers: 1
KtNamedClassOrObjectSymbol:
annotationsList: []
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.pretty.txt
Vendored
+5 -6
View File
@@ -2,16 +2,15 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 2, empty
ExplicitStarImportingScope, index = 3, empty
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 6, empty
ExplicitSimpleImportingScope, index = 7, empty
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.txt
Vendored
+5 -6
View File
@@ -2,17 +2,16 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 2, empty
ExplicitStarImportingScope, index = 3, empty
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 6, empty
ExplicitSimpleImportingScope, index = 7, empty
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.pretty.txt
Vendored
+5 -7
View File
@@ -2,19 +2,17 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 2, empty
ExplicitStarImportingScope, index = 3, empty
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 7
ExplicitSimpleImportingScope, index = 6
classifiers: 1
class A
callables: 0
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.txt
Vendored
+5 -7
View File
@@ -2,19 +2,17 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 2, empty
ExplicitStarImportingScope, index = 3, empty
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 7
ExplicitSimpleImportingScope, index = 6
classifiers: 1
KtNamedClassOrObjectSymbol:
annotationsList: []
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.pretty.txt
Vendored
+6 -7
View File
@@ -2,20 +2,19 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 3
ExplicitStarImportingScope, index = 2
classifiers: 1
class A
callables: 1
fun b()
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 6, empty
ExplicitSimpleImportingScope, index = 7, empty
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.txt
Vendored
+6 -7
View File
@@ -2,11 +2,9 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultStarImportingScope, index = 1
DefaultSimpleImportingScope, index = 1
DefaultSimpleImportingScope, index = 2
ExplicitStarImportingScope, index = 3
ExplicitStarImportingScope, index = 2
classifiers: 1
KtNamedClassOrObjectSymbol:
annotationsList: []
@@ -60,11 +58,12 @@ scopes:
valueParameters: []
visibility: Public
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
DefaultSimpleImportingScope, index = 5
PackageMemberScope, index = 5
PackageMemberScope, index = 6
ExplicitSimpleImportingScope, index = 6, empty
ExplicitSimpleImportingScope, index = 7, empty
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.pretty.txt
Vendored
-1
View File
@@ -35,4 +35,3 @@ scopes:
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.txt
Vendored
-1
View File
@@ -217,4 +217,3 @@ scopes:
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.pretty.txt
Vendored
-1
View File
@@ -64,4 +64,3 @@ scopes:
DefaultStarImportingScope, index = 12
DefaultStarImportingScope, index = 13
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt
Vendored
-1
View File
@@ -792,4 +792,3 @@ scopes:
DefaultStarImportingScope, index = 12
DefaultStarImportingScope, index = 13
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.pretty.txt
Vendored
-1
View File
@@ -47,4 +47,3 @@ scopes:
DefaultStarImportingScope, index = 13
DefaultStarImportingScope, index = 14
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.txt
Vendored
-1
View File
@@ -363,4 +363,3 @@ scopes:
DefaultStarImportingScope, index = 13
DefaultStarImportingScope, index = 14
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.pretty.txt
Vendored
-2
View File
@@ -45,5 +45,3 @@ scopes:
DefaultStarImportingScope, index = 11
DefaultStarImportingScope, index = 12
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt
Vendored
-2
View File
@@ -312,5 +312,3 @@ scopes:
DefaultStarImportingScope, index = 11
DefaultStarImportingScope, index = 12
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.pretty.txt
Vendored
-1
View File
@@ -101,5 +101,4 @@ scopes:
DefaultStarImportingScope, index = 19
DefaultStarImportingScope, index = 20
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.txt
Vendored
-2
View File
@@ -955,5 +955,3 @@ scopes:
DefaultStarImportingScope, index = 19
DefaultStarImportingScope, index = 20
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt
+2 -2
View File
@@ -16,8 +16,8 @@ import org.jetbrains.kotlin.name.Name
* @see org.jetbrains.kotlin.resolve.lazy.LazyImportScope that produces similar semantics
*/
class FirDefaultStarImportingScope(
private val first: FirSingleLevelDefaultStarImportingScope,
private val second: FirSingleLevelDefaultStarImportingScope,
val first: FirSingleLevelDefaultStarImportingScope,
val second: FirSingleLevelDefaultStarImportingScope,
) : FirScope(), DefaultStarImportingScopeMarker {
override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
var wasFoundAny = false