K2: Adjust Analysis API to the recent scope structure changes

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

For more explanations, please look at the previous commit

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.pretty.txt

@@ -2,16 +2,15 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
+  ExplicitStarImportingScope, index = 2, empty
 
-  ExplicitStarImportingScope, index = 3, empty
+  DefaultSimpleImportingScope, index = 3
 
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
+  ExplicitSimpleImportingScope, index = 6, empty
 
-  ExplicitSimpleImportingScope, index = 7, empty

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.txt

@@ -2,17 +2,16 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
+  ExplicitStarImportingScope, index = 2, empty
 
-  ExplicitStarImportingScope, index = 3, empty
+  DefaultSimpleImportingScope, index = 3
 
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
+  ExplicitSimpleImportingScope, index = 6, empty
 
-  ExplicitSimpleImportingScope, index = 7, empty
 

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.pretty.txt

@@ -2,19 +2,17 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
+  ExplicitStarImportingScope, index = 2, empty
 
-  ExplicitStarImportingScope, index = 3, empty
+  DefaultSimpleImportingScope, index = 3
 
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
-
-  ExplicitSimpleImportingScope, index = 7
+  ExplicitSimpleImportingScope, index = 6
     classifiers: 1
       class A
     callables: 0

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.txt

@@ -2,19 +2,17 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
+  ExplicitStarImportingScope, index = 2, empty
 
-  ExplicitStarImportingScope, index = 3, empty
+  DefaultSimpleImportingScope, index = 3
 
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
-
-  ExplicitSimpleImportingScope, index = 7
+  ExplicitSimpleImportingScope, index = 6
     classifiers: 1
       KtNamedClassOrObjectSymbol:
         annotationsList: []

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.pretty.txt

@@ -2,16 +2,15 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
+  ExplicitStarImportingScope, index = 2, empty
 
-  ExplicitStarImportingScope, index = 3, empty
+  DefaultSimpleImportingScope, index = 3
 
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
+  ExplicitSimpleImportingScope, index = 6, empty
 
-  ExplicitSimpleImportingScope, index = 7, empty

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/noImports.txt

@@ -2,17 +2,16 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
+  ExplicitStarImportingScope, index = 2, empty
 
-  ExplicitStarImportingScope, index = 3, empty
+  DefaultSimpleImportingScope, index = 3
 
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
+  ExplicitSimpleImportingScope, index = 6, empty
 
-  ExplicitSimpleImportingScope, index = 7, empty
 

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.pretty.txt

@@ -2,19 +2,17 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
+  ExplicitStarImportingScope, index = 2, empty
 
-  ExplicitStarImportingScope, index = 3, empty
+  DefaultSimpleImportingScope, index = 3
 
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
-
-  ExplicitSimpleImportingScope, index = 7
+  ExplicitSimpleImportingScope, index = 6
     classifiers: 1
       class A
     callables: 0

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/simpleImport.txt

@@ -2,19 +2,17 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
+  ExplicitStarImportingScope, index = 2, empty
 
-  ExplicitStarImportingScope, index = 3, empty
+  DefaultSimpleImportingScope, index = 3
 
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
-
-  ExplicitSimpleImportingScope, index = 7
+  ExplicitSimpleImportingScope, index = 6
     classifiers: 1
       KtNamedClassOrObjectSymbol:
         annotationsList: []

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.pretty.txt

@@ -2,20 +2,19 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
-
-  ExplicitStarImportingScope, index = 3
+  ExplicitStarImportingScope, index = 2
     classifiers: 1
       class A
     callables: 1
       fun b()
 
+  DefaultSimpleImportingScope, index = 3
+
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
+  ExplicitSimpleImportingScope, index = 6, empty
 
-  ExplicitSimpleImportingScope, index = 7, empty

analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/starImport.txt

@@ -2,11 +2,9 @@ implicit receivers:
 scopes:
   DefaultStarImportingScope, index = 0
 
-  DefaultStarImportingScope, index = 1
+  DefaultSimpleImportingScope, index = 1
 
-  DefaultSimpleImportingScope, index = 2
-
-  ExplicitStarImportingScope, index = 3
+  ExplicitStarImportingScope, index = 2
     classifiers: 1
       KtNamedClassOrObjectSymbol:
         annotationsList: []
@@ -60,11 +58,12 @@ scopes:
         valueParameters: []
         visibility: Public
 
+  DefaultSimpleImportingScope, index = 3
+
   DefaultSimpleImportingScope, index = 4
 
-  DefaultSimpleImportingScope, index = 5
+  PackageMemberScope, index = 5
 
-  PackageMemberScope, index = 6
+  ExplicitSimpleImportingScope, index = 6, empty
 
-  ExplicitSimpleImportingScope, index = 7, empty