Merge pull request #30501 from omochi/fix-verify-range

[Diagnostics] Fix range of fix-its in verify mode

Author: omochi

lib/Frontend/DiagnosticVerifier.cpp

@@ -530,7 +530,7 @@ DiagnosticVerifier::verifyFile(unsigned BufferID, bool shouldAutoApplyFixes) {
       // fixit to add them in.
       auto actual = renderFixits(FoundDiagnostic.getFixIts(), InputFile);
       auto replStartLoc = SMLoc::getFromPointer(expected.ExpectedEnd - 8); // {{none}} length
-      auto replEndLoc = SMLoc::getFromPointer(expected.ExpectedEnd - 1);
+      auto replEndLoc = SMLoc::getFromPointer(expected.ExpectedEnd);
 
       llvm::SMFixIt fix(llvm::SMRange(replStartLoc, replEndLoc), actual);
       addError(replStartLoc.getPointer(), "expected no fix-its; actual fix-it seen: " + actual, fix);

test/FixCode/verify-fixits.swift

@@ -0,0 +1,9 @@
+// RUN: cp %s %t
+// RUN: not %swift -typecheck -target %target-triple -verify-apply-fixes %t
+// RUN: diff %t %s.result
+
+func f1() {
+  guard true { return } // expected-error {{...}}
+
+  guard true { return } // expected-error {{expected 'else' after 'guard' condition}} {{none}}
+}

test/FixCode/verify-fixits.swift.result

@@ -0,0 +1,9 @@
+// RUN: cp %s %t
+// RUN: not %swift -typecheck -target %target-triple -verify-apply-fixes %t
+// RUN: diff %t %s.result
+
+func f1() {
+  guard true { return } // expected-error {{expected 'else' after 'guard' condition}}
+
+  guard true { return } // expected-error {{expected 'else' after 'guard' condition}} {{14-14=else }}
+}