Also print the position of error/warning associated with a note

Author: nkcsgexi

Sources/SwiftSyntax/Diagnostic.swift

@@ -170,14 +170,11 @@ public struct Diagnostic: Codable, CustomDebugStringConvertible {
 
   public var debugDescription: String {
     var lines: [String] = []
-    if let location = location {
-      lines.append("\(location) \(message.debugDescription)")
-    } else {
-      lines.append("\(message.debugDescription)")
-    }
+    let loc = location == nil ? "" : "\(location!) "
+    lines.append("\(loc)\(message.debugDescription)")
     fixIts.forEach { lines.append("\($0.debugDescription)") }
-    highlights.forEach { lines.append("Hightlight: \($0.debugDescription)") }
-    lines.append(contentsOf: notes.map({$0.asDiagnostic().debugDescription}))
+    highlights.forEach { lines.append("Highlight: \($0.debugDescription)") }
+    lines.append(contentsOf: notes.map({ loc + $0.asDiagnostic().debugDescription}))
     return lines.joined(separator: "\n")
   }
 

lit_tests/parser-diags.swift

@@ -8,7 +8,7 @@ let number⁚ Int
 // CHECK-NEXT: [[@LINE+2]]:3 error: invalid character in source file
 // CHECK-NEXT: Fixit: ([[@LINE+1]]:3,[[@LINE+1]]:6) Text: " "
 5 ‒ 5
-// CHECK-NEXT: [[@LINE-1]]:3 note: unicode character '‒' looks similar to '-'; did you mean to use '-'?
+// CHECK-NEXT: [[@LINE-1]]:3 [[@LINE-1]]:3 note: unicode character '‒' looks similar to '-'; did you mean to use '-'?
 // CHECK-NEXT: Fixit: ([[@LINE-2]]:3,[[@LINE-2]]:6) Text: "-"
 // CHECK-NEXT: [[@LINE-3]]:2 error: consecutive statements on a line must be separated by ';'
 // CHECK-NEXT: Fixit: ([[@LINE-4]]:2,[[@LINE-4]]:2) Text: ";"
@@ -20,7 +20,7 @@ if (true ꝸꝸꝸ false) {}
 if (5 ‒ 5) == 0 {}
 // CHECK-NEXT: [[@LINE-1]]:7 error: invalid character in source file
 // CHECK-NEXT: Fixit: ([[@LINE-2]]:7,[[@LINE-2]]:10) Text: " "
-// CHECK-NEXT: [[@LINE-3]]:7 note: unicode character '‒' looks similar to '-'; did you mean to use '-'?
+// CHECK-NEXT: [[@LINE-3]]:7 [[@LINE-3]]:7 note: unicode character '‒' looks similar to '-'; did you mean to use '-'?
 // CHECK-NEXT: Fixit: ([[@LINE-4]]:7,[[@LINE-4]]:10) Text: "-"
 // CHECK-NEXT: [[@LINE-5]]:11 error: expected ',' separator
 // CHECK-NEXT: Fixit: ([[@LINE-6]]:6,[[@LINE-6]]:6) Text: ","