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

[tests] Return caret names from ExpressionMarkerProvider

Browse Source 
Render caret names in resolve testData, so that we don't have to guess
the indices of the carets;
it makes the multi-caret testData less error-prone.

Relevant for KT-65152 and KT-62695
This commit is contained in:
Roman Golyshev
2024-01-24 16:05:23 +01:00
committed by Space Team
parent 2befd2bffb
commit fb225f5f20
20 changed files with 128 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/referenceResolve/KotlinPropertyWithGetterAndSetterAssignment.descriptors.txt
Vendored
+9 -9
View File
@@ -1,26 +1,26 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in A) var something: kotlin.Int
Caret 2 resolved to:
<caret_2> resolved to:
0: (in A) var something: kotlin.Int
Caret 3 resolved to:
<caret_3> resolved to:
0: (in A) var something: kotlin.Int
Caret 4 resolved to:
<caret_4> resolved to:
0: (in A) var something: kotlin.Int
Caret 5 resolved to:
<caret_5> resolved to:
0: (in A) var something: kotlin.Int
Caret 6 resolved to:
<caret_6> resolved to:
0: (in A) var something: kotlin.Int
Caret 7 resolved to:
<caret_7> resolved to:
0: (in A) var something: kotlin.Int
Caret 8 resolved to:
<caret_8> resolved to:
0: (in A) var something: kotlin.Int
Caret 9 resolved to:
<caret_9> resolved to:
0: (in A) var something: kotlin.Int
analysis/analysis-api/testData/referenceResolve/KotlinPropertyWithGetterAndSetterAssignment.txt
Vendored
+9 -9
View File
@@ -1,31 +1,31 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in A) var something: kotlin.Int
Caret 2 resolved to:
<caret_2> resolved to:
0: (in A) var something: kotlin.Int
Caret 3 resolved to:
<caret_3> resolved to:
0: (in A) var something: kotlin.Int
1: (in A) var something: kotlin.Int
Caret 4 resolved to:
<caret_4> resolved to:
0: (in A) var something: kotlin.Int
1: (in A) var something: kotlin.Int
Caret 5 resolved to:
<caret_5> resolved to:
0: (in A) var something: kotlin.Int
1: (in A) var something: kotlin.Int
Caret 6 resolved to:
<caret_6> resolved to:
0: (in A) var something: kotlin.Int
1: (in A) var something: kotlin.Int
Caret 7 resolved to:
<caret_7> resolved to:
0: (in A) var something: kotlin.Int
1: (in A) var something: kotlin.Int
Caret 8 resolved to:
<caret_8> resolved to:
0: (in A) var something: kotlin.Int
Caret 9 resolved to:
<caret_9> resolved to:
0: (in A) var something: kotlin.Int
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/callablesWithSameName.txt
Vendored
+4 -4
View File
@@ -1,15 +1,15 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in test) fun test.Foo.ext()
1: (in test) val test.Foo.ext: kotlin.Int
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test) fun test.Foo.ext()
1: (in test) val test.Foo.ext: kotlin.Int
Caret 3 resolved to:
<caret_3> resolved to:
0: (in test) fun test.Foo.ext()
1: (in test) val test.Foo.ext: kotlin.Int
Caret 4 resolved to:
<caret_4> resolved to:
0: (in test) fun test.Foo.ext()
1: (in test) val test.Foo.ext: kotlin.Int
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/fromBaseClass.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in test.Base) fun test.Receiver.ext()
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test.Base) fun test.Receiver.ext()
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/functionOverloads.txt
Vendored
+4 -4
View File
@@ -1,16 +1,16 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in test) fun kotlin.Any.function()
1: (in test) fun test.Base.function(i: kotlin.Int)
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test) fun kotlin.Any.function()
1: (in test) fun test.Base.function(i: kotlin.Int)
Caret 3 resolved to:
<caret_3> resolved to:
0: (in test) fun kotlin.Any.function()
1: (in test) fun test.Base.function(i: kotlin.Int)
2: (in test.Base) fun function()
Caret 4 resolved to:
<caret_4> resolved to:
0: (in test) fun kotlin.Any.function()
1: (in test) fun test.Base.function(i: kotlin.Int)
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/generics/genericParameterReceiver.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
Caret 1 resolved to:
<caret_1> resolved to:
Nothing (Unresolved reference)
Caret 2 resolved to:
<caret_2> resolved to:
Nothing (Unresolved reference)
Caret 3 resolved to:
<caret_3> resolved to:
Nothing (Unresolved reference)
Caret 4 resolved to:
<caret_4> resolved to:
Nothing (Unresolved reference)
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/generics/genericsCompatibility.txt
Vendored
+9 -9
View File
@@ -1,26 +1,26 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in test) fun <T> T.anyExt()
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test) fun <T> T.anyExt()
Caret 3 resolved to:
<caret_3> resolved to:
0: (in test) fun <T> T.anyExt()
Caret 4 resolved to:
<caret_4> resolved to:
Nothing (Unresolved reference)
Caret 5 resolved to:
<caret_5> resolved to:
0: (in test) fun <T : test.Base> T.baseExt()
Caret 6 resolved to:
<caret_6> resolved to:
0: (in test) fun <T : test.Base> T.baseExt()
Caret 7 resolved to:
<caret_7> resolved to:
Nothing (Unresolved reference)
Caret 8 resolved to:
<caret_8> resolved to:
Nothing (Unresolved reference)
Caret 9 resolved to:
<caret_9> resolved to:
0: (in test) fun <T : test.Child> T.childExt()
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/generics/typeWithGenericsReceiver.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in test) fun test.WithGenerics<kotlin.Int>.intExt()
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test) fun test.WithGenerics<kotlin.String>.stringExt()
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/nonExtensions.txt
Vendored
+5 -5
View File
@@ -1,11 +1,11 @@
Caret 1 resolved to:
<caret_1> resolved to:
Nothing (Unresolved reference)
Caret 2 resolved to:
<caret_2> resolved to:
Nothing (Unresolved reference)
Caret 3 resolved to:
<caret_3> resolved to:
Nothing (Unresolved reference)
Caret 4 resolved to:
Nothing (Unresolved reference)
<caret_4> resolved to:
Nothing (Unresolved reference)
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/qualifiers.txt
Vendored
+7 -7
View File
@@ -1,17 +1,17 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: package one
Caret 2 resolved to:
<caret_2> resolved to:
0: package one.two
Caret 3 resolved to:
<caret_3> resolved to:
0: (in one.two) class Foo
Caret 4 resolved to:
<caret_4> resolved to:
0: (in one.two) class Foo
Caret 5 resolved to:
<caret_5> resolved to:
0: package one
Caret 6 resolved to:
0: package one.two
<caret_6> resolved to:
0: package one.two
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/topLevelFunction.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in test) fun test.Foo.extFun()
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test) fun test.Foo.extFun()
Caret 3 resolved to:
<caret_3> resolved to:
0: (in test) fun test.Foo.extFun()
Caret 4 resolved to:
<caret_4> resolved to:
0: (in test) fun test.Foo.extFun()
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/topLevelProperty.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in test) val test.Foo.extProp: kotlin.Int
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test) val test.Foo.extProp: kotlin.Int
Caret 3 resolved to:
<caret_3> resolved to:
0: (in test) val test.Foo.extProp: kotlin.Int
Caret 4 resolved to:
<caret_4> resolved to:
0: (in test) val test.Foo.extProp: kotlin.Int
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/topLevelTypeVsMemberFunctionAsReceiver.txt
Vendored
+4 -4
View File
@@ -1,8 +1,8 @@
Caret 1 resolved to:
<caret_1> resolved to:
Nothing (Unresolved reference)
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test.WithMember) fun Foo()
Caret 3 resolved to:
0: (in test.WithMember) fun Foo()
<caret_3> resolved to:
0: (in test.WithMember) fun Foo()
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/typeAliasReceiver.txt
Vendored
+5 -5
View File
@@ -1,14 +1,14 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in test) fun test.Foo.fooExt()
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test) fun test.FooAlias.fooAliasExt()
Caret 3 resolved to:
<caret_3> resolved to:
0: (in test) fun test.FooAlias.fooAliasExt()
Caret 4 resolved to:
<caret_4> resolved to:
0: (in test) fun kotlin.Any.anyExt()
Caret 5 resolved to:
<caret_5> resolved to:
Nothing (Unresolved reference)
analysis/analysis-api/testData/referenceResolve/kDoc/extensions/typeCompatibility.txt
Vendored
+9 -9
View File
@@ -1,26 +1,26 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in test) fun kotlin.Any.anyExt()
Caret 2 resolved to:
<caret_2> resolved to:
0: (in test) fun kotlin.Any.anyExt()
Caret 3 resolved to:
<caret_3> resolved to:
0: (in test) fun kotlin.Any.anyExt()
Caret 4 resolved to:
<caret_4> resolved to:
Nothing (Unresolved reference)
Caret 5 resolved to:
<caret_5> resolved to:
0: (in test) fun test.Base.baseExt()
Caret 6 resolved to:
<caret_6> resolved to:
0: (in test) fun test.Base.baseExt()
Caret 7 resolved to:
<caret_7> resolved to:
Nothing (Unresolved reference)
Caret 8 resolved to:
<caret_8> resolved to:
Nothing (Unresolved reference)
Caret 9 resolved to:
<caret_9> resolved to:
0: (in test) fun test.Child.childExt()
analysis/analysis-api/testData/referenceResolve/kDoc/packages/longPackage.txt
Vendored
+9 -9
View File
@@ -1,26 +1,26 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: package one
Caret 2 resolved to:
<caret_2> resolved to:
0: package one
Caret 3 resolved to:
<caret_3> resolved to:
0: package one.two
Caret 4 resolved to:
<caret_4> resolved to:
0: package one
Caret 5 resolved to:
<caret_5> resolved to:
0: package one.two
Caret 6 resolved to:
<caret_6> resolved to:
0: package one.two.three
Caret 7 resolved to:
<caret_7> resolved to:
0: package one
Caret 8 resolved to:
<caret_8> resolved to:
0: package one.two
Caret 9 resolved to:
<caret_9> resolved to:
0: package one.two.three
analysis/analysis-api/testData/referenceResolve/kDoc/packages/packageVsTopLevelDeclarations.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
Caret 1 resolved to:
<caret_1> resolved to:
0: (in foo) fun foo()
1: (in foo) interface foo
2: package foo
Caret 2 resolved to:
<caret_2> resolved to:
0: package foo
Caret 3 resolved to:
<caret_3> resolved to:
0: (in foo) fun foo()
1: (in foo) interface foo
1: (in foo) interface foo