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

Allow only 'out' modifier for value parameter modifiers in functional type

Browse Source 
(comments also mention 'lazy' and 'ref'; these value parameter modifiers are unsupported, anyway).
This commit is contained in:
Dmitry Petrov
2016-12-15 10:55:05 +03:00
committed by Stanislav Erokhin
parent eec96f1954
commit a3338b2230
7 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/modifierApplicability.kt
Vendored
+3 -2
View File
@@ -13,5 +13,6 @@ typealias Test6 = <!WRONG_MODIFIER_TARGET!>suspend<!> List<() -> Unit>
typealias Test7 = <!WRONG_MODIFIER_TARGET!>suspend<!> SAM
typealias Test8 = SuspendFunction0<Unit>
typealias Test9 = suspend (() -> Unit) -> Unit
typealias Test10 = suspend (<!UNSUPPORTED!>suspend<!> () -> Unit) -> Unit
typealias Test11 = suspend () -> (suspend () -> Unit)
typealias Test10 = suspend (suspend () -> Unit) -> Unit
typealias Test11 = suspend () -> (suspend () -> Unit)
typealias Test12 = suspend (suspend (() -> Unit)) -> Unit
compiler/testData/diagnostics/tests/coroutines/suspendFunctionType/modifierApplicability.txt
Vendored
+2 -1
View File
@@ -8,8 +8,9 @@ public interface SAM {
}
public typealias Action = () -> kotlin.Unit
public typealias Test1 = suspend () -> kotlin.Unit
public typealias Test10 = suspend (() -> kotlin.Unit) -> kotlin.Unit
public typealias Test10 = suspend (suspend () -> kotlin.Unit) -> kotlin.Unit
public typealias Test11 = suspend () -> suspend () -> kotlin.Unit
public typealias Test12 = suspend (suspend () -> kotlin.Unit) -> kotlin.Unit
public typealias Test2 = suspend kotlin.Int.(kotlin.String) -> kotlin.Unit
public typealias Test3 = () -> kotlin.Unit
public typealias Test4 = Action
compiler/testData/psi/TypeModifiers.kt
Vendored
+1
View File
@@ -14,6 +14,7 @@ val p11: suspend @a a
val p12: @a suspend a
val p13: @a suspend @a a
val p14: @[a] suspend @[a] a
val p15: suspend (suspend (() -> Unit)) -> Unit
@a fun @a a.f1() {}
fun (@a a.(a) -> a).f2() {}
compiler/testData/psi/TypeModifiers.txt
Vendored
+40
View File
@@ -479,6 +479,46 @@ JetFile: TypeModifiers.kt
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('p15')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
FUNCTION_TYPE
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
FUNCTION_TYPE
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Unit')
PsiElement(RPAR)(')')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(ARROW)('->')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n\n')
FUN
MODIFIER_LIST
compiler/testData/psi/TypeModifiers_ERR.txt
Vendored
+3 -3
View File
@@ -80,10 +80,10 @@ JetFile: TypeModifiers_ERR.kt
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
TYPE_REFERENCE
MODIFIER_LIST
PsiElement(suspend)('suspend')
PsiWhiteSpace(' ')
PsiErrorElement:Type expected
PsiElement(ARROW)('->')
PsiErrorElement:Expecting comma or ')'