revert changes

Author: Wang Lun

Sources/SourceKitLSP/SourceKitLSPServer.swift

@@ -553,7 +553,7 @@ package actor SourceKitLSPServer {
     }
 
     let toolchain = await workspace.buildServerManager.toolchain(
-      for: uri.buildSettingsFile,
+      for: uri,
       in: workspace.buildServerManager.canonicalTarget(for: uri),
       language: language
     )
@@ -2066,16 +2066,14 @@ extension SourceKitLSPServer {
     languageService: LanguageService
   ) async throws -> Location {
     // Check if we're already in the target interface with the same module/group/symbol
-    if let referenceDoc = try? ReferenceDocumentURL(from: originatorUri),
-       case .generatedInterface(let interfaceData) = referenceDoc,
+    if case .generatedInterface(let interfaceData) = try? ReferenceDocumentURL(from: originatorUri),
        interfaceData.moduleName == moduleName && interfaceData.groupName == groupName {
-      
       // If we have a specific symbol USR, try to find its position in the current interface
       if let symbolUSR = symbolUSR,
          let swiftLanguageService = languageService as? SwiftLanguageService {
         do {
           let position = try await swiftLanguageService.generatedInterfaceManager.position(
-            ofUsr: symbolUSR, 
+            ofUsr: symbolUSR,
             in: interfaceData
           )
           return Location(uri: originatorUri, range: Range(position))

Sources/SourceKitLSP/Swift/GeneratedInterfaceManager.swift

@@ -92,13 +92,7 @@ actor GeneratedInterfaceManager {
     incrementingRefCount: Bool
   ) async throws -> OpenGeneratedInterfaceDocumentDetails {
     func loadFromCache() -> OpenGeneratedInterfaceDocumentDetails? {
-      // Cache by module name and group name, not the full document data
-      // This allows reuse across different buildSettingsFrom URIs
-      guard let cachedIndex = openInterfaces.firstIndex(where: { 
-        $0.url.moduleName == document.moduleName && 
-        $0.url.groupName == document.groupName &&
-        $0.url.sourcekitdDocumentName == document.sourcekitdDocumentName
-      }) else {
+      guard let cachedIndex = openInterfaces.firstIndex(where: { $0.url == document }) else {
         return nil
       }
       if incrementingRefCount {
@@ -166,11 +160,8 @@ actor GeneratedInterfaceManager {
   }
 
   private func decrementRefCount(for document: GeneratedInterfaceDocumentURLData) {
-    guard let cachedIndex = openInterfaces.firstIndex(where: { 
-      $0.url.moduleName == document.moduleName && 
-      $0.url.groupName == document.groupName &&
-      $0.url.sourcekitdDocumentName == document.sourcekitdDocumentName
-    }) else {      logger.fault(
+    guard let cachedIndex = openInterfaces.firstIndex(where: { $0.url == document }) else {
+      logger.fault(
         "Generated interface document for \(document.moduleName) is not open anymore. Unbalanced retain and releases?"
       )
       return

Sources/SourceKitLSP/Workspace.swift

@@ -432,12 +432,11 @@ package final class Workspace: Sendable, BuildServerManagerDelegate {
   /// document is returned.
   func setDocumentService(for uri: DocumentURI, _ newLanguageService: any LanguageService) -> LanguageService {
     return documentService.withLock { service in
-      let key = uri.buildSettingsFile
-      if let languageService = service[key] {
+      if let languageService = service[uri] {
         return languageService
       }
 
-      service[key] = newLanguageService
+      service[uri] = newLanguageService
       return newLanguageService
     }
   }