DiagnosticVerifier: Don't render a range if the lines and columns match

Author: AnthonyLatsis

lib/Frontend/DiagnosticVerifier.cpp

@@ -317,11 +317,14 @@ DiagnosticVerifier::renderFixits(ArrayRef<CapturedFixItInfo> ActualFixIts,
           OS << ActualRange.StartLine << ':';
         OS << ActualRange.StartCol;
 
-        OS << '-';
+        const bool isMultiline = ActualRange.StartLine != ActualRange.EndLine;
+        if (isMultiline || ActualRange.StartCol != ActualRange.EndCol) {
+          OS << '-';
 
-        if (ActualRange.EndLine != ActualRange.StartLine)
-          OS << ActualRange.EndLine << ':';
-        OS << ActualRange.EndCol;
+          if (isMultiline)
+            OS << ActualRange.EndLine << ':';
+          OS << ActualRange.EndCol;
+        }
 
         OS << '=';
 

test/FixCode/verify-fixits.swift.result

@@ -5,7 +5,7 @@
 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 }} {{none}}
+  guard true { return } // expected-error {{expected 'else' after 'guard' condition}} {{14=else }} {{none}}
 }
 
 func labeledFunc(aa: Int, bb: Int) {}

test/Frontend/verify-fixits.swift

@@ -274,6 +274,6 @@ func testFixitWithLocation(_: inout Bool) {
   // CHECK-NOT: [[@LINE+1]]:{{[0-9]+}}: error:
   testFixitWithLocation(bool) // expected-error {{passing value of type 'Bool' to an inout parameter requires explicit '&'}} {{25-25=&}}
 
-  // CHECK: [[@LINE+1]]:126: error: expected fix-it not seen; actual fix-it seen: {{{{}}25-25=&}}
+  // CHECK: [[@LINE+1]]:126: error: expected fix-it not seen; actual fix-it seen: {{{{}}25=&}}
   testFixitWithLocation(bool) // expected-error {{passing value of type 'Bool' to an inout parameter requires explicit '&'}} {{24-24=&}}
 }

test/diagnostics/verifier.swift

@@ -16,12 +16,12 @@ let y: Int = "hello, world!" // expected-error@:49 {{cannot convert value of typ
 // Wrong fix-it
 let z: Int = "hello, world!" as Any
 // expected-error@-1 {{cannot convert value of type}} {{3-3=foobarbaz}}
-// CHECK: expected fix-it not seen; actual fix-it seen: {{[{][{]}}36-36= as! Int{{[}][}]}}
+// CHECK: expected fix-it not seen; actual fix-it seen: {{[{][{]}}36= as! Int{{[}][}]}}
 
 // Expected no fix-it
 let a: Bool = "hello, world!" as Any
 // expected-error@-1 {{cannot convert value of type}} {{none}}
-// CHECK: expected no fix-its; actual fix-it seen: {{[{][{]}}37-37= as! Bool{{[}][}]}}
+// CHECK: expected no fix-its; actual fix-it seen: {{[{][{]}}37= as! Bool{{[}][}]}}
 
 // Unexpected error
 _ = foo()