diff --git a/compiler/testData/psi/annotation/functionalTypes/withParentheses/withParameter.kt b/compiler/testData/psi/annotation/functionalTypes/withParentheses/withParameter.kt index 15f1834d78e..ff04d4ef8a3 100644 --- a/compiler/testData/psi/annotation/functionalTypes/withParentheses/withParameter.kt +++ b/compiler/testData/psi/annotation/functionalTypes/withParentheses/withParameter.kt @@ -6,7 +6,7 @@ val x: @Foo({}) ((x: @Foo(10) (@Foo(11) () -> Int) -> Int) -> Unit) get() = {} val x: suspend @Foo(10) (x: @Foo(10) (@Foo("") (x: kotlin.Any) -> Int) -> Int) -> Unit get() = {} -val x: Comparable<@Foo(10) @Bar(10) @Foo(listOf(10)) (x: kotlin.Any = {}) -> Unit> get() = {} +val x: Comparable<@Foo(10) @Bar(10) @Foo(listOf(10)) (x: kotlin.Any) -> Unit> get() = {} val x: Any = {} as @Foo({ x: Int -> 10}) suspend (x: @Foo(10) Foo) -> (y: @Foo(10) Bar) -> Unit diff --git a/compiler/testData/psi/annotation/functionalTypes/withParentheses/withParameter.txt b/compiler/testData/psi/annotation/functionalTypes/withParentheses/withParameter.txt index b653ff3352e..99892acbe22 100644 --- a/compiler/testData/psi/annotation/functionalTypes/withParentheses/withParameter.txt +++ b/compiler/testData/psi/annotation/functionalTypes/withParentheses/withParameter.txt @@ -376,15 +376,6 @@ KtFile: withParameter.kt PsiElement(DOT)('.') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Any') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - LAMBDA_EXPRESSION - FUNCTION_LITERAL - PsiElement(LBRACE)('{') - BLOCK - - PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(ARROW)('->') diff --git a/compiler/testData/psi/annotation/functionalTypes/withParentheses/withoutParameter.kt b/compiler/testData/psi/annotation/functionalTypes/withParentheses/withoutParameter.kt index 4c0ca6cffb9..218ec79f2df 100644 --- a/compiler/testData/psi/annotation/functionalTypes/withParentheses/withoutParameter.kt +++ b/compiler/testData/psi/annotation/functionalTypes/withParentheses/withoutParameter.kt @@ -12,7 +12,7 @@ val x: Any = {} as @Foo() () -> Unit fun foo(x: (@Foo() () -> Unit)) = x - fun foo(x: @Foo(10) @Bar() () -> Unit = { x: Int -> x }) {} +fun foo(x: @Foo(10) @Bar() () -> Unit = { x: Int -> x }) {} fun foo() { val x: @Foo() @Bar() () -> Unit = {} diff --git a/compiler/testData/psi/annotation/functionalTypes/withParentheses/withoutParameter.txt b/compiler/testData/psi/annotation/functionalTypes/withParentheses/withoutParameter.txt index 8b4ec0fdd1a..d875cd860fb 100644 --- a/compiler/testData/psi/annotation/functionalTypes/withParentheses/withoutParameter.txt +++ b/compiler/testData/psi/annotation/functionalTypes/withParentheses/withoutParameter.txt @@ -313,7 +313,7 @@ KtFile: withoutParameter.kt PsiWhiteSpace(' ') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('x') - PsiWhiteSpace('\n\n ') + PsiWhiteSpace('\n\n') FUN PsiElement(fun)('fun') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withParameter.kt b/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withParameter.kt index 84c834c4659..c0f8ccd1007 100644 --- a/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withParameter.kt +++ b/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withParameter.kt @@ -6,7 +6,7 @@ val x: @Foo ((x: @Foo (@Foo () -> Int) -> Int) -> Unit) get() = {} val x: suspend @Foo (x: @Foo (@Foo (x: kotlin.Any) -> Int) -> Int) -> Unit get() = {} -val x: Comparable<@Foo @Bar(10) @Foo (x: kotlin.Any = {}) -> Unit> get() = {} +val x: Comparable<@Foo @Bar(10) @Foo (x: kotlin.Any) -> Unit> get() = {} val x: Any = {} as @Foo suspend (x: @Foo Foo) -> (y: @Foo Bar) -> Unit diff --git a/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withParameter.txt b/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withParameter.txt index b89e67cfdfc..95e68a83cd9 100644 --- a/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withParameter.txt +++ b/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withParameter.txt @@ -310,15 +310,6 @@ KtFile: withParameter.kt PsiElement(DOT)('.') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Any') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - LAMBDA_EXPRESSION - FUNCTION_LITERAL - PsiElement(LBRACE)('{') - BLOCK - - PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(ARROW)('->') diff --git a/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withReveiver.kt b/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withReveiver.kt index 05312ee4f56..b34d6fb3232 100644 --- a/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withReveiver.kt +++ b/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withReveiver.kt @@ -10,7 +10,7 @@ val x: @Foo ((x: @Foo (@Foo () -> Int) -> Int.(@Foo () -> Int) -> Int) -> Unit) val x: suspend @Foo (x: @Foo (@Foo ((x: kotlin.Any) -> Int).(x: kotlin.Any) -> Int) -> Int) -> Unit get() = {} -val x: Comparable<@Foo @Bar(10) @Foo Unit.(x: kotlin.Any = {}) -> Unit> get() = {} +val x: Comparable<@Foo @Bar(10) @Foo Unit.(x: kotlin.Any) -> Unit> get() = {} val x: Any = {} as @Foo suspend Int.(x: @Foo Foo) -> (y: @Foo Bar) -> Unit diff --git a/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withReveiver.txt b/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withReveiver.txt index db27273cc0b..c54c5a5a942 100644 --- a/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withReveiver.txt +++ b/compiler/testData/psi/annotation/functionalTypes/withoutParentheses/withReveiver.txt @@ -489,15 +489,6 @@ KtFile: withReveiver.kt PsiElement(DOT)('.') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Any') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - LAMBDA_EXPRESSION - FUNCTION_LITERAL - PsiElement(LBRACE)('{') - BLOCK - - PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(ARROW)('->')