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

Remove ChangeType quickfix for lamdas with deprecated syntax

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-23 21:11:50 +03:00
parent 60ebc689ad
commit 31d2aa23f5
11 changed files with 0 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java
-12
View File
@@ -78,16 +78,4 @@ public class ChangeTypeFix extends JetIntentionAction<JetTypeReference> {
}
};
}
@NotNull
public static JetSingleIntentionActionFactory createFactoryForExpectedReturnTypeMismatch() {
return new JetSingleIntentionActionFactory() {
@Nullable
@Override
public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
DiagnosticWithParameters1<JetTypeReference, JetType> diagnosticWithParameters = Errors.EXPECTED_RETURN_TYPE_MISMATCH.cast(diagnostic);
return new ChangeTypeFix(diagnosticWithParameters.getPsiElement(), diagnosticWithParameters.getA());
}
};
}
}
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
-1
View File
@@ -224,7 +224,6 @@ public class QuickFixRegistrar : QuickFixContributor {
EXPECTED_PARAMETERS_NUMBER_MISMATCH.registerFactory(ChangeFunctionSignatureFix.createFactoryForParametersNumberMismatch())
EXPECTED_PARAMETER_TYPE_MISMATCH.registerFactory(ChangeTypeFix.createFactoryForExpectedParameterTypeMismatch())
EXPECTED_RETURN_TYPE_MISMATCH.registerFactory(ChangeTypeFix.createFactoryForExpectedReturnTypeMismatch())
val changeFunctionLiteralReturnTypeFix = ChangeFunctionLiteralReturnTypeFix.createFactoryForExpectedOrAssignmentTypeMismatch()
EXPECTED_TYPE_MISMATCH.registerFactory(changeFunctionLiteralReturnTypeFix)
idea/testData/quickfix/typeMismatch/expectedReturnTypeMismatch.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// "Change type from 'A' to 'B'" "true"
interface A {}
interface B : A {}
fun foo(f: (B) -> B) {
foo {
(b: B): A<caret> -> b
}
}
idea/testData/quickfix/typeMismatch/expectedReturnTypeMismatch.kt.after
Vendored
-9
View File
@@ -1,9 +0,0 @@
// "Change type from 'A' to 'B'" "true"
interface A {}
interface B : A {}
fun foo(f: (B) -> B) {
foo {
(b: B): B -> b
}
}
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// "Change function literal return type to 'String'" "true"
fun foo(f: (String) -> Any) {
foo {
(s: String): Int ->
s<caret>
}
}
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// "Change function literal return type to 'String'" "true"
fun foo(f: (String) -> Any) {
foo {
(s: String): String ->
s<caret>
}
}
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingPropertyType.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// "Change function literal return type to 'String'" "true"
fun foo() {
val f: (String) -> String = {
(s: Any): Int ->
""<caret>
}
}
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingPropertyType.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// "Change function literal return type to 'String'" "true"
fun foo() {
val f: (String) -> String = {
(s: Any): String ->
""<caret>
}
}
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/expectedTypeMismatch.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// "Change 'bar' type to '(() -> Long) -> Unit'" "true"
fun foo() {
val bar: () -> Double = {
(f: () -> Long): String ->
var x = 5<caret>
}
}
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/expectedTypeMismatch.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
// "Change 'bar' type to '(() -> Long) -> Unit'" "true"
fun foo() {
val bar: (() -> Long) -> Unit = {
(f: () -> Long): Unit ->
var x = 5<caret>
}
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
-24
View File
@@ -5973,12 +5973,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("expectedReturnTypeMismatch.kt")
public void testExpectedReturnTypeMismatch() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/expectedReturnTypeMismatch.kt");
doTest(fileName);
}
@TestMetadata("hasNextFunctionReturnTypeMismatch.kt")
public void testHasNextFunctionReturnTypeMismatch() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt");
@@ -6251,18 +6245,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt")
public void testChangeFunctionLiteralTypeWithoutChangingFunctionParameterType() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt");
doTest(fileName);
}
@TestMetadata("changeFunctionLiteralTypeWithoutChangingPropertyType.kt")
public void testChangeFunctionLiteralTypeWithoutChangingPropertyType() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingPropertyType.kt");
doTest(fileName);
}
@TestMetadata("changeFunctionReturnTypeToFunctionType.kt")
public void testChangeFunctionReturnTypeToFunctionType() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt");
@@ -6281,12 +6263,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("expectedTypeMismatch.kt")
public void testExpectedTypeMismatch() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/expectedTypeMismatch.kt");
doTest(fileName);
}
@TestMetadata("multiFakeOverride.kt")
public void testMultiFakeOverride() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt");