[FixCode] Follow-up for b4a2b53, ignore another diagnostic fixit that is messing with argument labels.

Author: akyrtzi

lib/FrontendTool/FrontendTool.cpp

@@ -560,7 +560,8 @@ class JSONFixitWriter : public DiagnosticConsumer {
     // The following interact badly with the swift migrator, they are undoing
     // migration of arguments to preserve the no-label for first argument.
     if (Info.ID == diag::witness_argument_name_mismatch.ID ||
-      Info.ID == diag::missing_argument_labels.ID)
+      Info.ID == diag::missing_argument_labels.ID ||
+      Info.ID == diag::override_argument_name_mismatch.ID)
       return false;
 
     if (Kind == DiagnosticKind::Error)

test/FixCode/fixits-apply.swift

@@ -86,5 +86,8 @@ class Test2 : SomeProt {
   func instMeth(p: Int) {}
   func instMeth2(p: Int, p2: Int) {}
 }
+class SubTest2 : Test2 {
+  override func instMeth(_ p: Int) {}
+}
 Test2().instMeth(0)
 Test2().instMeth2(0, p2:1)

test/FixCode/fixits-apply.swift.result

@@ -89,5 +89,8 @@ class Test2 : SomeProt {
   func instMeth(p: Int) {}
   func instMeth2(p: Int, p2: Int) {}
 }
+class SubTest2 : Test2 {
+  override func instMeth(_ p: Int) {}
+}
 Test2().instMeth(0)
 Test2().instMeth2(0, p2:1)