From 382bf9a500f4efeffbeaf5c92e61e2a982c12339 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 4 May 2017 09:40:13 +0300 Subject: [PATCH] ConvertReferenceToLambda status refactoring Intention is not registered now; inspection is enabled by default now, but has highlight level of "No highlighting" --- idea/src/META-INF/plugin.xml | 9 ++------- .../noImportInterfaceRefAsConstructor.after.kt | 1 - .../noImportInterfaceRefAsConstructor.before.Main.kt | 1 - .../callableReferences/noFunctionalType.kt | 1 - .../createVariable/localVariable/callableRef.kt | 1 - .../createVariable/parameter/callableRef.kt | 1 - .../createVariable/property/callableRef.kt | 1 - 7 files changed, 2 insertions(+), 13 deletions(-) diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 623fb8dcb49..014464e1dca 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -1385,11 +1385,6 @@ Kotlin - - org.jetbrains.kotlin.idea.intentions.ConvertReferenceToLambdaIntention - Kotlin - - org.jetbrains.kotlin.idea.intentions.RemoveSingleExpressionStringTemplateIntention Kotlin @@ -1956,8 +1951,8 @@ diff --git a/idea/testData/quickfix/autoImports/noImportInterfaceRefAsConstructor.after.kt b/idea/testData/quickfix/autoImports/noImportInterfaceRefAsConstructor.after.kt index 90b76272ff9..ac3ba00b8f3 100644 --- a/idea/testData/quickfix/autoImports/noImportInterfaceRefAsConstructor.after.kt +++ b/idea/testData/quickfix/autoImports/noImportInterfaceRefAsConstructor.after.kt @@ -1,6 +1,5 @@ // "Import" "false" // ERROR: Unresolved reference: Some -// ACTION: Convert reference to lambda // ACTION: Convert to expression body // ACTION: Create function 'Some' // ACTION: Rename reference diff --git a/idea/testData/quickfix/autoImports/noImportInterfaceRefAsConstructor.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInterfaceRefAsConstructor.before.Main.kt index 90b76272ff9..ac3ba00b8f3 100644 --- a/idea/testData/quickfix/autoImports/noImportInterfaceRefAsConstructor.before.Main.kt +++ b/idea/testData/quickfix/autoImports/noImportInterfaceRefAsConstructor.before.Main.kt @@ -1,6 +1,5 @@ // "Import" "false" // ERROR: Unresolved reference: Some -// ACTION: Convert reference to lambda // ACTION: Convert to expression body // ACTION: Create function 'Some' // ACTION: Rename reference diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/noFunctionalType.kt b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/noFunctionalType.kt index ebba25dd9b3..72b2e951ace 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/noFunctionalType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/noFunctionalType.kt @@ -1,7 +1,6 @@ // "Create function 'foo'" "false" // ACTION: Convert to expression body // ACTION: Rename reference -// ACTION: Convert reference to lambda // ERROR: Unresolved reference: foo fun bar(n: Int) = "$n" diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/callableRef.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/callableRef.kt index 77eab22f0df..7e1bb019349 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/callableRef.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/callableRef.kt @@ -1,7 +1,6 @@ // "Create local variable 'foo'" "false" // ACTION: Rename reference // ACTION: Create function 'foo' -// ACTION: Convert reference to lambda // ERROR: Unresolved reference: foo fun test(f: (Int) -> Int) {} diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/callableRef.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/callableRef.kt index 45fefee997c..7b2174d7a02 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/callableRef.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/callableRef.kt @@ -1,7 +1,6 @@ // "Create parameter 'foo'" "false" // ACTION: Rename reference // ACTION: Create function 'foo' -// ACTION: Convert reference to lambda // ERROR: Unresolved reference: foo fun test(f: (Int) -> Int) {} diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/callableRef.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/callableRef.kt index d2af35bcacf..5a7ddad8e02 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/callableRef.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/callableRef.kt @@ -1,7 +1,6 @@ // "Create property 'foo'" "false" // ACTION: Rename reference // ACTION: Create function 'foo' -// ACTION: Convert reference to lambda // ERROR: Unresolved reference: foo fun test(f: (Int) -> Int) {}