Merge pull request #1230 from ahoppen/no-noop-rename-edits

Don’t report no-op rename edits

Author: ahoppen

Sources/SourceKitLSP/Rename.swift

@@ -817,6 +817,7 @@ extension SourceKitLSPServer {
             newName: newName
           )
         }
+        edits = edits.filter { !$0.isNoOp(in: snapshot) }
         return (uri, edits)
       }.compactMap { $0 }
     for (uri, editsForUri) in urisAndEdits {
@@ -1116,7 +1117,11 @@ extension SwiftLanguageService {
         )
       }
     }
+    edits = edits.filter { !$0.isNoOp(in: snapshot) }
 
+    if edits.isEmpty {
+      return (edits: WorkspaceEdit(changes: [:]), usr: usr)
+    }
     return (edits: WorkspaceEdit(changes: [snapshot.uri: edits]), usr: usr)
   }
 
@@ -1485,3 +1490,13 @@ fileprivate extension RelatedIdentifiersResponse {
     }
   }
 }
+
+fileprivate extension TextEdit {
+  /// Returns `true` the replaced text is the same as the new text
+  func isNoOp(in snapshot: DocumentSnapshot) -> Bool {
+    if snapshot.text[snapshot.indexRange(of: range)] == newText {
+      return true
+    }
+    return false
+  }
+}

Tests/SourceKitLSPTests/RenameTests.swift

@@ -1236,4 +1236,26 @@ final class RenameTests: XCTestCase {
         """
     )
   }
+
+  func testRenameDoesNotReportEditsIfNoActualChangeIsMade() async throws {
+    try await SkipUnless.sourcekitdSupportsRename()
+    let project = try await SwiftPMTestProject(
+      files: [
+        "FileA.swift": """
+        func 1️⃣foo(x: Int) {}
+        """,
+        "FileB.swift": """
+        func test() {
+          foo(x: 1)
+        }
+        """,
+      ],
+      build: true
+    )
+    let (uri, positions) = try project.openDocument("FileA.swift")
+    let result = try await project.testClient.send(
+      RenameRequest(textDocument: TextDocumentIdentifier(uri), position: positions["1️⃣"], newName: "foo(x:)")
+    )
+    XCTAssertEqual(result?.changes, [:])
+  }
 }