Review

Author: rintaro

Contributor Documentation/LSP Extensions.md

@@ -396,7 +396,7 @@ New request that returns structured location information for a list of exact sym
 Unlike the standard `workspace/symbol` request (which accepts a fuzzy query string), this request takes exact names — typically obtained from `sourcekit/workspace/symbolNames` — and returns all index occurrences for each name across every workspace.
 
 For each name the response contains zero or more `WorkspaceSymbolItem` values:
-- Source-file symbols carry a `SymbolInformation` with a `file://` URI and the exact 0-based line/column.
+- Source-file symbols carry a `SymbolInformation` with a `file://` URI and the exact position.
 - SDK/stdlib symbols carry a `WorkspaceSymbol` with `location: .uri(...)` pointing at the `file://` URI of the `.swiftinterface` or `.swiftmodule` file, with the fully-qualified module name as a `?module=` query parameter. The symbol's USR is stored in `data["usr"]`. Call `workspaceSymbol/resolve` to obtain the exact `Location` within the generated interface. The client must advertise `workspace.symbol.resolveSupport`; without it, the raw `file://` URI is returned as `SymbolInformation` instead.
 
 Every requested name is present in the response as a flat array; items carry their name in the `name` field of the `SymbolInformation` or `WorkspaceSymbol`.

Documentation/Open Quickly.md

@@ -21,7 +21,7 @@ Given a list of names selected by the client after searching, returns structured
 
 The shape of each result item depends on the symbol's origin:
 
-**Source-file symbols** — returned as `SymbolInformation` with a `file://` URI and the exact 0-based line/column from the index.
+**Source-file symbols** — returned as `SymbolInformation` with a `file://` URI and the range from the index.
 
 ```
 → WorkspaceSymbolInfoRequest { names: ["MyViewController"] }
@@ -128,7 +128,7 @@ Client                                            Server
 
 1. **Discovery** — fetch all names; client filters locally.
 2. **Resolution** — send matching name(s) to populate the search result list; server returns symbol details (kind, container name, location) for display.
-   - Source symbols: `SymbolInformation` with a `file://` URI and exact 0-based line/column. No further steps required.
+   - Source symbols: `SymbolInformation` with a `file://` URI and exact position. No further steps required.
    - SDK/stdlib symbols: `WorkspaceSymbol` with `location: .uri(file:// URL?module=...)` pointing to the module file and the USR in `data["usr"]`, when the client advertises `workspace.symbol.resolveSupport`. Otherwise falls back to `SymbolInformation` with the raw `file://` URI.
 3. **Location resolution** — call `workspaceSymbol/resolve` with the selected `WorkspaceSymbol` to open the generated interface and resolve the symbol position. The server synthesizes the final `sourcekit-lsp://` URI and fills in `location.range`.
 4. **Content retrieval** — fetch the generated interface text. The editor scrolls to `location.range.start` from the resolve step.

Sources/SourceKitLSP/CapabilityRegistry.swift

@@ -119,7 +119,7 @@ package final actor CapabilityRegistry {
   }
 
   /// Whether the client supports `workspaceSymbol/resolve` for lazy location resolution.
-  /// Requires `workspace.symbol.resolveSupport.properties` to contain `"location"` or `"location.range"`.
+  /// Requires `workspace.symbol.resolveSupport.properties` to contain `"location"` or `"location."`.
   package nonisolated var clientSupportsWorkspaceSymbolResolve: Bool {
     return clientCapabilities.workspace?.symbol?.resolveSupport?.properties.contains(where: {
       $0 == "location" || $0.hasPrefix("location.")

Sources/SourceKitLSP/MessageHandlingDependencyTracker.swift

@@ -242,12 +242,10 @@ package enum MessageHandlingDependencyTracker: QueueBasedMessageHandlerDependenc
       self = .freestanding
     case is WorkspaceSemanticTokensRefreshRequest:
       self = .freestanding
-    case is WorkspaceSymbolResolveRequest:
+    case is WorkspaceSymbolInfoRequest:
       self = .freestanding
     case is WorkspaceSymbolNamesRequest:
       self = .freestanding
-    case is WorkspaceSymbolInfoRequest:
-      self = .freestanding
     case is WorkspaceSymbolResolveRequest:
       self = .freestanding
     case is WorkspaceSymbolsRequest:

Sources/SourceKitLSP/SourceKitLSPServer.swift

@@ -1773,9 +1773,13 @@ extension SourceKitLSPServer {
 
   /// Handle a workspace/symbolNames request, returning the name list.
   func workspaceSymbolNames(_ req: WorkspaceSymbolNamesRequest) async throws -> WorkspaceSymbolNamesResponse {
-    var symbols = try await self.workspaces.asyncFlatMap { workspace in
-      try await workspace.uncheckedIndex?.allSymbolNames() ?? []
-    }
+    var symbols = await self.workspaces
+      .concurrentMap { workspace in
+        await orLog("Getting symbol names in workspace") {
+          try await workspace.uncheckedIndex?.allSymbolNames() ?? []
+        } ?? []
+      }
+      .flatMap { $0 }
     if !symbols.isSortedAndUnique {
       symbols.sortAndDedupe()
     }
@@ -1784,10 +1788,11 @@ extension SourceKitLSPServer {
 
   /// Map a `SymbolOccurrence` from the index to a `WorkspaceSymbolItem` suitable for returning in a
   /// `workspace/symbolInfo` response.
-  private func workspaceSymbolItem(
+  private nonisolated func workspaceSymbolItem(
     for symbolOccurrence: SymbolOccurrence,
     in index: CheckedIndex,
-    copiedFileMap: CopiedFileMap
+    copiedFileMap: CopiedFileMap,
+    canUseWorkspaceSymbolResolve: Bool
   ) throws -> WorkspaceSymbolItem? {
     let containerNames = try index.containerNames(of: symbolOccurrence)
     let containerName: String? =
@@ -1803,7 +1808,7 @@ extension SourceKitLSPServer {
     // For SDK symbols (location in `.swiftinterface`/`.swiftmodule`), return a `WorkspaceSymbol`
     // with a deferred location so the client can resolve it via `workspaceSymbol/resolve`.
     // Falls through to `SymbolInformation` with regular file:// URL for clients without `workspace.symbol.resolveSupport`.
-    if capabilityRegistry?.clientSupportsWorkspaceSymbolResolve ?? false,
+    if canUseWorkspaceSymbolResolve,
       symbolOccurrence.location.path.hasSuffix(".swiftinterface")
         || symbolOccurrence.location.path.hasSuffix(".swiftmodule")
     {
@@ -1865,25 +1870,46 @@ extension SourceKitLSPServer {
   /// Every requested name is present as a key in the response, mapping to an empty array when there
   /// are no occurrences.
   func workspaceSymbolInfo(_ req: WorkspaceSymbolInfoRequest) async throws -> WorkspaceSymbolInfoResponse {
-    var result: [WorkspaceSymbolItem] = []
-    for workspace in workspaces {
+    let canUseWorkspaceSymbolResolve = self.capabilityRegistry?.clientSupportsWorkspaceSymbolResolve ?? false
+
+    var groupedResultPerWorkspace = await workspaces.concurrentMap { workspace -> [String: [WorkspaceSymbolItem]] in
       guard let index = await workspace.index(checkedFor: .deletedFiles) else {
-        continue
+        return [:]
       }
+      var result: [String: [WorkspaceSymbolItem]] = [:]
       let copiedFileMap = await workspace.buildServerManager.cachedCopiedFileMap
       for name in req.names {
+        if Task.isCancelled { return [:] }
         var symbols: [SymbolOccurrence] = []
-        try index.forEachCanonicalSymbolOccurrence(byName: name) { symbolOccurrence in
-          symbols.append(symbolOccurrence)
-          return true
+        _ = orLog("getting symbol information") {
+          try index.forEachCanonicalSymbolOccurrence(byName: name) { symbolOccurrence in
+            symbols.append(symbolOccurrence)
+            return true
+          }
         }
-        try Task.checkCancellation()
-        for symbol in symbols {
-          if let item = try self.workspaceSymbolItem(for: symbol, in: index, copiedFileMap: copiedFileMap) {
-            result.append(item)
+        if Task.isCancelled { return [:] }
+        result[name] = symbols.compactMap { symbol in
+          orLog("getting symbol information") {
+            try self.workspaceSymbolItem(
+              for: symbol,
+              in: index,
+              copiedFileMap: copiedFileMap,
+              canUseWorkspaceSymbolResolve: canUseWorkspaceSymbolResolve
+            )
           }
         }
       }
+      return result
+    }
+
+    // Flatten the result.
+    var result: [WorkspaceSymbolItem] = []
+    for name in req.names {
+      for grouped in groupedResultPerWorkspace {
+        if let items = grouped[name] {
+          result.append(contentsOf: items)
+        }
+      }
     }
     return WorkspaceSymbolInfoResponse(results: result)
   }
@@ -1899,7 +1925,7 @@ extension SourceKitLSPServer {
     guard
       case .uri(let uriOnly) = symbol.location,
       let urlComponents = URLComponents(url: uriOnly.uri.arbitrarySchemeURL, resolvingAgainstBaseURL: false),
-      let fullModuleName = urlComponents.queryItems?.first(where: { $0.name == "module" })?.value
+      let fullModuleName = urlComponents.queryItems?.last(where: { $0.name == "module" })?.value
     else {
       return symbol
     }
@@ -1921,7 +1947,14 @@ extension SourceKitLSPServer {
         nil
       }
 
-    let moduleFileURI = DocumentURI(filePath: urlComponents.path, isDirectory: false)
+    let moduleFileURI = DocumentURI(
+      {
+        var components = urlComponents
+        components.fragment = nil
+        components.query = nil
+        return components.url!
+      }()
+    )
     for workspace in workspaces {
       let mainFile = await workspace.buildServerManager
         .mainFiles(containing: moduleFileURI)
@@ -1962,6 +1995,7 @@ extension SourceKitLSPServer {
     guard req.query.count >= minWorkspaceSymbolPatternLength else {
       return []
     }
+    let canUseWorkspaceSymbolResolve = self.capabilityRegistry?.clientSupportsWorkspaceSymbolResolve ?? false
     var items: [WorkspaceSymbolItem] = []
     for workspace in workspaces {
       guard let index = await workspace.index(checkedFor: .deletedFiles) else {
@@ -1987,7 +2021,12 @@ extension SourceKitLSPServer {
       }
       try Task.checkCancellation()
       items += try symbols.sorted(by: <).compactMap {
-        try self.workspaceSymbolItem(for: $0, in: index, copiedFileMap: copiedFileMap)
+        try self.workspaceSymbolItem(
+          for: $0,
+          in: index,
+          copiedFileMap: copiedFileMap,
+          canUseWorkspaceSymbolResolve: canUseWorkspaceSymbolResolve
+        )
       }
     }
 

Sources/SwiftExtensions/CMakeLists.txt

@@ -1,5 +1,6 @@
 set(sources
   Array+Safe.swift
+  Array+SortAndDedupe.swift
   AsyncUtils.swift
   Cache.swift
   CartesianProduct.swift

Tests/SourceKitLSPTests/WorkspaceSymbolInfoTests.swift

@@ -93,14 +93,6 @@ final class WorkspaceSymbolInfoTests: XCTestCase {
     XCTAssertFalse(moduleParam.isEmpty, "?module= query parameter should be non-empty")
     XCTAssertNil(urlComponents.fragment, "URI should not contain a fragment")
 
-    guard case .dictionary(let dataDict) = symbol.data,
-      case .string(let usr) = dataDict["usr"]
-    else {
-      XCTFail("Expected data[\"usr\"] string, got \(String(describing: symbol.data))")
-      return
-    }
-    XCTAssertFalse(usr.isEmpty, "Expected non-empty USR in data[\"usr\"]")
-
     // workspaceSymbol/resolve turns the deferred URI into a sourcekit-lsp:// location with a range.
     let resolved = try await project.testClient.send(
       WorkspaceSymbolResolveRequest(workspaceSymbol: symbol)