Update the code per comments

Simplify the test

Move the SourceEdit.swift from module SwiftDiagnostics to module SwiftSyntax

Add copyright to new files

Author: joehsieh

Sources/SwiftDiagnostics/FixIt.swift

@@ -51,25 +51,21 @@ public extension FixIt {
   var edits: [SourceEdit] {
     var existingEdits = [SourceEdit]()
     for change in changes {
-      let edit = edit(from: change)
-      var isOverlapping = false
-      for existingEdit in existingEdits {
+      let edit = SourceEdit.edit(from: change)
+      let isOverlapping = existingEdits.contains { edit.range.overlaps($0.range) }
+      if !isOverlapping {
         // The edit overlaps with the previous edit. We can't apply both
         // without conflicts. Apply the one that's listed first and drop the
         // later edit.
-        if edit.range.overlaps(existingEdit.range) {
-          isOverlapping = true
-          break
-        }
-      }
-      if !isOverlapping {
         existingEdits.append(edit)
       }
     }
     return existingEdits
   }
+}
 
-  private func edit(from change: Change) -> SourceEdit {
+private extension SourceEdit {
+  static func edit(from change: FixIt.Change) -> SourceEdit {
     switch change {
       case .replace(let oldNode, let newNode):
         return SourceEdit(

Sources/SwiftRefactor/RefactoringProvider.swift

@@ -11,10 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftSyntax
-import SwiftDiagnostics
-
-@available(*, deprecated, message: "SourceEdit has been moved to the SwiftDiagnostics module")
-public typealias SourceEdit = SwiftDiagnostics.SourceEdit
 
 /// A refactoring expressed as textual edits on the original syntax tree. In
 /// general clients should prefer `SyntaxRefactoringProvider` where possible.

Sources/SwiftDiagnostics/SourceEdit.swift renamed to Sources/SwiftSyntax/SourceEdit.swift

@@ -1,4 +1,14 @@
-import SwiftSyntax
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
 
 /// A textual edit to the original source represented by a range and a
 /// replacement.

Tests/SwiftDiagnosticsTest/FixItTests.swift

@@ -1,37 +1,42 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
 import SwiftParser
 import SwiftParserDiagnostics
 import SwiftSyntax
 import XCTest
 import _SwiftSyntaxTestSupport
 
 final class FixItTests: XCTestCase {
-  func testEditsForFixIt() {
-    let testCases: [[(range: Range<Int>, replacement: String)]] = [
-        [(9..<15, "Multiident "), (15..<21, "")],
-        [(9..<15, "MultiIdent "), (15..<21, "")]
-      ]
+  func testEditsForFixIt() throws {
+    let markedSource = "protocol 0️⃣Multi 1️⃣ident 2️⃣{}"
+    let (markers, source) = extractMarkers(markedSource)
+    let positions = ["0️⃣", "1️⃣", "2️⃣"].compactMap { markers[$0] }
+    XCTAssertEqual(positions.count, 3)
 
-    let markedSource = "protocol Multi 1️⃣ident {}"
-    let (_, source) = extractMarkers(markedSource)
+    let expectedEdits = [
+      SourceEdit(range: AbsolutePosition(utf8Offset: positions[0]) ..< AbsolutePosition(utf8Offset: positions[1]), replacement: "Multiident "),
+      SourceEdit(range: AbsolutePosition(utf8Offset: positions[1]) ..< AbsolutePosition(utf8Offset: positions[2]), replacement: "")
+    ]
     let tree = Parser.parse(source: source)
     let diags = ParseDiagnosticsGenerator.diagnostics(for: tree)
     XCTAssertEqual(diags.count, 1)
-    let diag = diags.first!
+    let diag = try XCTUnwrap(diags.first)
     XCTAssertEqual(diag.fixIts.count, 2)
-
-    for i in 0..<diag.fixIts.count {
-      let fixIt = diag.fixIts[i]
-      let changes = fixIt.changes
-      let edits = fixIt.edits
-      XCTAssertNotEqual(changes.count, edits.count)
-      let expctedEdits = testCases[i]
-      XCTAssertEqual(expctedEdits.count, edits.count)
-      for j in 0..<edits.count {
-        let edit = edits[j]
-        let expectedEdit = expctedEdits[j]
-        XCTAssertEqual(edit.range, AbsolutePosition(utf8Offset: expectedEdit.range.lowerBound)..<AbsolutePosition(utf8Offset: expectedEdit.range.upperBound))
-        XCTAssertEqual(edit.replacement, expectedEdit.replacement)
-      }
-    }
+    
+    let fixIt = try XCTUnwrap(diag.fixIts.first)
+    let changes = fixIt.changes
+    let edits = fixIt.edits
+    XCTAssertNotEqual(changes.count, edits.count)
+    XCTAssertEqual(expectedEdits, edits)
   }
 }