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/scopeContextForPosition/annotationWithoutDeclaration.pretty.txt
Vendored
+1 -2
View File
@@ -32,6 +32,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 5
DefaultStarImportingScope, index = 6
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.txt
Vendored
+1 -2
View File
@@ -94,6 +94,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 5
DefaultStarImportingScope, index = 6
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.pretty.txt
Vendored
+1 -2
View File
@@ -52,6 +52,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 7
DefaultStarImportingScope, index = 7
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.txt
Vendored
+1 -2
View File
@@ -667,6 +667,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 7
DefaultStarImportingScope, index = 7
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.pretty.txt
Vendored
+1 -2
View File
@@ -51,6 +51,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 7
DefaultStarImportingScope, index = 7
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.txt
Vendored
+1 -3
View File
@@ -667,7 +667,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 7
DefaultStarImportingScope, index = 8
DefaultStarImportingScope, index = 7
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.pretty.txt
Vendored
+1 -3
View File
@@ -58,7 +58,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.txt
Vendored
+1 -2
View File
@@ -283,6 +283,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 8
DefaultStarImportingScope, index = 9
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.pretty.txt
Vendored
+1 -2
View File
@@ -32,6 +32,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 5
DefaultStarImportingScope, index = 6
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.txt
Vendored
+1 -2
View File
@@ -94,6 +94,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 5
DefaultStarImportingScope, index = 6
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.pretty.txt
Vendored
+1 -3
View File
@@ -29,7 +29,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 5
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.txt
Vendored
+1 -3
View File
@@ -41,7 +41,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 5
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.pretty.txt
Vendored
+1 -3
View File
@@ -23,7 +23,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 5
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.txt
Vendored
+1 -3
View File
@@ -23,7 +23,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 5
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.pretty.txt
Vendored
+1 -3
View File
@@ -93,7 +93,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 11
DefaultStarImportingScope, index = 12
DefaultStarImportingScope, index = 11
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.pretty.txt
Vendored
+1 -3
View File
@@ -94,7 +94,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 11
DefaultStarImportingScope, index = 12
DefaultStarImportingScope, index = 11
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt
Vendored
+1 -3
View File
@@ -953,7 +953,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 11
DefaultStarImportingScope, index = 12
DefaultStarImportingScope, index = 11
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt
Vendored
+1 -2
View File
@@ -893,6 +893,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 11
DefaultStarImportingScope, index = 11
DefaultStarImportingScope, index = 12
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.pretty.txt
Vendored
+1 -3
View File
@@ -63,7 +63,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 10
DefaultStarImportingScope, index = 11
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.txt
Vendored
+1 -3
View File
@@ -105,7 +105,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 10
DefaultStarImportingScope, index = 11
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.pretty.txt
Vendored
+1 -2
View File
@@ -50,6 +50,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 9
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.txt
Vendored
+1 -2
View File
@@ -147,6 +147,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 9
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.pretty.txt
Vendored
+1 -3
View File
@@ -48,7 +48,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 7
DefaultStarImportingScope, index = 8
DefaultStarImportingScope, index = 7
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.txt
Vendored
+1 -3
View File
@@ -400,7 +400,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 7
DefaultStarImportingScope, index = 8
DefaultStarImportingScope, index = 7
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.pretty.txt
Vendored
+1 -2
View File
@@ -55,6 +55,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 8
DefaultStarImportingScope, index = 9
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.txt
Vendored
+1 -2
View File
@@ -376,6 +376,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 8
DefaultStarImportingScope, index = 9
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.pretty.txt
Vendored
+1 -3
View File
@@ -32,7 +32,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 5
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.txt
Vendored
+1 -3
View File
@@ -94,7 +94,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 5
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.pretty.txt
Vendored
+1 -3
View File
@@ -72,7 +72,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 10
DefaultStarImportingScope, index = 11
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt
Vendored
+1 -3
View File
@@ -384,7 +384,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 10
DefaultStarImportingScope, index = 11
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.pretty.txt
Vendored
+1 -3
View File
@@ -45,7 +45,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.txt
Vendored
+1 -3
View File
@@ -66,7 +66,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.pretty.txt
Vendored
+1 -3
View File
@@ -154,7 +154,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 19
DefaultStarImportingScope, index = 20
DefaultStarImportingScope, index = 19
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.txt
Vendored
+1 -3
View File
@@ -1125,7 +1125,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 19
DefaultStarImportingScope, index = 20
DefaultStarImportingScope, index = 19
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.pretty.txt
Vendored
+1 -3
View File
@@ -74,7 +74,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 11
DefaultStarImportingScope, index = 12
DefaultStarImportingScope, index = 11
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.txt
Vendored
+1 -3
View File
@@ -277,7 +277,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 11
DefaultStarImportingScope, index = 12
DefaultStarImportingScope, index = 11
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.pretty.txt
Vendored
+1 -2
View File
@@ -74,6 +74,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 11
DefaultStarImportingScope, index = 11
DefaultStarImportingScope, index = 12
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.txt
Vendored
+1 -2
View File
@@ -277,6 +277,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 11
DefaultStarImportingScope, index = 11
DefaultStarImportingScope, index = 12
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.pretty.txt
Vendored
+1 -3
View File
@@ -57,7 +57,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.txt
Vendored
+1 -3
View File
@@ -279,7 +279,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.pretty.txt
Vendored
+1 -2
View File
@@ -31,6 +31,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 6
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 7
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.txt
Vendored
+1 -2
View File
@@ -79,6 +79,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 6
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 7
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.pretty.txt
Vendored
+1 -2
View File
@@ -58,6 +58,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 9
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.txt
Vendored
+1 -2
View File
@@ -285,6 +285,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 9
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 10
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.pretty.txt
Vendored
+1 -2
View File
@@ -40,6 +40,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 7
DefaultStarImportingScope, index = 7
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.txt
Vendored
+1 -2
View File
@@ -160,6 +160,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 7
DefaultStarImportingScope, index = 7
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.pretty.txt
Vendored
+1 -2
View File
@@ -26,6 +26,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 5
DefaultStarImportingScope, index = 6
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.txt
Vendored
+1 -2
View File
@@ -105,6 +105,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 5
DefaultStarImportingScope, index = 5
DefaultStarImportingScope, index = 6
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.pretty.txt
Vendored
+1 -2
View File
@@ -32,6 +32,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 6
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 7
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.txt
Vendored
+1 -2
View File
@@ -99,6 +99,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 6
DefaultStarImportingScope, index = 6
DefaultStarImportingScope, index = 7
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.pretty.txt
Vendored
+1 -3
View File
@@ -58,7 +58,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 9
DefaultStarImportingScope, index = 8
analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.txt
Vendored
+1 -2
View File
@@ -305,6 +305,5 @@ scopes:
callables: 0
constructors: 0
DefaultSimpleImportingScope, index = 8
DefaultStarImportingScope, index = 8
DefaultStarImportingScope, index = 9