Update SwiftLanguageService.swift

Author: kimdv

Sources/SourceKitLSP/Swift/DocumentFormatting.swift

@@ -106,10 +106,10 @@ private func edits(from original: DocumentSnapshot, to edited: String) -> [TextE
     switch change {
     case .insert(offset: let offset, element: let element, associatedWith: _):
       let absolutePosition = AbsolutePosition(utf8Offset: offset)
-      return IncrementalEdit(range: absolutePosition..<absolutePosition, replacement: [element])
+      return SourceEdit(range: absolutePosition..<absolutePosition, replacement: [element])
     case .remove(offset: let offset, element: _, associatedWith: _):
       let absolutePosition = AbsolutePosition(utf8Offset: offset)
-      return IncrementalEdit(range: absolutePosition..<absolutePosition.advanced(by: 1), replacement: [])
+      return SourceEdit(range: absolutePosition..<absolutePosition.advanced(by: 1), replacement: [])
     }
   }
 
@@ -118,9 +118,9 @@ 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 { (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 {
+    let (startLine, startColumn) = original.lineTable.lineAndUTF16ColumnOf(utf8Offset: edit.range.lowerBound.utf8Offset)
+    let (endLine, endColumn) = original.lineTable.lineAndUTF16ColumnOf(utf8Offset: edit.range.upperBound.utf8Offset)
+    guard let newText = String(bytes: edit.replacementBytes, encoding: .utf8) else {
       logger.fault("Failed to get String from UTF-8 bytes \(edit.replacement)")
       return nil
     }

Sources/SourceKitLSP/Swift/SemanticTokens.swift

@@ -110,7 +110,10 @@ extension SyntaxClassifiedRange {
       return SyntaxHighlightingTokens(tokens: [])
     }
 
-    let multiLineRange = snapshot.positionOf(utf8Offset: self.offset)..<snapshot.positionOf(utf8Offset: self.endOffset)
+    let multiLineRange =
+      snapshot.positionOf(
+        utf8Offset: range.lowerBound.utf8Offset
+      )..<snapshot.positionOf(utf8Offset: range.upperBound.utf8Offset)
     let ranges = multiLineRange.splitToSingleLineRanges(in: snapshot)
 
     let tokens = ranges.map {

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.length.utf8Length,
+        keys.length: edit.range.length.utf8Length,
         keys.sourceText: edit.replacement,
       ])
       do {
@@ -554,10 +554,11 @@ extension SwiftLanguageService {
 
     let concurrentEdits = ConcurrentEdits(
       fromSequential: edits.map {
-        IncrementalEdit(
-          offset: $0.range.lowerBound.utf8Offset,
-          length: $0.length.utf8Length,
-          replacementLength: $0.replacement.utf8.count
+        SourceEdit(
+          range: AbsolutePosition(
+            utf8Offset: $0.range.lowerBound.utf8Offset
+          )..<AbsolutePosition(utf8Offset: $0.range.lowerBound.utf8Offset + $0.range.length.utf8Length),
+          replacement: $0.replacement
         )
       }
     )