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

[FIR] Fix ambiguity of Throws and other std annotations importing

Browse Source 
Including `SharedImmutable` and `ThreadLocal`

Simplify code, remove `DefaultImportPriority.KOTLIN_THROWS`

Introduce `FirNativeClassMapper`
This commit is contained in:
Ivan Kochurkin
2023-11-14 17:22:13 +01:00
committed by Space Team
parent adf4f823ae
commit 115d685d91
151 changed files with 656 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.pretty.txt
Vendored
+5 -7
View File
@@ -2,21 +2,19 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 0
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 0
callables: 0
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.txt
Vendored
+5 -7
View File
@@ -2,21 +2,19 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 0
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 0
callables: 0
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.pretty.txt
Vendored
+5 -7
View File
@@ -2,21 +2,19 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 0
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 1
class A
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.txt
Vendored
+7 -8
View File
@@ -2,21 +2,19 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 0
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 1
KtNamedClassOrObjectSymbol:
@@ -45,4 +43,5 @@ scopes:
typeParameters: []
visibility: Public
callables: 0
constructors: 0
constructors: 0
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.pretty.txt
Vendored
+5 -7
View File
@@ -2,21 +2,19 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 0
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 0
callables: 0
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.txt
Vendored
+5 -7
View File
@@ -2,21 +2,19 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 0
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 0
callables: 0
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.pretty.txt
Vendored
+5 -7
View File
@@ -2,21 +2,19 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 0
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 1
class A
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.txt
Vendored
+7 -8
View File
@@ -2,21 +2,19 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 0
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 1
KtNamedClassOrObjectSymbol:
@@ -45,4 +43,5 @@ scopes:
typeParameters: []
visibility: Public
callables: 0
constructors: 0
constructors: 0
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.pretty.txt
Vendored
+5 -7
View File
@@ -2,9 +2,7 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 1
class A
@@ -12,13 +10,13 @@ scopes:
fun b()
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 0
callables: 0
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.txt
Vendored
+7 -8
View File
@@ -2,9 +2,7 @@ implicit receivers:
scopes:
DefaultStarImportingScope, index = 0
DefaultSimpleImportingScope, index = 1
ExplicitStarImportingScope, index = 2
ExplicitStarImportingScope, index = 1
packages: 0
classifiers: 1
KtNamedClassOrObjectSymbol:
@@ -64,14 +62,15 @@ scopes:
visibility: Public
constructors: 0
DefaultSimpleImportingScope, index = 2
DefaultSimpleImportingScope, index = 3
DefaultSimpleImportingScope, index = 4
PackageMemberScope, index = 4
PackageMemberScope, index = 5
ExplicitSimpleImportingScope, index = 6
ExplicitSimpleImportingScope, index = 5
packages: 0
classifiers: 0
callables: 0
constructors: 0
constructors: 0