Revert "Replace IncrementalEdit with SourceEdit"

This reverts commit ed61630.

Author: ahoppen

Sources/SourceKitLSP/Swift/DocumentFormatting.swift

@@ -115,8 +115,18 @@ private func edits(from original: DocumentSnapshot, to edited: String) -> [TextE
 
   // Map the offset-based edits to line-column based edits to be consumed by LSP
 
-  return concurrentEdits.edits.compactMap {
-    TextEdit(range: original.absolutePositionRange(of: $0.range), newText: $0.replacement)
+  return concurrentEdits.edits.compactMap { (edit) -> TextEdit? in
+    let (startLine, startColumn) = original.lineTable.lineAndUTF16ColumnOf(utf8Offset: edit.offset)
+    let (endLine, endColumn) = original.lineTable.lineAndUTF16ColumnOf(utf8Offset: edit.endOffset)
+    guard let newText = String(bytes: edit.replacement, encoding: .utf8) else {
+      logger.fault("Failed to get String from UTF-8 bytes \(edit.replacement)")
+      return nil
+    }
+
+    return TextEdit(
+      range: Position(line: startLine, utf16index: startColumn)..<Position(line: endLine, utf16index: endColumn),
+      newText: newText
+    )
   }
 }
 

Sources/SourceKitLSP/Swift/SwiftLanguageService.swift

@@ -537,7 +537,7 @@ extension SwiftLanguageService {
         keys.enableDiagnostics: 0,
         keys.syntacticOnly: 1,
         keys.offset: edit.range.lowerBound.utf8Offset,
-        keys.length: edit.range.length.utf8Length,
+        keys.length: edit.length.utf8Length,
         keys.sourceText: edit.replacement,
       ])
       do {
@@ -553,7 +553,13 @@ extension SwiftLanguageService {
     }
 
     let concurrentEdits = ConcurrentEdits(
-      fromSequential: edits
+      fromSequential: edits.map {
+        IncrementalEdit(
+          offset: $0.range.lowerBound.utf8Offset,
+          length: $0.length.utf8Length,
+          replacementLength: $0.replacement.utf8.count
+        )
+      }
     )
     await syntaxTreeManager.registerEdit(
       preEditSnapshot: preEditSnapshot,