diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.pretty.txt index fde327d8048..3a3d76c000c 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.pretty.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.txt index fde327d8048..3a3d76c000c 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.pretty.txt index 00be3f664a3..d000818b1a6 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.pretty.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.txt index 440b10d4d79..c56c21c3110 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.txt @@ -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 \ No newline at end of file + constructors: 0 + diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.pretty.txt index fde327d8048..3a3d76c000c 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.pretty.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.txt index fde327d8048..3a3d76c000c 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.pretty.txt index 00be3f664a3..d000818b1a6 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.pretty.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.txt index 440b10d4d79..c56c21c3110 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.txt @@ -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 \ No newline at end of file + constructors: 0 + diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.pretty.txt index 10bcb9fa505..3d7c075b0c0 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.pretty.txt @@ -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 diff --git a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.txt b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.txt index 5e8531d021b..e75493ad3d7 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.txt @@ -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 \ No newline at end of file + constructors: 0 + diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.pretty.txt index 80036db1859..290a3335692 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.pretty.txt @@ -32,6 +32,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 + DefaultStarImportingScope, index = 5 - DefaultStarImportingScope, index = 6 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.txt index 2b41794e021..634c1828bec 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/annotationWithoutDeclaration.txt @@ -94,6 +94,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 + DefaultStarImportingScope, index = 5 - DefaultStarImportingScope, index = 6 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.pretty.txt index e14877a9b9c..0774fd758db 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.pretty.txt @@ -52,6 +52,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 7 + DefaultStarImportingScope, index = 7 - DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.txt index 2cedf82071e..8a668948d31 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyDelegate.txt @@ -667,6 +667,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 7 + DefaultStarImportingScope, index = 7 - DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.pretty.txt index 80181e379d5..e6e003cfb5a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.pretty.txt @@ -51,6 +51,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 7 + DefaultStarImportingScope, index = 7 - DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.txt index fb50869747d..280ad78cc84 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/classPropertyInitializer.txt @@ -667,7 +667,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 7 - - DefaultStarImportingScope, index = 8 + DefaultStarImportingScope, index = 7 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.pretty.txt index 245e1a2d4c6..935db5fef0c 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.pretty.txt @@ -58,7 +58,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 - - DefaultStarImportingScope, index = 9 + DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.txt index 17aa3ef4113..7adae34c79f 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiver.txt @@ -283,6 +283,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 + DefaultStarImportingScope, index = 8 - DefaultStarImportingScope, index = 9 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.pretty.txt index eafbadde19b..1ecf9eb46ae 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.pretty.txt @@ -32,6 +32,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 + DefaultStarImportingScope, index = 5 - DefaultStarImportingScope, index = 6 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.txt index 592da8c17a1..718e3d5c0eb 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/contextReceiverWithoutDeclaration.txt @@ -94,6 +94,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 + DefaultStarImportingScope, index = 5 - DefaultStarImportingScope, index = 6 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.pretty.txt index 08b1f3357c1..a796cb47180 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.pretty.txt @@ -29,7 +29,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 - - DefaultStarImportingScope, index = 6 + DefaultStarImportingScope, index = 5 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.txt index da2e1fac5e9..65553da9685 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInImportDirective.txt @@ -41,7 +41,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 - - DefaultStarImportingScope, index = 6 + DefaultStarImportingScope, index = 5 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.pretty.txt index 1a96f7e3171..d9a5809983e 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.pretty.txt @@ -23,7 +23,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 - - DefaultStarImportingScope, index = 6 + DefaultStarImportingScope, index = 5 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.txt index 1a96f7e3171..d9a5809983e 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/emptyContextForPositionInPackageDirective.txt @@ -23,7 +23,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 - - DefaultStarImportingScope, index = 6 + DefaultStarImportingScope, index = 5 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.pretty.txt index 505510175b1..993c440f5fe 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.pretty.txt @@ -93,7 +93,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 11 - - DefaultStarImportingScope, index = 12 + DefaultStarImportingScope, index = 11 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.pretty.txt index fde8e0346dc..897e8efb5e6 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.pretty.txt @@ -94,7 +94,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 11 - - DefaultStarImportingScope, index = 12 + DefaultStarImportingScope, index = 11 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt index 1961c3ac157..1e22f095031 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt @@ -953,7 +953,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 11 - - DefaultStarImportingScope, index = 12 + DefaultStarImportingScope, index = 11 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt index 02059af8818..9dcb2513870 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt @@ -893,6 +893,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 11 + DefaultStarImportingScope, index = 11 - DefaultStarImportingScope, index = 12 \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.pretty.txt index 1e8d8d52aa5..961af8f23aa 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.pretty.txt @@ -63,7 +63,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 10 - - DefaultStarImportingScope, index = 11 + DefaultStarImportingScope, index = 10 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.txt index 5e9655cf66d..10ca8a4235f 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/errorType.txt @@ -105,7 +105,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 10 - - DefaultStarImportingScope, index = 11 + DefaultStarImportingScope, index = 10 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.pretty.txt index 4b5479910be..b9f096bbd3a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.pretty.txt @@ -50,6 +50,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 9 + DefaultStarImportingScope, index = 9 - DefaultStarImportingScope, index = 10 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.txt index 55f82a81c89..16c1f26f424 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/forLoopVariable.txt @@ -147,6 +147,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 9 + DefaultStarImportingScope, index = 9 - DefaultStarImportingScope, index = 10 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.pretty.txt index a3a027e1141..85133daa285 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.pretty.txt @@ -48,7 +48,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 7 - - DefaultStarImportingScope, index = 8 + DefaultStarImportingScope, index = 7 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.txt index 72d701432da..d12cbfb4fa3 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnClass.txt @@ -400,7 +400,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 7 - - DefaultStarImportingScope, index = 8 + DefaultStarImportingScope, index = 7 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.pretty.txt index cf08b735cce..54be8404fce 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.pretty.txt @@ -55,6 +55,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 + DefaultStarImportingScope, index = 8 - DefaultStarImportingScope, index = 9 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.txt index 4a55105825f..aa0927f1544 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocOnFunction.txt @@ -376,6 +376,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 + DefaultStarImportingScope, index = 8 - DefaultStarImportingScope, index = 9 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.pretty.txt index a966830057a..1ecf9eb46ae 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.pretty.txt @@ -32,7 +32,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 - - DefaultStarImportingScope, index = 6 + DefaultStarImportingScope, index = 5 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.txt index d9dc8333edc..718e3d5c0eb 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/kDocWithoutDeclaration.txt @@ -94,7 +94,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 - - DefaultStarImportingScope, index = 6 + DefaultStarImportingScope, index = 5 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.pretty.txt index 4e54d21bebf..e39cac82893 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.pretty.txt @@ -72,7 +72,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 10 - - DefaultStarImportingScope, index = 11 + DefaultStarImportingScope, index = 10 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt index 962f8448ae5..221557cda99 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt @@ -384,7 +384,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 10 - - DefaultStarImportingScope, index = 11 + DefaultStarImportingScope, index = 10 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.pretty.txt index 2404c304b07..f41231c66b4 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.pretty.txt @@ -45,7 +45,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 - - DefaultStarImportingScope, index = 9 + DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.txt index ebb68f3aa01..161bafa3b91 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/notEnabledKotlinPackage.txt @@ -66,7 +66,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 - - DefaultStarImportingScope, index = 9 + DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.pretty.txt index 4962a0f3a32..cc1a07e5e1a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.pretty.txt @@ -154,7 +154,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 19 - - DefaultStarImportingScope, index = 20 + DefaultStarImportingScope, index = 19 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.txt index 126fc125317..3f268aabf7a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/simpleScopeContextForPosition.txt @@ -1125,7 +1125,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 19 - - DefaultStarImportingScope, index = 20 + DefaultStarImportingScope, index = 19 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.pretty.txt index ac1d22630a3..14518bef875 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.pretty.txt @@ -74,7 +74,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 11 - - DefaultStarImportingScope, index = 12 + DefaultStarImportingScope, index = 11 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.txt index 4fed83f61e9..381e81e08c7 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunction.txt @@ -277,7 +277,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 11 - - DefaultStarImportingScope, index = 12 + DefaultStarImportingScope, index = 11 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.pretty.txt index c7f50ce8179..14518bef875 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.pretty.txt @@ -74,6 +74,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 11 + DefaultStarImportingScope, index = 11 - DefaultStarImportingScope, index = 12 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.txt index ee79e2f3136..381e81e08c7 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInAnonymousFunctionInWhenEntry.txt @@ -277,6 +277,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 11 + DefaultStarImportingScope, index = 11 - DefaultStarImportingScope, index = 12 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.pretty.txt index 1d171805305..baf331f08f5 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.pretty.txt @@ -57,7 +57,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 - - DefaultStarImportingScope, index = 9 + DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.txt index 2affd26cc8f..5ba30703c22 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/smartCastInWhenEntryCondition.txt @@ -279,7 +279,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 - - DefaultStarImportingScope, index = 9 + DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.pretty.txt index b1115159a2d..f866919d77a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.pretty.txt @@ -31,6 +31,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 6 + DefaultStarImportingScope, index = 6 - DefaultStarImportingScope, index = 7 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.txt index 47a5a871a36..50c552ff978 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor.txt @@ -79,6 +79,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 6 + DefaultStarImportingScope, index = 6 - DefaultStarImportingScope, index = 7 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.pretty.txt index 4c8cbf87ea2..00987bf1afc 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.pretty.txt @@ -58,6 +58,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 9 + DefaultStarImportingScope, index = 9 - DefaultStarImportingScope, index = 10 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.txt index 0a1095a58ca..b5c2063668e 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_lambda.txt @@ -285,6 +285,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 9 + DefaultStarImportingScope, index = 9 - DefaultStarImportingScope, index = 10 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.pretty.txt index 1d39ae02945..b3869361d21 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.pretty.txt @@ -40,6 +40,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 7 + DefaultStarImportingScope, index = 7 - DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.txt index 490a693c62d..4c4b80f7462 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses.txt @@ -160,6 +160,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 7 + DefaultStarImportingScope, index = 7 - DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.pretty.txt index 13e40ecc014..03b8e184b02 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.pretty.txt @@ -26,6 +26,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 + DefaultStarImportingScope, index = 5 - DefaultStarImportingScope, index = 6 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.txt index da7227c671f..89cb6175ce9 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeConstructor_nestedClasses_typeArgument.txt @@ -105,6 +105,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 5 + DefaultStarImportingScope, index = 5 - DefaultStarImportingScope, index = 6 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.pretty.txt index 6abb6ec8d5b..75410381e8a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.pretty.txt @@ -32,6 +32,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 6 + DefaultStarImportingScope, index = 6 - DefaultStarImportingScope, index = 7 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.txt index 4ef58f5c216..0bc7fc04fdb 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/superTypeDelegate.txt @@ -99,6 +99,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 6 + DefaultStarImportingScope, index = 6 - DefaultStarImportingScope, index = 7 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.pretty.txt index 2adcb9134ba..4ae40373084 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.pretty.txt @@ -58,7 +58,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 - - DefaultStarImportingScope, index = 9 + DefaultStarImportingScope, index = 8 diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.txt index 83d7d7ef737..ea731739587 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/syntheticPropertiesScope.txt @@ -305,6 +305,5 @@ scopes: callables: 0 constructors: 0 - DefaultSimpleImportingScope, index = 8 + DefaultStarImportingScope, index = 8 - DefaultStarImportingScope, index = 9 \ No newline at end of file diff --git a/analysis/low-level-api-fir/low-level-api-fir-native/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/konan/compiler/based/LLFirNativeTestGenerated.java b/analysis/low-level-api-fir/low-level-api-fir-native/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/konan/compiler/based/LLFirNativeTestGenerated.java index 727ac937e87..7c4fd64eb66 100644 --- a/analysis/low-level-api-fir/low-level-api-fir-native/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/konan/compiler/based/LLFirNativeTestGenerated.java +++ b/analysis/low-level-api-fir/low-level-api-fir-native/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/konan/compiler/based/LLFirNativeTestGenerated.java @@ -86,6 +86,12 @@ public class LLFirNativeTestGenerated extends AbstractLLFirNativeTest { runTest("compiler/testData/diagnostics/nativeTests/sharedImmutable.kt"); } + @Test + @TestMetadata("stdClassAndTypealiasAmbiguity.kt") + public void testStdClassAndTypealiasAmbiguity() throws Exception { + runTest("compiler/testData/diagnostics/nativeTests/stdClassAndTypealiasAmbiguity.kt"); + } + @Test @TestMetadata("threadLocal.kt") public void testThreadLocal() throws Exception { diff --git a/analysis/low-level-api-fir/low-level-api-fir-native/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/konan/compiler/based/LLFirReversedNativeTestGenerated.java b/analysis/low-level-api-fir/low-level-api-fir-native/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/konan/compiler/based/LLFirReversedNativeTestGenerated.java index 09276e621a6..cc0ae8c2029 100644 --- a/analysis/low-level-api-fir/low-level-api-fir-native/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/konan/compiler/based/LLFirReversedNativeTestGenerated.java +++ b/analysis/low-level-api-fir/low-level-api-fir-native/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/konan/compiler/based/LLFirReversedNativeTestGenerated.java @@ -86,6 +86,12 @@ public class LLFirReversedNativeTestGenerated extends AbstractLLFirReversedNativ runTest("compiler/testData/diagnostics/nativeTests/sharedImmutable.kt"); } + @Test + @TestMetadata("stdClassAndTypealiasAmbiguity.kt") + public void testStdClassAndTypealiasAmbiguity() throws Exception { + runTest("compiler/testData/diagnostics/nativeTests/stdClassAndTypealiasAmbiguity.kt"); + } + @Test @TestMetadata("threadLocal.kt") public void testThreadLocal() throws Exception { diff --git a/analysis/low-level-api-fir/testData/contextCollector/KT-61728.txt b/analysis/low-level-api-fir/testData/contextCollector/KT-61728.txt index 93e12105877..9f0f448f88d 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/KT-61728.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/KT-61728.txt @@ -2,28 +2,26 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirLocalScope Properties: FirValueParameterSymbol param: R|kotlin/String?| - Element 8 + Element 7 Scope: FirLocalScope - Element 9 + Element 8 Scope: FirLocalScope Properties: FirValueParameterSymbol it: R|kotlin/String| - Element 10 + Element 9 Scope: FirLocalScope Smart Casts: FirValueParameterSymbol param: R|kotlin/String?| @@ -36,4 +34,4 @@ FILE: [ResolvedTo(IMPORTS)] KT-61728.kt ^ R|/it| } ) } ?: ^foo Null(null) - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt index a506525c331..92dd88eb151 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt @@ -2,16 +2,14 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope FILE: [ResolvedTo(IMPORTS)] contextReceiver.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_initializerExpression.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_initializerExpression.txt index 7737efdf6b5..7669ec12561 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_initializerExpression.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_initializerExpression.txt @@ -2,23 +2,21 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirNestedClassifierScopeWithSubstitution Classifiers: FirRegularClassSymbol public final class Nested : R|kotlin/Any| Static scope owner symbol: FirRegularClassSymbol public open class Base : R|kotlin/Any| - Element 8 + Element 7 Scope: FirLocalScope Properties: FirValueParameterSymbol name: R|kotlin/String| = String(name) diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_typeRef.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_typeRef.txt index 5f659276018..b391165b45a 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_typeRef.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_typeRef.txt @@ -2,23 +2,21 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirNestedClassifierScopeWithSubstitution Classifiers: FirRegularClassSymbol public final class Nested : R|kotlin/Any| Static scope owner symbol: FirRegularClassSymbol public open class Base : R|kotlin/Any| - Element 8 + Element 7 Scope: FirLocalScope Properties: FirValueParameterSymbol name: R|kotlin/String| diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsExpression.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsExpression.txt index 0992648f676..cc228be8131 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsExpression.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsExpression.txt @@ -2,23 +2,21 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirNestedClassifierScopeWithSubstitution Classifiers: FirRegularClassSymbol public final class Nested : R|kotlin/Any| Static scope owner symbol: FirRegularClassSymbol public open class Base : R|kotlin/Any| - Element 8 + Element 7 Scope: FirLocalScope Properties: FirValueParameterSymbol primaryConstructorParameter: R|test/Base.Nested| diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsTypeRef.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsTypeRef.txt index c0830df87e7..81d28712a5e 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsTypeRef.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsTypeRef.txt @@ -2,23 +2,21 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirNestedClassifierScopeWithSubstitution Classifiers: FirRegularClassSymbol public final class Nested : R|kotlin/Any| Static scope owner symbol: FirRegularClassSymbol public open class Base : R|kotlin/Any| - Element 8 + Element 7 Scope: FirLocalScope Properties: FirValueParameterSymbol primaryConstructorParameter: R|test/Base.Nested| diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt index 351c01f2389..94b0a9ddf4f 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt @@ -2,16 +2,14 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope FILE: [ResolvedTo(IMPORTS)] superTypeCallee.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt index c3c4f153e69..05f09545743 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt @@ -2,16 +2,14 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope FILE: [ResolvedTo(IMPORTS)] superTypeCalleeGenerics.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedExpression.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedExpression.txt index c137e01d2fb..7770a0ac866 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedExpression.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedExpression.txt @@ -2,23 +2,21 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirNestedClassifierScopeWithSubstitution Classifiers: FirRegularClassSymbol public final class Nested : R|test/MyInterface| Static scope owner symbol: FirRegularClassSymbol public open class Base : R|kotlin/Any| - Element 8 + Element 7 Scope: FirLocalScope Properties: FirValueParameterSymbol constructorParam: R|test/MyInterface| diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedTypeRef.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedTypeRef.txt index db5f0836927..c578351a6f7 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedTypeRef.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedTypeRef.txt @@ -2,16 +2,14 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope FILE: [ResolvedTo(IMPORTS)] superTypeDelegatedTypeRef.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt index 91602251120..e494a88169b 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt @@ -2,16 +2,14 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope FILE: [ResolvedTo(IMPORTS)] superTypeRef.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt index 3278b696485..edb9bd1b1db 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt @@ -2,16 +2,14 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope FILE: [ResolvedTo(IMPORTS)] superTypeRefGenerics.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/contextReceivers.txt b/analysis/low-level-api-fir/testData/contextCollector/contextReceivers.txt index 4d6a4f492d5..c51a34dd1bf 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/contextReceivers.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/contextReceivers.txt @@ -2,20 +2,18 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirLocalScope - Element 8 + Element 7 Context receivers: FirNamedFunctionSymbol context(R|Foo|, R|Bar|) public final fun test(): R|kotlin/Unit| @@ -25,7 +23,7 @@ Tower Data Context: public final fun test(): R|kotlin/Unit| Type: Bar Label: Bar - Element 9 + Element 8 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] contextReceivers.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/contextReceiversClass.txt b/analysis/low-level-api-fir/testData/contextCollector/contextReceiversClass.txt index 5b78dfaf51e..c787cc2664e 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/contextReceiversClass.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/contextReceiversClass.txt @@ -2,31 +2,29 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Implicit receiver: FirRegularClassSymbol context(R|Foo|) public final class Test : R|kotlin/Any| Type: Test - Element 8 + Element 7 Context receivers: FirRegularClassSymbol context(R|Foo|) public final class Test : R|kotlin/Any| Type: Foo Label: Foo - Element 9 + Element 8 Scope: FirLocalScope - Element 10 + Element 9 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] contextReceiversClass.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/enumValue.txt b/analysis/low-level-api-fir/testData/contextCollector/enumValue.txt index fe69256b6fd..e3e82598412 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/enumValue.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/enumValue.txt @@ -2,27 +2,25 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Implicit receiver: FirRegularClassSymbol public final companion object Companion : R|kotlin/Any| Type: kotlin.Enum.Companion - Element 8 + Element 7 Scope: FirNestedClassifierScopeWithSubstitution Classifiers: FirRegularClassSymbol public final companion object Companion : R|kotlin/Any| Static scope owner symbol: FirRegularClassSymbol public abstract class Enum|> : R|kotlin/Comparable|, R|java/io/Serializable| - Element 9 + Element 8 Scope: FirNameAwareOnlyCallablesScope Functions FirNamedFunctionSymbol public final static fun valueOf(value: R|kotlin/String|): R|Direction| @@ -34,15 +32,15 @@ Tower Data Context: FirEnumEntrySymbol public final static enum entry WEST: R|Direction| = LAZY_EXPRESSION FirPropertySymbol public final static val entries: R|kotlin/enums/EnumEntries| public get(): R|kotlin/enums/EnumEntries| - Element 10 + Element 9 Implicit receiver: FirAnonymousObjectSymbol object : R|Direction| Type: - Element 11 + Element 10 Scope: FirLocalScope Properties: FirBackingFieldSymbol private : R|kotlin/Int| - Element 12 + Element 11 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] enumValue.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/extensionFunction.txt b/analysis/low-level-api-fir/testData/contextCollector/extensionFunction.txt index efe0eab6b99..8a175992ee1 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/extensionFunction.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/extensionFunction.txt @@ -2,24 +2,22 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirLocalScope - Element 8 + Element 7 Implicit receiver: FirNamedFunctionSymbol public final fun R|kotlin/String|.test(): R|kotlin/Unit| Type: kotlin.String - Element 9 + Element 8 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] extensionFunction.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/extensionLambdas.txt b/analysis/low-level-api-fir/testData/contextCollector/extensionLambdas.txt index e8aab9fe896..ea36545a905 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/extensionLambdas.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/extensionLambdas.txt @@ -2,36 +2,34 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope + Element 6 + Scope: FirLocalScope Element 7 Scope: FirLocalScope Element 8 Scope: FirLocalScope Element 9 - Scope: FirLocalScope - Element 10 Implicit receiver: FirAnonymousFunctionSymbol foo@fun R|kotlin/String|.(): R|kotlin/Unit| Type: kotlin.String + Element 10 + Scope: FirLocalScope Element 11 Scope: FirLocalScope Element 12 - Scope: FirLocalScope - Element 13 Implicit receiver: FirAnonymousFunctionSymbol num@fun R|kotlin/Int|.(): R|kotlin/Unit| Type: kotlin.Int - Element 14 + Element 13 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] extensionLambdas.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/file.txt b/analysis/low-level-api-fir/testData/contextCollector/file.txt index 5b2b05bed89..cf6e21afe92 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/file.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/file.txt @@ -2,16 +2,14 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope Import name:List Qualified name: java.util.List diff --git a/analysis/low-level-api-fir/testData/contextCollector/forLoopVariable.txt b/analysis/low-level-api-fir/testData/contextCollector/forLoopVariable.txt index 4ed7896e6ab..8a3f7e64c5f 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/forLoopVariable.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/forLoopVariable.txt @@ -2,28 +2,26 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirLocalScope Properties: FirValueParameterSymbol list: R|kotlin/collections/List| - Element 8 + Element 7 Scope: FirLocalScope - Element 9 + Element 8 Scope: FirLocalScope Properties: FirPropertySymbol lval : R|kotlin/collections/Iterator| - Element 10 + Element 9 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] forLoopVariable.kt @@ -39,4 +37,4 @@ FILE: [ResolvedTo(IMPORTS)] forLoopVariable.kt } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/innerClasses.txt b/analysis/low-level-api-fir/testData/contextCollector/innerClasses.txt index 896c4b43676..c5651bda08c 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/innerClasses.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/innerClasses.txt @@ -2,43 +2,41 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirMemberTypeParameterScope Classifiers: FirTypeParameterSymbol F - Element 8 + Element 7 Scope: FirNestedClassifierScopeImpl Classifiers: FirRegularClassSymbol public final inner class Bar : R|kotlin/Any| - Element 9 + Element 8 Implicit receiver: FirRegularClassSymbol public final class Foo : R|kotlin/Any| Type: test.Foo - Element 10 + Element 9 Scope: FirMemberTypeParameterScope Classifiers: FirTypeParameterSymbol B - Element 11 + Element 10 Implicit receiver: FirRegularClassSymbol public final inner class Bar : R|kotlin/Any| Type: test.Foo.Bar - Element 12 + Element 11 Scope: FirLocalScope Properties: FirValueParameterSymbol b: R|B| FirValueParameterSymbol f: R|F| - Element 13 + Element 12 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] innerClasses.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/lambdaArguments.txt b/analysis/low-level-api-fir/testData/contextCollector/lambdaArguments.txt index 8cfb4ed1940..10f3c378fca 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/lambdaArguments.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/lambdaArguments.txt @@ -2,32 +2,30 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope + Element 6 + Scope: FirLocalScope Element 7 Scope: FirLocalScope Element 8 - Scope: FirLocalScope - Element 9 Scope: FirLocalScope Properties: FirValueParameterSymbol s: R|kotlin/String| - Element 10 + Element 9 Scope: FirLocalScope - Element 11 + Element 10 Scope: FirLocalScope Properties: FirValueParameterSymbol n: R|kotlin/Int| - Element 12 + Element 11 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] lambdaArguments.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/localClass.txt b/analysis/low-level-api-fir/testData/contextCollector/localClass.txt index 1457681f5bc..4e0f49d6ac2 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/localClass.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/localClass.txt @@ -2,30 +2,28 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirLocalScope - Element 8 + Element 7 Scope: FirLocalScope Classifiers: FirRegularClassSymbol local final class Local : R|kotlin/Any| - Element 9 + Element 8 Implicit receiver: FirRegularClassSymbol local final class Local : R|kotlin/Any| Type: .Local - Element 10 + Element 9 Scope: FirLocalScope - Element 11 + Element 10 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] localClass.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/nestedClasses.txt b/analysis/low-level-api-fir/testData/contextCollector/nestedClasses.txt index 1f1f34fac24..2960f66f32c 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/nestedClasses.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/nestedClasses.txt @@ -2,34 +2,32 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirNestedClassifierScopeImpl Classifiers: FirRegularClassSymbol public final class Bar : R|kotlin/Any| - Element 8 + Element 7 Scope: FirMemberTypeParameterScope Classifiers: FirTypeParameterSymbol B - Element 9 + Element 8 Implicit receiver: FirRegularClassSymbol public final class Bar : R|kotlin/Any| Type: test.Foo.Bar - Element 10 + Element 9 Scope: FirLocalScope Properties: FirValueParameterSymbol b: R|B| - Element 11 + Element 10 Scope: FirLocalScope FILE: [ResolvedTo(IMPORTS)] nestedClasses.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/primaryConstructorParameter.txt b/analysis/low-level-api-fir/testData/contextCollector/primaryConstructorParameter.txt index 442b618358d..34d0c10daab 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/primaryConstructorParameter.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/primaryConstructorParameter.txt @@ -2,18 +2,16 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Implicit receiver: FirRegularClassSymbol public final class Foo : R|kotlin/Any| Type: Foo diff --git a/analysis/low-level-api-fir/testData/contextCollector/propertyDelegateInitializer.txt b/analysis/low-level-api-fir/testData/contextCollector/propertyDelegateInitializer.txt index 835455ec88a..fa50f60f50e 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/propertyDelegateInitializer.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/propertyDelegateInitializer.txt @@ -2,22 +2,20 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Implicit receiver: FirRegularClassSymbol public final class Foo : R|kotlin/Any| Type: test.Foo - Element 8 + Element 7 Scope: FirLocalScope Properties: FirValueParameterSymbol constructorParam: R|test/MyInterface| diff --git a/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt b/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt index d1b069317b5..2a5e7cc6b61 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt @@ -2,18 +2,16 @@ Tower Data Context: Element 0 Scope: FirDefaultStarImportingScope Element 1 - Scope: FirDefaultSimpleImportingScope - Element 2 Scope: FirExplicitStarImportingScope + Element 2 + Scope: FirDefaultSimpleImportingScope Element 3 Scope: FirDefaultSimpleImportingScope Element 4 - Scope: FirDefaultSimpleImportingScope - Element 5 Scope: FirPackageMemberScope - Element 6 + Element 5 Scope: FirExplicitSimpleImportingScope - Element 7 + Element 6 Scope: FirScriptDeclarationsScope Classifiers: FirRegularClassSymbol public? final? class After_OtherClass : R|kotlin/Any| @@ -27,13 +25,13 @@ Tower Data Context: public? get(): FirPropertySymbol public? final? val before_Val: public? get(): - Element 8 + Element 7 Scope: FirLocalScope Classifiers: FirRegularClassSymbol public final class MyClass : R|kotlin/Any| Properties: FirPropertySymbol lval args: R|kotlin/Array| - Element 9 + Element 8 Context receivers: FirScriptSymbol context(