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

Since '@A R.() -> T' is now parsed as '@A (R.() -> T)',

Browse Source 
receiver type with modifiers or annotations should be surrounded in parentheses on rendering: '(@A R).() -> T'

This also fixes stub builder tests (which check that stubs are consistent with rendered descriptors).
This commit is contained in:
Dmitry Petrov
2016-12-14 14:50:26 +03:00
committed by Stanislav Erokhin
parent 6e1340da82
commit cf4fb1eb25
20 changed files with 206 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
public val inVal: (x: kotlin.Int) -> kotlin.Unit
public val onType: @TypeAnn A.(a: @TypeAnn A, A) -> @TypeAnn A?
public val onType: (@TypeAnn A).(a: @TypeAnn A, A) -> @TypeAnn A?
public fun f(/*0*/ @Ann x: kotlin.Int): kotlin.Unit
public fun inParam(/*0*/ fn: (x: kotlin.Int) -> kotlin.Unit): kotlin.Unit
public fun inParamNested(/*0*/ fn1: (fn2: (n: kotlin.Int) -> kotlin.Unit) -> kotlin.Unit): kotlin.Unit
compiler/testData/diagnostics/tests/resolve/dslMarker/insideTopLevelExtensionAnnotatedType.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public fun bar(/*0*/ x: @Ann B.() -> kotlin.Unit): kotlin.Unit
public fun bar(/*0*/ x: (@Ann B).() -> kotlin.Unit): kotlin.Unit
public fun @Ann A.test(): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.txt
Vendored
+6 -6
View File
@@ -1,11 +1,11 @@
package
public fun bar1(/*0*/ x: @L1 B.() -> kotlin.Unit): kotlin.Unit
public fun </*0*/ T> bar1t(/*0*/ q: T, /*1*/ x: @L1 T.() -> kotlin.Unit): kotlin.Unit
public fun bar2(/*0*/ x: @L2 B.() -> kotlin.Unit): kotlin.Unit
public fun foo1(/*0*/ x: @L1 A.() -> kotlin.Unit): kotlin.Unit
public fun foo12(/*0*/ x: @L1 @L2 A.() -> kotlin.Unit): kotlin.Unit
public fun foo2(/*0*/ x: @L2 A.() -> kotlin.Unit): kotlin.Unit
public fun bar1(/*0*/ x: (@L1 B).() -> kotlin.Unit): kotlin.Unit
public fun </*0*/ T> bar1t(/*0*/ q: T, /*1*/ x: (@L1 T).() -> kotlin.Unit): kotlin.Unit
public fun bar2(/*0*/ x: (@L2 B).() -> kotlin.Unit): kotlin.Unit
public fun foo1(/*0*/ x: (@L1 A).() -> kotlin.Unit): kotlin.Unit
public fun foo12(/*0*/ x: (@L1 @L2 A).() -> kotlin.Unit): kotlin.Unit
public fun foo2(/*0*/ x: (@L2 A).() -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/resolve/dslMarker/nestedWithSameReceiver.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package
public fun bar(/*0*/ x: @Ann B.() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: @Ann A.() -> kotlin.Unit): kotlin.Unit
public fun bar(/*0*/ x: (@Ann B).() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: (@Ann A).() -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/resolve/dslMarker/simpleAnnotatedTypes.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package
public fun bar(/*0*/ x: @Ann B.() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: @Ann A.() -> kotlin.Unit): kotlin.Unit
public fun bar(/*0*/ x: (@Ann B).() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: (@Ann A).() -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package
public fun </*0*/ E> bar(/*0*/ x: @Ann E.() -> kotlin.Unit): kotlin.Unit
public fun </*0*/ T> foo(/*0*/ x: @Ann T.() -> kotlin.Unit): kotlin.Unit
public fun </*0*/ E> bar(/*0*/ x: (@Ann E).() -> kotlin.Unit): kotlin.Unit
public fun </*0*/ T> foo(/*0*/ x: (@Ann T).() -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.txt
Vendored
+6 -6
View File
@@ -1,11 +1,11 @@
package
public fun bar(/*0*/ x: @Ann2 B.() -> kotlin.Unit): kotlin.Unit
public fun baz(/*0*/ x: @Ann3 C.() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: @Ann1 A.() -> kotlin.Unit): kotlin.Unit
public fun foo1(/*0*/ x: @Ann1 D.() -> kotlin.Unit): kotlin.Unit
public fun foo2(/*0*/ x: @Ann2 D.() -> kotlin.Unit): kotlin.Unit
public fun foo3(/*0*/ x: @Ann3 D.() -> kotlin.Unit): kotlin.Unit
public fun bar(/*0*/ x: (@Ann2 B).() -> kotlin.Unit): kotlin.Unit
public fun baz(/*0*/ x: (@Ann3 C).() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: (@Ann1 A).() -> kotlin.Unit): kotlin.Unit
public fun foo1(/*0*/ x: (@Ann1 D).() -> kotlin.Unit): kotlin.Unit
public fun foo2(/*0*/ x: (@Ann2 D).() -> kotlin.Unit): kotlin.Unit
public fun foo3(/*0*/ x: (@Ann3 D).() -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.txt
Vendored
+6 -6
View File
@@ -1,11 +1,11 @@
package
public fun bar(/*0*/ x: @Ann2 B.() -> kotlin.Unit): kotlin.Unit
public fun baz(/*0*/ x: @Ann3 C.() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: @Ann1 A.() -> kotlin.Unit): kotlin.Unit
public fun foo1(/*0*/ x: @Ann1 D.() -> kotlin.Unit): kotlin.Unit
public fun foo2(/*0*/ x: @Ann2 D.() -> kotlin.Unit): kotlin.Unit
public fun foo3(/*0*/ x: @Ann3 D.() -> kotlin.Unit): kotlin.Unit
public fun bar(/*0*/ x: (@Ann2 B).() -> kotlin.Unit): kotlin.Unit
public fun baz(/*0*/ x: (@Ann3 C).() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: (@Ann1 A).() -> kotlin.Unit): kotlin.Unit
public fun foo1(/*0*/ x: (@Ann1 D).() -> kotlin.Unit): kotlin.Unit
public fun foo2(/*0*/ x: (@Ann2 D).() -> kotlin.Unit): kotlin.Unit
public fun foo3(/*0*/ x: (@Ann3 D).() -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/resolve/dslMarker/twoImplicitReceivers.txt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
package
public fun bar(/*0*/ x: @Ann2 B.() -> kotlin.Unit): kotlin.Unit
public fun baz(/*0*/ x: @Ann1 D.() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: @Ann1 A.() -> kotlin.Unit): kotlin.Unit
public fun bar(/*0*/ x: (@Ann2 B).() -> kotlin.Unit): kotlin.Unit
public fun baz(/*0*/ x: (@Ann1 D).() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: (@Ann1 A).() -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/resolve/dslMarker/twoLanguages.txt
Vendored
+4 -4
View File
@@ -1,9 +1,9 @@
package
public fun bar1(/*0*/ x: @L1 B.() -> kotlin.Unit): kotlin.Unit
public fun bar2(/*0*/ x: @L2 B.() -> kotlin.Unit): kotlin.Unit
public fun foo1(/*0*/ x: @L1 A.() -> kotlin.Unit): kotlin.Unit
public fun foo2(/*0*/ x: @L2 A.() -> kotlin.Unit): kotlin.Unit
public fun bar1(/*0*/ x: (@L1 B).() -> kotlin.Unit): kotlin.Unit
public fun bar2(/*0*/ x: (@L2 B).() -> kotlin.Unit): kotlin.Unit
public fun foo1(/*0*/ x: (@L1 A).() -> kotlin.Unit): kotlin.Unit
public fun foo2(/*0*/ x: (@L2 A).() -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public final class A {
compiler/testData/diagnostics/tests/resolve/dslMarker/usingWithThis.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package
public fun bar(/*0*/ x: @Ann B.() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: @Ann A.() -> kotlin.Unit): kotlin.Unit
public fun bar(/*0*/ x: (@Ann B).() -> kotlin.Unit): kotlin.Unit
public fun foo(/*0*/ x: (@Ann A).() -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public final class A {
compiler/testData/psi/TypeModifiers.kt
Vendored
+2
View File
@@ -2,7 +2,9 @@ val p1: suspend a
val p2: suspend (a) -> a
val p3: suspend (a) -> suspend a
val p4: suspend a.() -> a
val p4a: @a a.() -> a
val p5: (suspend a).() -> a
val p5a: (@a a).() -> a
val p6: a<in suspend a>
val p7: a<out suspend @a a>
val p8: a<out @a suspend @a a>
compiler/testData/psi/TypeModifiers.txt
Vendored
+70
View File
@@ -102,6 +102,40 @@ JetFile: TypeModifiers.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p4a')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -132,6 +166,42 @@ JetFile: TypeModifiers.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p5a')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
FUNCTION_TYPE
FUNCTION_TYPE_RECEIVER
TYPE_REFERENCE
PsiElement(LPAR)('(')
MODIFIER_LIST
ANNOTATION_ENTRY
PsiElement(AT)('@')
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RPAR)(')')
PsiElement(DOT)('.')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')