Change Signature: Avoid explicit Unit return type

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java

@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignaturePack
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo;
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo;
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar;
+import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.idea.util.ShortenReferences;
 import org.jetbrains.kotlin.idea.util.ShortenReferences.Options;
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
@@ -236,7 +237,7 @@ public class JetCallableDefinitionUsage<T extends PsiElement> extends JetUsageIn
             String returnTypeText = changeInfo.renderReturnType((JetCallableDefinitionUsage<PsiElement>) this);
 
             //TODO use ChangeFunctionReturnTypeFix.invoke when JetTypeCodeFragment.getType() is ready
-            if (!KotlinBuiltIns.getInstance().getUnitType().toString().equals(returnTypeText)) {
+            if (!(returnTypeText.equals("Unit") || returnTypeText.equals("kotlin.Unit"))) {
                 ShortenPackage.addToShorteningWaitSet(
                         callable.setTypeReference(JetPsiFactory(callable).createType(returnTypeText)),
                         Options.DEFAULT

idea/testData/refactoring/changeSignature/JavaMethodOverridesOmitUnitTypeAfter.1.kt

@@ -0,0 +1,5 @@
+open class X: A() {
+    override fun foo() {
+
+    }
+}

idea/testData/refactoring/changeSignature/JavaMethodOverridesOmitUnitTypeAfter.java

@@ -0,0 +1,5 @@
+class A {
+    void <caret>foo() {
+
+    }
+}

idea/testData/refactoring/changeSignature/JavaMethodOverridesOmitUnitTypeBefore.1.kt

@@ -0,0 +1,5 @@
+open class X: A() {
+    override fun foo() {
+
+    }
+}

idea/testData/refactoring/changeSignature/JavaMethodOverridesOmitUnitTypeBefore.java

@@ -0,0 +1,5 @@
+class A {
+    void <caret>foo() {
+
+    }
+}

idea/testData/refactoring/changeSignature/JavaParameterPropagationAfter.1.kt

@@ -1,5 +1,5 @@
 open class C: A() {
-    override fun foo(n: Int, s: String): Unit {
+    override fun foo(n: Int, s: String) {
 
     }
 

idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java

@@ -1296,6 +1296,10 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
         doTest(changeInfo);
     }
 
+    public void testJavaMethodOverridesOmitUnitType() throws Exception {
+        doJavaTest(new JavaRefactoringProvider());
+    }
+
     @NotNull
     private LinkedHashSet<PsiMethod> findCallers(@NotNull PsiMethod method) {
         KotlinMethodNode rootNode =