[FixCode] When picking-up fixits for migration ignore argument label fixits.

These interact badly with the swift migrator, they are undoing migration of arguments to preserve the no-label for first argument.

Author: akyrtzi

lib/FrontendTool/FrontendTool.cpp

@@ -557,6 +557,11 @@ class JSONFixitWriter : public DiagnosticConsumer {
     // Do not add a semi as it is wrong in most cases during migration
     if (Info.ID == diag::statement_same_line_without_semi.ID)
       return false;
+    // 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)
+      return false;
 
     if (Kind == DiagnosticKind::Error)
       return true;

test/FixCode/fixits-apply.swift

@@ -64,3 +64,15 @@ func ftest1() {
 }
 
 func ftest2(x x: Int -> Int) {}
+
+protocol SomeProt {
+  func protMeth(p: Int)
+}
+class Test2 : SomeProt {
+  func protMeth(_ p: Int)
+
+  func instMeth(p: Int)
+  func instMeth2(p: Int, p2: Int)
+}
+Test2().instMeth(0)
+Test2().instMeth2(0, p2:1)

test/FixCode/fixits-apply.swift.result

@@ -67,3 +67,15 @@ func ftest1() {
 }
 
 func ftest2(x: (Int) -> Int) {}
+
+protocol SomeProt {
+  func protMeth(p: Int)
+}
+class Test2 : SomeProt {
+  func protMeth(_ p: Int)
+
+  func instMeth(p: Int)
+  func instMeth2(p: Int, p2: Int)
+}
+Test2().instMeth(0)
+Test2().instMeth2(0, p2:1)