Revert "Merge pull request #1887 from ahoppen/generated-interface-reference-document"

This reverts commit f653ef3, reversing
changes made to 233f2e6.

Author: ahoppen

Sources/SKTestSupport/IndexedSingleSwiftFileTestProject.swift

@@ -51,7 +51,6 @@ package struct IndexedSingleSwiftFileTestProject {
   ///   - cleanUp: Whether to remove the temporary directory when the SourceKit-LSP server shuts down.
   package init(
     _ markedText: String,
-    capabilities: ClientCapabilities = ClientCapabilities(),
     indexSystemModules: Bool = false,
     allowBuildFailure: Bool = false,
     workspaceDirectory: URL? = nil,
@@ -154,7 +153,6 @@ package struct IndexedSingleSwiftFileTestProject {
     )
     self.testClient = try await TestSourceKitLSPClient(
       options: options,
-      capabilities: capabilities,
       workspaceFolders: [
         WorkspaceFolder(uri: DocumentURI(testWorkspaceDirectory))
       ],

Sources/SourceKitLSP/CMakeLists.txt

@@ -44,14 +44,11 @@ target_sources(SourceKitLSP PRIVATE
   Swift/DocumentSymbols.swift
   Swift/ExpandMacroCommand.swift
   Swift/FoldingRange.swift
-  Swift/GeneratedInterfaceDocumentURLData.swift
-  Swift/GeneratedInterfaceManager.swift
-  Swift/GeneratedInterfaceManager.swift
   Swift/MacroExpansion.swift
   Swift/MacroExpansionReferenceDocumentURLData.swift
   Swift/OpenInterface.swift
-  Swift/RefactoringEdit.swift
   Swift/RefactoringResponse.swift
+  Swift/RefactoringEdit.swift
   Swift/ReferenceDocumentURL.swift
   Swift/RelatedIdentifiers.swift
   Swift/RewriteSourceKitPlaceholders.swift

Sources/SourceKitLSP/MessageHandlingDependencyTracker.swift

@@ -74,9 +74,9 @@ package enum MessageHandlingDependencyTracker: QueueBasedMessageHandlerDependenc
     case (.documentUpdate(let selfUri), .documentUpdate(let otherUri)):
       return selfUri == otherUri
     case (.documentUpdate(let selfUri), .documentRequest(let otherUri)):
-      return selfUri.buildSettingsFile == otherUri.buildSettingsFile
+      return selfUri == otherUri
     case (.documentRequest(let selfUri), .documentUpdate(let otherUri)):
-      return selfUri.buildSettingsFile == otherUri.buildSettingsFile
+      return selfUri == otherUri
 
     // documentRequest
     case (.documentRequest, .documentRequest):

Sources/SourceKitLSP/SourceKitLSPServer.swift

@@ -242,7 +242,7 @@ package actor SourceKitLSPServer {
   }
 
   package func workspaceForDocument(uri: DocumentURI) async -> Workspace? {
-    let uri = uri.buildSettingsFile
+    let uri = uri.primaryFile ?? uri
     if let cachedWorkspace = self.workspaceForUri[uri]?.value {
       return cachedWorkspace
     }
@@ -1576,14 +1576,14 @@ extension SourceKitLSPServer {
   }
 
   func getReferenceDocument(_ req: GetReferenceDocumentRequest) async throws -> GetReferenceDocumentResponse {
-    let buildSettingsUri = try ReferenceDocumentURL(from: req.uri).buildSettingsFile
+    let primaryFileURI = try ReferenceDocumentURL(from: req.uri).primaryFile
 
-    guard let workspace = await workspaceForDocument(uri: buildSettingsUri) else {
-      throw ResponseError.workspaceNotOpen(buildSettingsUri)
+    guard let workspace = await workspaceForDocument(uri: primaryFileURI) else {
+      throw ResponseError.workspaceNotOpen(primaryFileURI)
     }
 
-    guard let languageService = workspace.documentService(for: buildSettingsUri) else {
-      throw ResponseError.unknown("No Language Service for URI: \(buildSettingsUri)")
+    guard let languageService = workspace.documentService(for: primaryFileURI) else {
+      throw ResponseError.unknown("No Language Service for URI: \(primaryFileURI)")
     }
 
     return try await languageService.getReferenceDocument(req)