Allow rename when the new name is missing the ) or if it has text after )

Author: ahoppen

Sources/SourceKitLSP/Rename.swift

@@ -25,18 +25,6 @@ import SourceKitD
 ///  - `foo(_:b:)`
 ///  - `foo` if no argument labels are specified, eg. for a variable.
 fileprivate struct CompoundDeclName {
-  enum CompoundDeclNameParsingError: Error, CustomStringConvertible {
-    case missingClosingParenthesis
-    case closingParenthesisNotAtEnd
-
-    var description: String {
-      switch self {
-      case .missingClosingParenthesis: "Name contains '(' but no matching ')'"
-      case .closingParenthesisNotAtEnd: "Additional text after ')'"
-      }
-    }
-  }
-
   /// The parameter of a compound decl name, which can either be the parameter's name or `_` to indicate that the
   /// parameter is unnamed.
   enum Parameter: Equatable {
@@ -62,20 +50,15 @@ fileprivate struct CompoundDeclName {
   let parameters: [Parameter]
 
   /// Parse a compound decl name into its base names and parameters.
-  init(_ compoundDeclName: String) throws {
+  init(_ compoundDeclName: String) {
     guard let openParen = compoundDeclName.firstIndex(of: "(") else {
       // We don't have a compound name. Everything is the base name
       self.baseName = compoundDeclName
       self.parameters = []
       return
     }
     self.baseName = String(compoundDeclName[..<openParen])
-    guard let closeParen = compoundDeclName.firstIndex(of: ")") else {
-      throw CompoundDeclNameParsingError.missingClosingParenthesis
-    }
-    guard compoundDeclName.index(after: closeParen) == compoundDeclName.endIndex else {
-      throw CompoundDeclNameParsingError.closingParenthesisNotAtEnd
-    }
+    let closeParen = compoundDeclName.firstIndex(of: ")") ?? compoundDeclName.endIndex
     let parametersText = compoundDeclName[compoundDeclName.index(after: openParen)..<closeParen]
     // Split by `:` to get the parameter names. Drop the last element so that we don't have a trailing empty element
     // after the last `:`.
@@ -549,8 +532,8 @@ extension SwiftLanguageServer {
       oldName: oldNameString,
       in: snapshot
     )
-    let oldName = try CompoundDeclName(oldNameString)
-    let newName = try CompoundDeclName(newNameString)
+    let oldName = CompoundDeclName(oldNameString)
+    let newName = CompoundDeclName(newNameString)
 
     try Task.checkCancellation()
 

Tests/SourceKitLSPTests/RenameTests.swift

@@ -366,40 +366,32 @@ final class RenameTests: XCTestCase {
     )
   }
 
-  func testErrorIfNewNameDoesntContainClosingParenthesis() async throws {
-    let testClient = try await TestSourceKitLSPClient()
-    let uri = DocumentURI.for(.swift)
-    let positions = testClient.openDocument(
+  func testNewNameDoesntContainClosingParenthesis() async throws {
+    try await assertSingleFileRename(
       """
       func 1️⃣foo(a: Int) {}
       2️⃣foo(a: 1)
       """,
-      uri: uri
-    )
-    let request = RenameRequest(
-      textDocument: TextDocumentIdentifier(uri),
-      position: positions["1️⃣"],
-      newName: "bar(x:"
+      newName: "bar(x:",
+      expected: """
+        func bar(x: Int) {}
+        bar(x: 1)
+        """
     )
-    await assertThrowsError(try await testClient.send(request))
   }
 
-  func testErrorIfNewNameContainsTextAfterParenthesis() async throws {
-    let testClient = try await TestSourceKitLSPClient()
-    let uri = DocumentURI.for(.swift)
-    let positions = testClient.openDocument(
+  func testNewNameContainsTextAfterParenthesis() async throws {
+    try await assertSingleFileRename(
       """
       func 1️⃣foo(a: Int) {}
       2️⃣foo(a: 1)
       """,
-      uri: uri
-    )
-    let request = RenameRequest(
-      textDocument: TextDocumentIdentifier(uri),
-      position: positions["1️⃣"],
-      newName: "bar(x:)other:"
+      newName: "bar(x:)other:",
+      expected: """
+        func bar(x: Int) {}
+        bar(x: 1)
+        """
     )
-    await assertThrowsError(try await testClient.send(request))
   }
 
   func testSpacesInNewParameterNames() async throws {