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

K2 scripting: treat default import similarly to K1

Browse Source 
namely, add them to importing scopes directly and according to the
schema used for other implicit imports, rather than adding them
to the regular script file imports. See KT-65982 for explanation.
#KT-65982 fixed
This commit is contained in:
Ilya Chernikov
2024-02-14 17:52:02 +01:00
committed by Space Team
parent 9037975758
commit 266447120d
22 changed files with 282 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassBody.copy.txt
Vendored
+10 -6
View File
@@ -4,22 +4,26 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final class Foo : R|kotlin/Any|
Element 7
Element 9
Scope: FirLocalScope
Classifiers:
FirRegularClassSymbol public final class Foo : R|kotlin/Any|
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-insideClassBody.kts>
@@ -28,11 +32,11 @@ Tower Data Context:
public final class Foo : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Implicit receiver:
FirRegularClassSymbol public final class Foo : R|kotlin/Any|
Type: Foo
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] insideClassBody.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassBody.txt
Vendored
+10 -6
View File
@@ -4,22 +4,26 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final class Foo : R|kotlin/Any|
Element 7
Element 9
Scope: FirLocalScope
Classifiers:
FirRegularClassSymbol public final class Foo : R|kotlin/Any|
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-insideClassBody.kts>
@@ -28,11 +32,11 @@ Tower Data Context:
public final class Foo : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Implicit receiver:
FirRegularClassSymbol public final class Foo : R|kotlin/Any|
Type: Foo
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] insideClassBody.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.copy.txt
Vendored
+11 -7
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class After_OtherClass : R|kotlin/Any|
@@ -25,11 +29,11 @@ Tower Data Context:
public get(): R|kotlin/Int|
FirPropertySymbol public final val before_Val: R|kotlin/Int|
public get(): R|kotlin/Int|
Element 7
Element 9
Scope: FirLocalScope
Classifiers:
FirRegularClassSymbol public final class MyClass : R|kotlin/Any|
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-insideClassMember.kts>
@@ -48,13 +52,13 @@ Tower Data Context:
public final? class After_OtherClass : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Implicit receiver:
FirRegularClassSymbol public final class MyClass : R|kotlin/Any|
Type: MyClass
Element 10
Element 12
Scope: FirLocalScope
Element 11
Element 13
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] insideClassMember.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt
Vendored
+11 -7
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class After_OtherClass : R|kotlin/Any|
@@ -25,11 +29,11 @@ Tower Data Context:
public? get(): <implicit>
FirPropertySymbol public? final? val before_Val: <implicit>
public? get(): <implicit>
Element 7
Element 9
Scope: FirLocalScope
Classifiers:
FirRegularClassSymbol public final class MyClass : R|kotlin/Any|
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-insideClassMember.kts>
@@ -48,13 +52,13 @@ Tower Data Context:
public final? class After_OtherClass : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Implicit receiver:
FirRegularClassSymbol public final class MyClass : R|kotlin/Any|
Type: MyClass
Element 10
Element 12
Scope: FirLocalScope
Element 11
Element 13
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] insideClassMember.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/insideTopLevelFunction.copy.txt
Vendored
+10 -6
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class After_OtherClass : R|kotlin/Any|
@@ -25,11 +29,11 @@ Tower Data Context:
public get(): R|kotlin/Int|
FirPropertySymbol public final val before_Val: R|kotlin/Int|
public get(): R|kotlin/Int|
Element 7
Element 9
Scope: FirLocalScope
Functions
FirNamedFunctionSymbol public final fun usage(foo: R|kotlin/Int|): R|kotlin/Unit|
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-insideTopLevelFunction.kts>
@@ -48,11 +52,11 @@ Tower Data Context:
public final? class After_OtherClass : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Scope: FirLocalScope
Properties:
FirValueParameterSymbol foo: R|kotlin/Int|
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] insideTopLevelFunction.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/insideTopLevelFunction.txt
Vendored
+10 -6
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class After_OtherClass : R|kotlin/Any|
@@ -25,11 +29,11 @@ Tower Data Context:
public? get(): <implicit>
FirPropertySymbol public? final? val before_Val: <implicit>
public? get(): <implicit>
Element 7
Element 9
Scope: FirLocalScope
Functions
FirNamedFunctionSymbol public final fun usage(foo: R|kotlin/Int|): R|kotlin/Unit|
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-insideTopLevelFunction.kts>
@@ -48,11 +52,11 @@ Tower Data Context:
public final? class After_OtherClass : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Scope: FirLocalScope
Properties:
FirValueParameterSymbol foo: R|kotlin/Int|
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] insideTopLevelFunction.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/lastStatement.copy.txt
Vendored
+8 -4
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class ScriptClass : R|kotlin/Any|
@@ -22,9 +26,9 @@ Tower Data Context:
Properties:
FirPropertySymbol public final val $$result: R|kotlin/Unit|
public get(): R|kotlin/Unit|
Element 7
Element 9
Scope: FirLocalScope
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-lastStatement.kts>
analysis/low-level-api-fir/testData/contextCollector/scripts/lastStatement.txt
Vendored
+8 -4
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class ScriptClass : R|kotlin/Any|
@@ -22,9 +26,9 @@ Tower Data Context:
Properties:
FirPropertySymbol public final val $$result: R|kotlin/Unit|
public get(): R|kotlin/Unit|
Element 7
Element 9
Scope: FirLocalScope
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-lastStatement.kts>
analysis/low-level-api-fir/testData/contextCollector/scripts/scriptInsideLastStatement.copy.txt
Vendored
+10 -6
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class ScriptClass : R|kotlin/Any|
@@ -22,9 +26,9 @@ Tower Data Context:
Properties:
FirPropertySymbol public final val $$result: R|kotlin/Unit|
public get(): R|kotlin/Unit|
Element 7
Element 9
Scope: FirLocalScope
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-scriptInsideLastStatement.kts>
@@ -39,11 +43,11 @@ Tower Data Context:
public get(): R|kotlin/Unit|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Scope: FirLocalScope
Properties:
FirValueParameterSymbol it: R|kotlin/Int|
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] scriptInsideLastStatement.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/scriptInsideLastStatement.txt
Vendored
+10 -6
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class ScriptClass : R|kotlin/Any|
@@ -22,9 +26,9 @@ Tower Data Context:
Properties:
FirPropertySymbol public final val $$result: R|kotlin/Unit|
public get(): R|kotlin/Unit|
Element 7
Element 9
Scope: FirLocalScope
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-scriptInsideLastStatement.kts>
@@ -39,11 +43,11 @@ Tower Data Context:
public get(): R|kotlin/Unit|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Scope: FirLocalScope
Properties:
FirValueParameterSymbol it: R|kotlin/Int|
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] scriptInsideLastStatement.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/statement.copy.txt
Vendored
+10 -6
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class ScriptClass : R|kotlin/Any|
@@ -22,9 +26,9 @@ Tower Data Context:
Properties:
FirPropertySymbol public final val $$result: R|kotlin/Unit|
public get(): R|kotlin/Unit|
Element 7
Element 9
Scope: FirLocalScope
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-statement.kts>
@@ -39,9 +43,9 @@ Tower Data Context:
public get(): R|kotlin/Unit|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Scope: FirLocalScope
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] statement.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/statement.txt
Vendored
+10 -6
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class ScriptClass : R|kotlin/Any|
@@ -22,9 +26,9 @@ Tower Data Context:
Properties:
FirPropertySymbol public final val $$result: <implicit>
public get(): <implicit>
Element 7
Element 9
Scope: FirLocalScope
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-statement.kts>
@@ -39,9 +43,9 @@ Tower Data Context:
public get(): <implicit>
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Scope: FirLocalScope
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] statement.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.copy.txt
Vendored
+10 -6
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class After_OtherClass : R|kotlin/Any|
@@ -24,9 +28,9 @@ Tower Data Context:
public get(): R|kotlin/Int|
FirPropertySymbol public final val before_Val: R|kotlin/Int|
public get(): R|kotlin/Int|
Element 7
Element 9
Scope: FirLocalScope
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-topLevel.kts>
@@ -45,9 +49,9 @@ Tower Data Context:
public final? class After_OtherClass : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Scope: FirLocalScope
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] topLevel.kts
analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.txt
Vendored
+10 -6
View File
@@ -4,14 +4,18 @@ Tower Data Context:
Element 1
Scope: FirExplicitStarImportingScope
Element 2
Scope: FirDefaultSimpleImportingScope
Scope: FirExplicitStarImportingScope
Element 3
Scope: FirDefaultSimpleImportingScope
Element 4
Scope: FirPackageMemberScope
Scope: FirDefaultSimpleImportingScope
Element 5
Scope: FirExplicitSimpleImportingScope
Element 6
Scope: FirPackageMemberScope
Element 7
Scope: FirExplicitSimpleImportingScope
Element 8
Scope: FirScriptDeclarationsScope
Classifiers:
FirRegularClassSymbol public final? class After_OtherClass : R|kotlin/Any|
@@ -24,9 +28,9 @@ Tower Data Context:
public? get(): <implicit>
FirPropertySymbol public? final? val before_Val: <implicit>
public? get(): <implicit>
Element 7
Element 9
Scope: FirLocalScope
Element 8
Element 10
Context receivers:
FirScriptSymbol context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
SCRIPT: <script-topLevel.kts>
@@ -45,9 +49,9 @@ Tower Data Context:
public final? class After_OtherClass : R|kotlin/Any|
Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
Label: <script>
Element 9
Element 11
Scope: FirLocalScope
Element 10
Element 12
Scope: FirLocalScope
FILE: [ResolvedTo(IMPORTS)] topLevel.kts