Merge pull request #16204 from rintaro/4.2-migrator-fixit-insert

[4.2][Migrator] Use RewriteBuffer::InsertText() for applying insertion

Author: rintaro

lib/Migrator/FixitApplyDiagnosticConsumer.cpp

@@ -55,15 +55,27 @@ handleDiagnostic(SourceManager &SM, SourceLoc Loc,
     auto Offset = SM.getLocOffsetInBuffer(Fixit.getRange().getStart(),
                                           ThisBufferID);
     auto Length = Fixit.getRange().getByteLength();
+    auto Text = Fixit.getText();
 
-    Replacement R { Offset, Length, Fixit.getText() };
+    // Ignore meaningless Fix-its.
+    if (Length == 0 && Text.size() == 0)
+      return;
+
+    // Ignore pre-applied equivalents.
+    Replacement R { Offset, Length, Text };
     if (Replacements.count(R)) {
       return;
     } else {
       Replacements.insert(R);
     }
 
-    RewriteBuf.ReplaceText(Offset, Length, Fixit.getText());
+    if (Length == 0) {
+      RewriteBuf.InsertText(Offset, Text);
+    } else if (Text.size() == 0) {
+      RewriteBuf.RemoveText(Offset, Length);
+    } else {
+      RewriteBuf.ReplaceText(Offset, Length, Text);
+    }
     ++NumFixitsApplied;
   }
 }

test/Migrator/insert_replace_fixit.swift

@@ -0,0 +1,14 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -update-code -primary-file %s -F %S/mock-sdk -emit-migrated-file-path %t/result.swift
+// RUN: diff -u %s.expected %t/result.swift
+
+import TestMyTime
+
+let zero = kMyTimeZero
+
+let _ = MyTimeAdd(kMyTimeZero, kMyTimeZero)
+let _ = MyTimeAdd(
+  kMyTimeZero, kMyTimeZero)
+let _ = MyTimeAdd(
+  kMyTimeZero,
+  kMyTimeZero)

test/Migrator/insert_replace_fixit.swift.expected

@@ -0,0 +1,14 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -update-code -primary-file %s -F %S/mock-sdk -emit-migrated-file-path %t/result.swift
+// RUN: diff -u %s.expected %t/result.swift
+
+import TestMyTime
+
+let zero = MyTime.z
+
+let _ = MyTime.add(this: MyTime.z, that: MyTime.z)
+let _ = MyTime.add(
+  this: MyTime.z, that: MyTime.z)
+let _ = MyTime.add(
+  this: MyTime.z,
+  that: MyTime.z)

test/Migrator/mock-sdk/TestMyTime.framework/Headers/MyTime.h

@@ -0,0 +1,8 @@
+
+typedef struct {
+	int value;
+} MyTime;
+
+extern const MyTime kMyTimeZero;
+
+extern MyTime MyTimeAdd(MyTime lhs, MyTime rhs);

test/Migrator/mock-sdk/TestMyTime.framework/Headers/TestMyTime.apinotes

@@ -0,0 +1,15 @@
+Name: TestMyTime
+Globals:
+- Name: kMyTimeZero
+  SwiftName: "MyTime.z"
+Functions:
+- Name: MyTimeAdd
+  SwiftName: "MyTime.add(this:that:)"
+SwiftVersions:
+- Version: 3
+  Globals:
+  - Name: kMyTimeZero
+    SwiftName: "kMyTimeZero"
+  Functions:
+  - Name: MyTimeAdd
+    SwiftName: "MyTimeAdd(_:_:)"

test/Migrator/mock-sdk/TestMyTime.framework/Headers/TestMyTime.h

@@ -0,0 +1,2 @@
+
+#include <TestMyTime/MyTime.h>

test/Migrator/mock-sdk/TestMyTime.framework/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module TestMyTime {
+  umbrella header "TestMyTime.h"
+
+  export *
+  module * { export * }
+}