[DiagnosticBridge] NFC: Refactor addQueuedDiagnostic to use BridgedCharSourceRange for diagnostic highlights

Author: xedin

include/swift/Bridging/ASTGen.h

@@ -32,7 +32,7 @@ void swift_ASTGen_addQueuedDiagnostic(
     BridgedSourceLoc sourceLoc,
     BridgedStringRef categoryName,
     BridgedStringRef documentationPath,
-    const void *_Nullable *_Nullable highlightRanges,
+    const BridgedCharSourceRange *_Nullable highlightRanges,
     ptrdiff_t numHighlightRanges);
 void swift_ASTGen_renderQueuedDiagnostics(
     void *_Nonnull queued, ssize_t contextSize, ssize_t colorize,

lib/AST/DiagnosticBridge.cpp

@@ -56,13 +56,10 @@ static void addQueueDiagnostic(void *queuedDiagnostics,
   }
 
   // Map the highlight ranges.
-  SmallVector<const void *, 2> highlightRanges;
+  SmallVector<BridgedCharSourceRange, 2> highlightRanges;
   for (const auto &range : info.Ranges) {
-    if (range.isInvalid())
-      continue;
-
-    highlightRanges.push_back(range.getStart().getOpaquePointerValue());
-    highlightRanges.push_back(range.getEnd().getOpaquePointerValue());
+    if (range.isValid())
+      highlightRanges.push_back(range);
   }
 
   StringRef documentationPath;
@@ -76,7 +73,7 @@ static void addQueueDiagnostic(void *queuedDiagnostics,
                                    info.Category,
                                    documentationPath,
                                    highlightRanges.data(),
-                                   highlightRanges.size() / 2);
+                                   highlightRanges.size());
 
   // TODO: A better way to do this would be to pass the notes as an
   // argument to `swift_ASTGen_addQueuedDiagnostic` but that requires

lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift

@@ -246,7 +246,7 @@ public func addQueuedDiagnostic(
   cLoc: BridgedSourceLoc,
   categoryName: BridgedStringRef,
   documentationPath: BridgedStringRef,
-  highlightRangesPtr: UnsafePointer<BridgedSourceLoc>?,
+  highlightRangesPtr: UnsafePointer<BridgedCharSourceRange>?,
   numHighlightRanges: Int
 ) {
   let queuedDiagnostics = queuedDiagnosticsPtr.assumingMemoryBound(
@@ -299,14 +299,16 @@ public func addQueuedDiagnostic(
 
   // Map the highlights.
   var highlights: [Syntax] = []
-  let highlightRanges = UnsafeBufferPointer<BridgedSourceLoc>(
+  let highlightRanges = UnsafeBufferPointer<BridgedCharSourceRange>(
     start: highlightRangesPtr,
-    count: numHighlightRanges * 2
+    count: numHighlightRanges
   )
   for index in 0..<numHighlightRanges {
+    let range = highlightRanges[index]
+
     // Make sure both the start and the end land within this source file.
-    guard let start = highlightRanges[index * 2].getOpaquePointerValue(),
-      let end = highlightRanges[index * 2 + 1].getOpaquePointerValue()
+    guard let start = range.start.getOpaquePointerValue(),
+      let end = range.start.advanced(by: range.byteLength).getOpaquePointerValue()
     else {
       continue
     }