Creates custom initializer for SourceEdit and removes redundent code

Author: mustiikhalil

Sources/SourceKitLSP/DocumentManager.swift

@@ -149,8 +149,7 @@ public final class DocumentManager {
   public func edit(
     _ uri: DocumentURI,
     newVersion: Int,
-    edits: [TextDocumentContentChangeEvent],
-    requiresUpcomingEdits: Bool = false
+    edits: [TextDocumentContentChangeEvent]
   ) throws -> (preEditSnapshot: DocumentSnapshot, postEditSnapshot: DocumentSnapshot, edits: [SourceEdit]) {
     return try queue.sync {
       guard let document = documents[uri] else {
@@ -160,9 +159,7 @@ public final class DocumentManager {
 
       var upcomingEdits: [SourceEdit] = []
       for edit in edits {
-        if requiresUpcomingEdits {
-          upcomingEdits.append(willEditDocument(document.latestLineTable, edit: edit))
-        }
+        upcomingEdits.append(SourceEdit(edit: edit, lineTableBeforeEdit: document.latestLineTable))
 
         if let range = edit.range {
           document.latestLineTable.replace(
@@ -195,34 +192,6 @@ public final class DocumentManager {
     }
   }
 
-  private func willEditDocument(_ before: LineTable, edit: TextDocumentContentChangeEvent) -> SourceEdit {
-    guard let range = edit.range else {
-      return SourceEdit(
-        range: Range(
-          uncheckedBounds: (
-            AbsolutePosition(utf8Offset: 0), 
-            upper: AbsolutePosition(utf8Offset: before.content.utf8.count)
-          )
-        ),
-        replacement: edit.text
-      )
-    }
-    guard let offset = before.utf8OffsetOf(line: range.lowerBound.line, utf16Column: range.lowerBound.utf16index),
-            let end = before.utf8OffsetOf(line: range.upperBound.line, utf16Column: range.upperBound.utf16index)
-    else {
-      fatalError("invalid edit \(range)")
-    }
-    return SourceEdit(
-      range: Range(
-        uncheckedBounds: (
-          AbsolutePosition(utf8Offset: offset),
-          upper: AbsolutePosition(utf8Offset: end)
-        )
-      ),
-      replacement: edit.text
-    )
-  }
-
 }
 
 extension DocumentManager {
@@ -249,16 +218,36 @@ extension DocumentManager {
   /// that logs on failure.
   @discardableResult
   func edit(
-    _ note: DidChangeTextDocumentNotification,
-    requiresUpcomingEdits: Bool = false
+    _ note: DidChangeTextDocumentNotification
   ) -> (preEditSnapshot: DocumentSnapshot, postEditSnapshot: DocumentSnapshot, edits: [SourceEdit])? {
     return orLog("failed to edit document", level: .error) {
       return try edit(
         note.textDocument.uri,
         newVersion: note.textDocument.version,
-        edits: note.contentChanges,
-        requiresUpcomingEdits: requiresUpcomingEdits
+        edits: note.contentChanges
+      )
+    }
+  }
+}
+
+fileprivate extension SourceEdit {
+
+  init(edit: TextDocumentContentChangeEvent, lineTableBeforeEdit: LineTable) {
+    if let range = edit.range {
+      guard let offset = lineTableBeforeEdit.utf8OffsetOf(line: range.lowerBound.line, utf16Column: range.lowerBound.utf16index),
+            let end = lineTableBeforeEdit.utf8OffsetOf(line: range.upperBound.line, utf16Column: range.upperBound.utf16index) else {
+        fatalError("invalid edit \(range)")
+      }
+      self.init(
+        range: AbsolutePosition(utf8Offset: offset)..<AbsolutePosition(utf8Offset: end),
+        replacement: edit.text
+      )
+    } else {
+      self.init(
+        range: AbsolutePosition(utf8Offset: 0)..<AbsolutePosition(utf8Offset: lineTableBeforeEdit.content.utf8.count),
+        replacement: edit.text
       )
     }
   }
+
 }

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

@@ -497,12 +497,10 @@ extension SwiftLanguageServer {
       let replacement: String
     }
 
-    let editResult = self.documentManager.edit(
-      note,
-      requiresUpcomingEdits: true
-    )
+    guard let (preEditSnapshot, postEditSnapshot, edits) = self.documentManager.edit(note) else {
+      return
+    }
 
-    let edits = editResult?.edits ?? []
     for edit in edits {
       let req = sourcekitd.dictionary([
         keys.request: self.requests.editorReplaceText,
@@ -522,9 +520,6 @@ extension SwiftLanguageServer {
       }
     }
 
-    guard let (preEditSnapshot, postEditSnapshot, _) = editResult else {
-      return
-    }
     let concurrentEdits = ConcurrentEdits(
       fromSequential: edits.map {
         IncrementalEdit(