From 9f7af4b58daf5ce4c93e0ba66c0b367569a5b247 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 30 Jan 2020 12:55:16 +0300 Subject: [PATCH] Fix testdata after ebe3619251c658080cc225ba4b0957be0a73ca8d --- .../removeBraces/functionHasNoStatement.kt | 1 + .../removeBraces/funtionIsUsed.kt | 1 + .../removeBraces/getterHasNoStatement.kt | 1 + .../removeBraces/getterIsUsed.kt | 1 + .../functionWithLambdaExpressionBody/wrapRun/funtionIsUsed.kt | 1 + .../functionWithLambdaExpressionBody/wrapRun/getterIsUsed.kt | 1 + idea/testData/quickfix/removeSingleLambdaParameter/multiple.kt | 1 + .../removeSingleLambdaParameter/propertyWithImplicitType.kt | 1 + .../renameToUnderscore/lambdaParameterNoRemoveParameter.kt | 1 + .../letWithWrongImplicitThis.kt | 1 + .../dontChangeFunctionReturnTypeToErrorType.kt | 1 + 11 files changed, 11 insertions(+) diff --git a/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/functionHasNoStatement.kt b/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/functionHasNoStatement.kt index 8e158f8dfe2..33f1928684c 100644 --- a/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/functionHasNoStatement.kt +++ b/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/functionHasNoStatement.kt @@ -1,6 +1,7 @@ // "Remove braces" "false" // TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection // ACTION: Convert to block body +// ACTION: Convert to multi-line lambda // ACTION: Convert to run { ... } // ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature diff --git a/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/funtionIsUsed.kt b/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/funtionIsUsed.kt index a40112995dd..b6a2c74c3d2 100644 --- a/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/funtionIsUsed.kt +++ b/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/funtionIsUsed.kt @@ -1,6 +1,7 @@ // "Remove braces" "false" // TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection // ACTION: Convert to block body +// ACTION: Convert to multi-line lambda // ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature // ACTION: Specify return type explicitly diff --git a/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterHasNoStatement.kt b/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterHasNoStatement.kt index b1c92bea6ac..1b25c5cb7bb 100644 --- a/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterHasNoStatement.kt +++ b/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterHasNoStatement.kt @@ -2,6 +2,7 @@ // TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection // ACTION: Convert property getter to initializer // ACTION: Convert to block body +// ACTION: Convert to multi-line lambda // ACTION: Convert to run { ... } // ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature diff --git a/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterIsUsed.kt b/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterIsUsed.kt index 3c0ae2c5f78..98b0b8b1906 100644 --- a/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterIsUsed.kt +++ b/idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterIsUsed.kt @@ -2,6 +2,7 @@ // TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection // ACTION: Convert property getter to initializer // ACTION: Convert to block body +// ACTION: Convert to multi-line lambda // ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature // ACTION: Specify type explicitly diff --git a/idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/funtionIsUsed.kt b/idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/funtionIsUsed.kt index d394cb96182..870a778332c 100644 --- a/idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/funtionIsUsed.kt +++ b/idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/funtionIsUsed.kt @@ -1,6 +1,7 @@ // "Convert to run { ... }" "false" // TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection // ACTION: Convert to block body +// ACTION: Convert to multi-line lambda // ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature // ACTION: Specify return type explicitly diff --git a/idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/getterIsUsed.kt b/idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/getterIsUsed.kt index d37008faa46..d0cd4b85a64 100644 --- a/idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/getterIsUsed.kt +++ b/idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/getterIsUsed.kt @@ -2,6 +2,7 @@ // TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection // ACTION: Convert property getter to initializer // ACTION: Convert to block body +// ACTION: Convert to multi-line lambda // ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature // ACTION: Specify type explicitly diff --git a/idea/testData/quickfix/removeSingleLambdaParameter/multiple.kt b/idea/testData/quickfix/removeSingleLambdaParameter/multiple.kt index 74e42de87c3..218384b1eb9 100644 --- a/idea/testData/quickfix/removeSingleLambdaParameter/multiple.kt +++ b/idea/testData/quickfix/removeSingleLambdaParameter/multiple.kt @@ -4,6 +4,7 @@ // ACTION: Specify explicit lambda signature // ACTION: Specify type explicitly // ACTION: Convert to anonymous function +// ACTION: Convert to multi-line lambda // RUNTIME_WITH_FULL_JDK fun main() { diff --git a/idea/testData/quickfix/removeSingleLambdaParameter/propertyWithImplicitType.kt b/idea/testData/quickfix/removeSingleLambdaParameter/propertyWithImplicitType.kt index 882391721b6..77f0331265f 100644 --- a/idea/testData/quickfix/removeSingleLambdaParameter/propertyWithImplicitType.kt +++ b/idea/testData/quickfix/removeSingleLambdaParameter/propertyWithImplicitType.kt @@ -3,6 +3,7 @@ // ACTION: Rename to _ // ACTION: Convert to also // ACTION: Convert to apply +// ACTION: Convert to multi-line lambda fun test() { val f = { i: Int -> foo() } bar(f) diff --git a/idea/testData/quickfix/renameToUnderscore/lambdaParameterNoRemoveParameter.kt b/idea/testData/quickfix/renameToUnderscore/lambdaParameterNoRemoveParameter.kt index 1504c3027b2..6cb8a9afc24 100644 --- a/idea/testData/quickfix/renameToUnderscore/lambdaParameterNoRemoveParameter.kt +++ b/idea/testData/quickfix/renameToUnderscore/lambdaParameterNoRemoveParameter.kt @@ -3,6 +3,7 @@ // ACTION: Remove explicit lambda parameter types (may break code) // ACTION: Rename to _ // ACTION: Convert to anonymous function +// ACTION: Convert to single-line lambda fun foo(block: (String, Int) -> Unit) { block("", 1) diff --git a/idea/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongImplicitThis.kt b/idea/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongImplicitThis.kt index a4b33f616c0..4d39e91a634 100644 --- a/idea/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongImplicitThis.kt +++ b/idea/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongImplicitThis.kt @@ -6,6 +6,7 @@ // ACTION: Replace with safe (this?.) call // ACTION: Specify explicit lambda signature // ACTION: Add return@let +// ACTION: Convert to single-line lambda // ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? fun String?.foo(a: String?) { diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt index 8ce1983095c..aa85dc2c3e3 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt @@ -1,4 +1,5 @@ // "Change 'foo' function return type to '(x: [ERROR : NoSuchType]) -> Int'" "false" +// ACTION: Convert to multi-line lambda // ACTION: Create annotation 'NoSuchType' // ACTION: Create class 'NoSuchType' // ACTION: Create enum 'NoSuchType'