Merge pull request #993 from ahoppen/ahoppen/global-rename

Author: ahoppen

Sources/SKSupport/CMakeLists.txt

@@ -4,6 +4,7 @@ add_library(SKSupport STATIC
   AsyncUtils.swift
   BuildConfiguration.swift
   ByteString.swift
+  Collection+Only.swift
   Connection+Send.swift
   dlopen.swift
   FileSystem.swift

Sources/SKSupport/Collection+Only.swift

@@ -0,0 +1,22 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+public extension Collection {
+  /// If the collection contains a single element, return it, otherwise `nil`.
+  var only: Element? {
+    if !isEmpty && index(after: startIndex) == endIndex {
+      return self.first!
+    } else {
+      return nil
+    }
+  }
+}

Sources/SKTestSupport/TestSourceKitLSPClient.swift

@@ -336,6 +336,11 @@ public struct DocumentPositions {
     }
     return position
   }
+
+  /// Returns all position makers within these `DocumentPositions`.
+  public var allMarkers: [String] {
+    return positions.keys.sorted()
+  }
 }
 
 // MARK: - WeakMessageHelper

Sources/SourceKitD/SKDRequestArray.swift

@@ -40,6 +40,12 @@ public final class SKDRequestArray {
   public func append(_ value: SKDRequestDictionary) {
     sourcekitd.api.request_array_set_value(array, -1, value.dict)
   }
+
+  public static func += (array: SKDRequestArray, other: some Sequence<SKDRequestDictionary>) {
+    for item in other {
+      array.append(item)
+    }
+  }
 }
 
 extension SKDRequestArray: CustomStringConvertible {

Sources/SourceKitLSP/CMakeLists.txt

@@ -4,6 +4,7 @@ add_library(SourceKitLSP STATIC
   DocumentManager.swift
   IndexStoreDB+MainFilesProvider.swift
   ResponseError+Init.swift
+  Rename.swift
   Sequence+AsyncMap.swift
   SourceKitIndexDelegate.swift
   SourceKitLSPCommandMetadata.swift
@@ -25,7 +26,6 @@ target_sources(SourceKitLSP PRIVATE
   Swift/EditorPlaceholder.swift
   Swift/OpenInterface.swift
   Swift/RelatedIdentifiers.swift
-  Swift/Rename.swift
   Swift/SemanticRefactorCommand.swift
   Swift/SemanticRefactoring.swift
   Swift/SemanticTokens.swift

Sources/SourceKitLSP/Clang/ClangLanguageServer.swift

@@ -597,10 +597,6 @@ extension ClangLanguageServerShim {
   func executeCommand(_ req: ExecuteCommandRequest) async throws -> LSPAny? {
     return try await forwardRequestToClangd(req)
   }
-
-  func rename(_ request: RenameRequest) async throws -> WorkspaceEdit? {
-    return try await forwardRequestToClangd(request)
-  }
 }
 
 /// Clang build settings derived from a `FileBuildSettingsChange`.