From 2b8bb307448bc50d91ef34f26bce8087cd1a7272 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Tue, 28 Apr 2020 14:29:45 +0700
Subject: [PATCH] Change signature: fix formatting for long qualifier names

#KT-12878 Fixed
---
 .../changeSignature/KotlinChangeSignatureProcessor.kt      | 2 ++
 .../removeUnusedParameterWithLongQualifier.kt              | 7 +++++++
 .../removeUnusedParameterWithLongQualifier.kt.after        | 7 +++++++
 .../kotlin/idea/quickfix/QuickFixTestGenerated.java        | 5 +++++
 4 files changed, 21 insertions(+)
 create mode 100644 idea/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt
 create mode 100644 idea/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt.after

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt
index 56e63696976..a833d3c7d31 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt
@@ -30,6 +30,7 @@ import com.intellij.usageView.UsageInfo
 import com.intellij.usageView.UsageViewDescriptor
 import com.intellij.util.containers.MultiMap
 import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.codeInsight.shorten.performDelayedRefactoringRequests
 import org.jetbrains.kotlin.idea.refactoring.broadcastRefactoringExit
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinFunctionCallUsage
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinImplicitReceiverUsage
@@ -135,6 +136,7 @@ class KotlinChangeSignatureProcessor(
     override fun performRefactoring(usages: Array<out UsageInfo>) {
         try {
             super.performRefactoring(usages)
+            performDelayedRefactoringRequests(myProject)
         } finally {
             changeInfo.invalidate()
         }
diff --git a/idea/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt b/idea/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt
new file mode 100644
index 00000000000..9c39be9e859
--- /dev/null
+++ b/idea/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt
@@ -0,0 +1,7 @@
+// "Remove parameter 'a'" "true"
+// DISABLE-ERRORS
+
+package com.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
+
+class SomeVeryImportantClass
+fun message(<caret>a: SomeVeryImportantClass, b: SomeVeryImportantClass, c: SomeVeryImportantClass) = Unit
\ No newline at end of file
diff --git a/idea/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt.after b/idea/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt.after
new file mode 100644
index 00000000000..5ee02aad326
--- /dev/null
+++ b/idea/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt.after
@@ -0,0 +1,7 @@
+// "Remove parameter 'a'" "true"
+// DISABLE-ERRORS
+
+package com.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
+
+class SomeVeryImportantClass
+fun message(<caret>b: SomeVeryImportantClass, c: SomeVeryImportantClass) = Unit
\ 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 a1e87ad2bc4..a1a021070a0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -2432,6 +2432,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             runTest("idea/testData/quickfix/changeSignature/removeUnusedParameterOfPropertySetter.kt");
         }
 
+        @TestMetadata("removeUnusedParameterWithLongQualifier.kt")
+        public void testRemoveUnusedParameterWithLongQualifier() throws Exception {
+            runTest("idea/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt");
+        }
+
         @TestMetadata("removeUnusedParameterWithTypeParameter.kt")
         public void testRemoveUnusedParameterWithTypeParameter() throws Exception {
             runTest("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter.kt");