From 21eb2acd31db85875887032883383698de301d40 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 8 May 2015 21:39:44 +0300
Subject: [PATCH] Shorter quickfix names

---
 .../kotlin/idea/quickfix/SuperClassNotInitialized.kt          | 2 +-
 .../quickfix/supertypeInitialization/addParameters.kt         | 4 ++--
 .../quickfix/supertypeInitialization/addParameters.kt.after   | 4 ++--
 .../quickfix/supertypeInitialization/createConstructor.kt     | 2 +-
 .../supertypeInitialization/createConstructor.kt.after        | 2 +-
 .../testData/quickfix/supertypeInitialization/genericClass.kt | 2 +-
 .../quickfix/supertypeInitialization/genericClass.kt.after    | 2 +-
 .../quickfix/supertypeInitialization/incompleteConstructor.kt | 2 +-
 .../supertypeInitialization/incompleteConstructor.kt.after    | 2 +-
 idea/testData/quickfix/supertypeInitialization/keywordName.kt | 2 +-
 .../quickfix/supertypeInitialization/keywordName.kt.after     | 2 +-
 .../supertypeInitialization/primaryConstructorInaccessible.kt | 2 +-
 .../primaryConstructorInaccessible.kt.after                   | 2 +-
 .../supertypeInitialization/someParametersAlreadyExist.kt     | 2 +-
 .../someParametersAlreadyExist.kt.after                       | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
index d17b54c51e7..2949a76d4ec 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
@@ -100,7 +100,7 @@ public object SuperClassNotInitialized : JetIntentionActionsFactory() {
         override fun getText(): String {
             return "Add constructor parameters from " +
                    superConstructor.getContainingDeclaration().getName().asString() +
-                   DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderFunctionParameters(superConstructor)
+                   superConstructor.getValueParameters().map { DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(it.getType()) }.joinToString(", ", "(", ")")
         }
 
         override fun invoke(project: Project, editor: Editor?, file: JetFile) {
diff --git a/idea/testData/quickfix/supertypeInitialization/addParameters.kt b/idea/testData/quickfix/supertypeInitialization/addParameters.kt
index 1a3b519f7ee..dbd04643a65 100644
--- a/idea/testData/quickfix/supertypeInitialization/addParameters.kt
+++ b/idea/testData/quickfix/supertypeInitialization/addParameters.kt
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: Int, p2: Int)" "true"
-open class Base(p1: Int, private val p2: Int)
+// "Add constructor parameters from Base(Int, Int)" "true"
+open class Base(p1: Int, private val p2: Int = 0)
 
 class C(p: Int) : Base<caret>
diff --git a/idea/testData/quickfix/supertypeInitialization/addParameters.kt.after b/idea/testData/quickfix/supertypeInitialization/addParameters.kt.after
index 81b53ff5d26..9fe326137d6 100644
--- a/idea/testData/quickfix/supertypeInitialization/addParameters.kt.after
+++ b/idea/testData/quickfix/supertypeInitialization/addParameters.kt.after
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: Int, p2: Int)" "true"
-open class Base(p1: Int, private val p2: Int)
+// "Add constructor parameters from Base(Int, Int)" "true"
+open class Base(p1: Int, private val p2: Int = 0)
 
 class C(p: Int, p1: Int, p2: Int) : Base<caret>(p1, p2)
diff --git a/idea/testData/quickfix/supertypeInitialization/createConstructor.kt b/idea/testData/quickfix/supertypeInitialization/createConstructor.kt
index 0f700ef178b..0e4b68deff5 100644
--- a/idea/testData/quickfix/supertypeInitialization/createConstructor.kt
+++ b/idea/testData/quickfix/supertypeInitialization/createConstructor.kt
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: Int, p2: Int)" "true"
+// "Add constructor parameters from Base(Int, Int)" "true"
 open class Base(p1: Int, val p2: Int)
 
 class C : Base<caret>
\ No newline at end of file
diff --git a/idea/testData/quickfix/supertypeInitialization/createConstructor.kt.after b/idea/testData/quickfix/supertypeInitialization/createConstructor.kt.after
index 84c15a4f3b3..edf01060827 100644
--- a/idea/testData/quickfix/supertypeInitialization/createConstructor.kt.after
+++ b/idea/testData/quickfix/supertypeInitialization/createConstructor.kt.after
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: Int, p2: Int)" "true"
+// "Add constructor parameters from Base(Int, Int)" "true"
 open class Base(p1: Int, val p2: Int)
 
 class C(p1: Int, p2: Int) : Base<caret>(p1, p2)
\ No newline at end of file
diff --git a/idea/testData/quickfix/supertypeInitialization/genericClass.kt b/idea/testData/quickfix/supertypeInitialization/genericClass.kt
index b1021ba5dbc..4515df16c38 100644
--- a/idea/testData/quickfix/supertypeInitialization/genericClass.kt
+++ b/idea/testData/quickfix/supertypeInitialization/genericClass.kt
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: T, p2: String, p3: Base<T, String>?)" "true"
+// "Add constructor parameters from Base(T, String, Base<T, String>?)" "true"
 trait I
 
 open class Base<T1, T2>(p1: T1, p2: T2, p3: Base<T1, T2>?)
diff --git a/idea/testData/quickfix/supertypeInitialization/genericClass.kt.after b/idea/testData/quickfix/supertypeInitialization/genericClass.kt.after
index 23f0137d07e..fc34be18a21 100644
--- a/idea/testData/quickfix/supertypeInitialization/genericClass.kt.after
+++ b/idea/testData/quickfix/supertypeInitialization/genericClass.kt.after
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: T, p2: String, p3: Base<T, String>?)" "true"
+// "Add constructor parameters from Base(T, String, Base<T, String>?)" "true"
 trait I
 
 open class Base<T1, T2>(p1: T1, p2: T2, p3: Base<T1, T2>?)
diff --git a/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt b/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt
index 24ad93ac30d..99541d57c07 100644
--- a/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt
+++ b/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: Int, p2: Int)" "true"
+// "Add constructor parameters from Base(Int, Int)" "true"
 open class Base(p1: Int, val p2: Int)
 
 class C private : Base<caret>
\ No newline at end of file
diff --git a/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt.after b/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt.after
index 42e08c14466..3cd783ad4e3 100644
--- a/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt.after
+++ b/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt.after
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: Int, p2: Int)" "true"
+// "Add constructor parameters from Base(Int, Int)" "true"
 open class Base(p1: Int, val p2: Int)
 
 class C private (p1: Int, p2: Int) : Base<caret>(p1, p2)
\ No newline at end of file
diff --git a/idea/testData/quickfix/supertypeInitialization/keywordName.kt b/idea/testData/quickfix/supertypeInitialization/keywordName.kt
index ca6ea1beb63..33787873c52 100644
--- a/idea/testData/quickfix/supertypeInitialization/keywordName.kt
+++ b/idea/testData/quickfix/supertypeInitialization/keywordName.kt
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(`fun`: Int, `class`: Int)" "true"
+// "Add constructor parameters from Base(Int, Int)" "true"
 open class Base(`fun`: Int, val `class`: Int)
 
 class C : Base<caret>
\ No newline at end of file
diff --git a/idea/testData/quickfix/supertypeInitialization/keywordName.kt.after b/idea/testData/quickfix/supertypeInitialization/keywordName.kt.after
index 8ff145748c7..874480428be 100644
--- a/idea/testData/quickfix/supertypeInitialization/keywordName.kt.after
+++ b/idea/testData/quickfix/supertypeInitialization/keywordName.kt.after
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(`fun`: Int, `class`: Int)" "true"
+// "Add constructor parameters from Base(Int, Int)" "true"
 open class Base(`fun`: Int, val `class`: Int)
 
 class C(`fun`: Int, `class`: Int) : Base(`fun`, `class`)
\ No newline at end of file
diff --git a/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt b/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt
index 56709f1a093..e51f67afa26 100644
--- a/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt
+++ b/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(s: String)" "true"
+// "Add constructor parameters from Base(String)" "true"
 open class Base private(p1: Int, val p2: Int) {
     private constructor() : this(0, 1)
     protected constructor(s: String) : this(s.length(), 1)
diff --git a/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt.after b/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt.after
index 52653b22e61..56f567a4ef9 100644
--- a/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt.after
+++ b/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt.after
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(s: String)" "true"
+// "Add constructor parameters from Base(String)" "true"
 open class Base private(p1: Int, val p2: Int) {
     private constructor() : this(0, 1)
     protected constructor(s: String) : this(s.length(), 1)
diff --git a/idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt b/idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt
index d1a49e8e87c..83ad2618062 100644
--- a/idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt
+++ b/idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: Int, p2: Int, p3: Any, p4: String, p5: String)" "true"
+// "Add constructor parameters from Base(Int, Int, Any, String, String)" "true"
 // ERROR: Redeclaration: p4
 // ERROR: Redeclaration: p4
 // ERROR: Redeclaration: p4
diff --git a/idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt.after b/idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt.after
index 852e6182757..42785289ea2 100644
--- a/idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt.after
+++ b/idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt.after
@@ -1,4 +1,4 @@
-// "Add constructor parameters from Base(p1: Int, p2: Int, p3: Any, p4: String, p5: String)" "true"
+// "Add constructor parameters from Base(Int, Int, Any, String, String)" "true"
 // ERROR: Redeclaration: p4
 // ERROR: Redeclaration: p4
 // ERROR: Redeclaration: p4