Quickfix to correct signature of method with 'override' to not include 'override' in signature text

idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java

@@ -50,9 +50,8 @@ import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
 public class JetChangeFunctionSignatureAction implements QuestionAction {
     public static final DescriptorRenderer SIGNATURE_RENDERER = new DescriptorRendererBuilder()
             .setWithDefinedIn(false)
-            .setModifiers(DescriptorRenderer.Modifier.OVERRIDE)
+            .setModifiers()
             .setShortNames(true)
-            .setOverrideRenderingPolicy(DescriptorRenderer.OverrideRenderingPolicy.RENDER_OVERRIDE)
             .setUnitReturnType(false).build();
 
     private final Project project;

idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java

@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.plugin.quickfix;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Queues;
@@ -112,13 +114,20 @@ public class ChangeMemberFunctionSignatureFix extends JetHintAction<JetNamedFunc
         FunctionDescriptor functionDescriptor = context.get(BindingContext.FUNCTION, functionElement);
         if (functionDescriptor == null) return Lists.newArrayList();
         List<FunctionDescriptor> superFunctions = getPossibleSuperFunctionsDescriptors(functionDescriptor);
-        Map<String, FunctionDescriptor> possibleSignatures = Maps.newHashMap();
+        final Map<String, FunctionDescriptor> possibleSignatures = Maps.newHashMap();
         for (FunctionDescriptor superFunction : superFunctions) {
             if (!superFunction.getKind().isReal()) continue;
             FunctionDescriptor signature = changeSignatureToMatch(functionDescriptor, superFunction);
             possibleSignatures.put(getFunctionSignatureString(signature), signature);
         }
-        return Lists.newArrayList(possibleSignatures.values());
+        List<String> keys = new ArrayList<String>(possibleSignatures.keySet());
+        Collections.sort(keys);
+        return new ArrayList<FunctionDescriptor>(Collections2.transform(keys, new Function<String, FunctionDescriptor>() {
+            @Override
+            public FunctionDescriptor apply(String key) {
+                return possibleSignatures.get(key);
+            }
+        }));
     }
 
     /**

idea/testData/quickfix/override/nothingToOverride/afterAddParameter.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/afterAddParameterGenericClass.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int, x: T)'" "true"
+// "Change function signature to 'fun f(a: Int, x: T)'" "true"
 trait A<R> {
     fun f(a: Int, b: R)
 }

idea/testData/quickfix/override/nothingToOverride/afterAddParameterPreserveVisibility.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertraits.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertypes.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 open class A {
     open fun f(a: Int) {}
 }

idea/testData/quickfix/override/nothingToOverride/afterChangeParameterType.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 open class A {
     open fun f(a: Int) {}
 }

idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeAbstractSuperclass.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 abstract class A {
     abstract fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeInTrait.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeMatchNames.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(x: Int, t: String, z: Double)'" "true"
+// "Change function signature to 'fun f(x: Int, t: String, z: Double)'" "true"
 open class A {
     open fun f(x: Int, y: String, z: Double) {}
 }

idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeModifyOrder.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(y: Int, x: String)'" "true"
+// "Change function signature to 'fun f(y: Int, x: String)'" "true"
 open class A {
     open fun f(a: Int, b: String) {}
 }

idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeOpenOverride.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 open class A {
     open fun f() {}
 }

idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSingleExpressionFunction.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int): Int'" "true"
+// "Change function signature to 'fun f(a: Int): Int'" "true"
 open class A {
     open fun f(a: Int): Int {
         return 0

idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSuperTrait.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/afterChangeReturnType.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int): Int'" "true"
+// "Change function signature to 'fun f(a: Int): Int'" "true"
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
 open class A {
     open fun f(a: Int): Int = 0

idea/testData/quickfix/override/nothingToOverride/afterDoNotLooseAnnotations.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 annotation class annon
 
 open class A {

idea/testData/quickfix/override/nothingToOverride/afterOverrideJavaMethod.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun next(p0: Int): Int'" "true"
+// "Change function signature to 'fun next(p0: Int): Int'" "true"
 import java.util.Random
 
 class MyRandom : Random() {

idea/testData/quickfix/override/nothingToOverride/afterRemoveParameter.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 trait A {
     fun f()
 }

idea/testData/quickfix/override/nothingToOverride/afterRemoveParameterTwoTraits.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 trait A {
     fun f()
 }

idea/testData/quickfix/override/nothingToOverride/afterSwapParametersGenericClass.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(y: S, x: List<Set<R>>)'" "true"
+// "Change function signature to 'fun f(y: S, x: List<Set<R>>)'" "true"
 trait A<P,Q> {
     fun f(a: Q, b: List<Set<P>>)
 }

idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int, x: T)'" "true"
+// "Change function signature to 'fun f(a: Int, x: T)'" "true"
 trait A<R> {
     fun f(a: Int, b: R)
 }

idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 open class A {
     open fun f(a: Int) {}
 }

idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 open class A {
     open fun f(a: Int) {}
 }

idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 abstract class A {
     abstract fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(x: Int, t: String, z: Double)'" "true"
+// "Change function signature to 'fun f(x: Int, t: String, z: Double)'" "true"
 open class A {
     open fun f(x: Int, y: String, z: Double) {}
 }

idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(y: Int, x: String)'" "true"
+// "Change function signature to 'fun f(y: Int, x: String)'" "true"
 open class A {
     open fun f(a: Int, b: String) {}
 }

idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 open class A {
     open fun f() {}
 }

idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int): Int'" "true"
+// "Change function signature to 'fun f(a: Int): Int'" "true"
 open class A {
     open fun f(a: Int): Int {
         return 0

idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }

idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int): Int'" "true"
+// "Change function signature to 'fun f(a: Int): Int'" "true"
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
 open class A {
     open fun f(a: Int): Int = 0

idea/testData/quickfix/override/nothingToOverride/beforeDoNotLooseAnnotations.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 annotation class annon
 
 open class A {

idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun next(p0: Int): Int'" "true"
+// "Change function signature to 'fun next(p0: Int): Int'" "true"
 import java.util.Random
 
 class MyRandom : Random() {

idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 trait A {
     fun f()
 }

idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 trait A {
     fun f()
 }

idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(y: S, x: List<Set<R>>)'" "true"
+// "Change function signature to 'fun f(y: S, x: List<Set<R>>)'" "true"
 trait A<P,Q> {
     fun f(a: Q, b: List<Set<P>>)
 }

idea/testData/quickfix/override/nothingToOverride/import.after.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: A)'" "true"
+// "Change function signature to 'fun f(a: A)'" "true"
 // ERROR: 'f' overrides nothing
 import a.B
 import a.A

idea/testData/quickfix/override/nothingToOverride/import.before.Main.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: A)'" "true"
+// "Change function signature to 'fun f(a: A)'" "true"
 // ERROR: 'f' overrides nothing
 import a.B
 

idea/testData/quickfix/override/nothingToOverride/twoPackages.after.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: A)'" "true"
+// "Change function signature to 'fun f(a: A)'" "true"
 // ERROR: 'f' overrides nothing
 import a.B
 class A {}

idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Main.kt

@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: A)'" "true"
+// "Change function signature to 'fun f(a: A)'" "true"
 // ERROR: 'f' overrides nothing
 import a.B
 class A {}