[AA] Expand functionality of TestScopeRenderer.
- Add package and constructor listings - Add single-scope renderForTests() implementation, including a lambda to provide additional information about each symbol - Remove special handling for empty scopes (interfered with single-scope rendering) ^KT-59329
This commit is contained in:
committed by
Ilya Kirillov
parent
f01b824751
commit
fa0209a322
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/errorImport.pretty.txt
Vendored
+10
-2
@@ -4,7 +4,11 @@ scopes:
|
||||
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2, empty
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -12,5 +16,9 @@ scopes:
|
||||
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6, empty
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
Vendored
+10
-3
@@ -4,7 +4,11 @@ scopes:
|
||||
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2, empty
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -12,6 +16,9 @@ scopes:
|
||||
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6, empty
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
analysis/analysis-api/testData/components/scopeProvider/importingScopeContext/importAlias.pretty.txt
Vendored
+8
-1
@@ -4,7 +4,11 @@ scopes:
|
||||
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2, empty
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -13,6 +17,9 @@ scopes:
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 1
|
||||
class A
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
Vendored
+7
-1
@@ -4,7 +4,11 @@ scopes:
|
||||
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2, empty
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -13,6 +17,7 @@ scopes:
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 1
|
||||
KtNamedClassOrObjectSymbol:
|
||||
annotationsList: []
|
||||
@@ -38,4 +43,5 @@ scopes:
|
||||
typeParameters: []
|
||||
visibility: Public
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
Vendored
+10
-2
@@ -4,7 +4,11 @@ scopes:
|
||||
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2, empty
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -12,5 +16,9 @@ scopes:
|
||||
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6, empty
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
Vendored
+10
-3
@@ -4,7 +4,11 @@ scopes:
|
||||
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2, empty
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -12,6 +16,9 @@ scopes:
|
||||
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6, empty
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
+8
-1
@@ -4,7 +4,11 @@ scopes:
|
||||
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2, empty
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -13,6 +17,9 @@ scopes:
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 1
|
||||
class A
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
Vendored
+7
-1
@@ -4,7 +4,11 @@ scopes:
|
||||
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2, empty
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -13,6 +17,7 @@ scopes:
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 1
|
||||
KtNamedClassOrObjectSymbol:
|
||||
annotationsList: []
|
||||
@@ -38,4 +43,5 @@ scopes:
|
||||
typeParameters: []
|
||||
visibility: Public
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
Vendored
+7
-1
@@ -5,10 +5,12 @@ scopes:
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 1
|
||||
class A
|
||||
callables: 1
|
||||
fun b()
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -16,5 +18,9 @@ scopes:
|
||||
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6, empty
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
Vendored
+7
-2
@@ -5,6 +5,7 @@ scopes:
|
||||
DefaultSimpleImportingScope, index = 1
|
||||
|
||||
ExplicitStarImportingScope, index = 2
|
||||
packages: 0
|
||||
classifiers: 1
|
||||
KtNamedClassOrObjectSymbol:
|
||||
annotationsList: []
|
||||
@@ -57,6 +58,7 @@ scopes:
|
||||
typeParameters: []
|
||||
valueParameters: []
|
||||
visibility: Public
|
||||
constructors: 0
|
||||
|
||||
DefaultSimpleImportingScope, index = 3
|
||||
|
||||
@@ -64,6 +66,9 @@ scopes:
|
||||
|
||||
PackageMemberScope, index = 5
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6, empty
|
||||
|
||||
ExplicitSimpleImportingScope, index = 6
|
||||
packages: 0
|
||||
classifiers: 0
|
||||
callables: 0
|
||||
constructors: 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user