From 7c8a5b0b837bdf01495bd95db63396fbfe2dfdfb Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 26 Jan 2016 19:09:52 +0300
Subject: [PATCH]  Make change signature fix non-applicable for constructors
 (EA-76554)

---
 .../idea/quickfix/ChangeFunctionReturnTypeFix.java       | 4 +++-
 .../notApplicableToConstructor.kt                        | 9 +++++++++
 .../kotlin/idea/quickfix/QuickFixTestGenerated.java      | 6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/notApplicableToConstructor.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java
index d578f6c6363..95eb4592164 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java
@@ -102,7 +102,9 @@ public class ChangeFunctionReturnTypeFix extends KotlinQuickFixAction<KtFunction
 
     @Override
     public boolean isAvailable(@NotNull Project project, @Nullable Editor editor, @NotNull PsiFile file) {
-        return super.isAvailable(project, editor, file) && !ErrorUtils.containsErrorType(type);
+        return super.isAvailable(project, editor, file) &&
+               !ErrorUtils.containsErrorType(type) &&
+               !(getElement() instanceof KtConstructor);
     }
 
     @Override
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/notApplicableToConstructor.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/notApplicableToConstructor.kt
new file mode 100644
index 00000000000..942e939dc57
--- /dev/null
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/notApplicableToConstructor.kt
@@ -0,0 +1,9 @@
+// "Change 'A' function return type to 'B'" "false"
+// ACTION: Change 'b' type to 'A'
+// ACTION: Convert property initializer to getter
+// ERROR: Type mismatch: inferred type is A but B was expected
+
+class A constructor() {}
+interface B
+
+val b: B = <caret>A()
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 259bb1e8d66..650acfd6f4d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -7274,6 +7274,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("notApplicableToConstructor.kt")
+            public void testNotApplicableToConstructor() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/notApplicableToConstructor.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("propertyGetterInitializerTypeMismatch.kt")
             public void testPropertyGetterInitializerTypeMismatch() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt");