Remove a few workarounds that should no longer be needed

Author: ahoppen

Sources/LanguageServerProtocol/Error.swift

@@ -89,11 +89,12 @@ public struct ErrorCode: RawRepresentable, Codable, Hashable, Sendable {
 public struct ResponseError: Error, Codable, Hashable {
   public var code: ErrorCode
   public var message: String
-  // FIXME: data
+  public var data: LSPAny?
 
-  public init(code: ErrorCode, message: String) {
+  public init(code: ErrorCode, message: String, data: LSPAny? = nil) {
     self.code = code
     self.message = message
+    self.data = data
   }
 }
 

Sources/SKTestSupport/SkipUnless.swift

@@ -493,6 +493,37 @@ package actor SkipUnless {
       }
     }
   }
+
+  /// Checks if sourcekitd contains https://github.com/swiftlang/swift/pull/71049
+  package static func solverBasedCursorInfoWorksForMemoryOnlyFiles(
+    file: StaticString = #filePath,
+    line: UInt = #line
+  ) async throws {
+    struct ExpectedLocationsResponse: Error {}
+
+    return try await shared.skipUnlessSupportedByToolchain(swiftVersion: SwiftVersion(6, 0), file: file, line: line) {
+      let testClient = try await TestSourceKitLSPClient()
+      let uri = DocumentURI(for: .swift)
+      let positions = testClient.openDocument(
+        """
+        func foo() -> Int { 1 }
+        func foo() -> String { "" }
+        func test() {
+          _ = 3️⃣foo()
+        }
+        """,
+        uri: uri
+      )
+
+      let response = try await testClient.send(
+        DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["3️⃣"])
+      )
+      guard case .locations(let locations) = response else {
+        throw ExpectedLocationsResponse()
+      }
+      return locations.count > 0
+    }
+  }
 }
 
 // MARK: - Parsing Swift compiler version

Sources/SKTestSupport/SwiftPMTestProject.swift

@@ -227,11 +227,7 @@ package class SwiftPMTestProject: MultiFileTestProject {
         "-Xswiftc", "-module-cache-path", "-Xswiftc", globalModuleCache.path,
       ]
     }
-    var environment = ProcessEnv.block
-    // FIXME: SwiftPM does not index-while-building on non-Darwin platforms for C-family files (rdar://117744039).
-    // Force-enable index-while-building with the environment variable.
-    environment["SWIFTPM_ENABLE_CLANG_INDEX_STORE"] = "1"
-    try await Process.checkNonZeroExit(arguments: arguments, environmentBlock: environment)
+    try await Process.checkNonZeroExit(arguments: arguments)
   }
 
   /// Resolve package dependencies for the package at `path`.

Sources/SourceKitD/DynamicallyLoadedSourceKitD.swift

@@ -83,9 +83,8 @@ package actor DynamicallyLoadedSourceKitD: SourceKitD {
   deinit {
     self.api.set_notification_handler(nil)
     self.api.shutdown()
-    // FIXME: is it safe to dlclose() sourcekitd? If so, do that here. For now, let the handle leak.
-    Task.detached(priority: .background) { [dylib] in
-      dylib.leak()
+    Task.detached(priority: .background) { [dylib, path] in
+      orLog("Closing dylib \(path)") { try dylib.close() }
     }
   }
 

Sources/SourceKitLSP/Clang/ClangLanguageService.swift

@@ -486,17 +486,15 @@ extension ClangLanguageService {
     let clangBuildSettings = await self.buildSettings(for: uri)
 
     // The compile command changed, send over the new one.
-    // FIXME: what should we do if we no longer have valid build settings?
     if let compileCommand = clangBuildSettings?.compileCommand,
       let pathString = (try? AbsolutePath(validating: url.path))?.pathString
     {
       let notification = DidChangeConfigurationNotification(
-        settings: .clangd(
-          ClangWorkspaceSettings(
-            compilationDatabaseChanges: [pathString: compileCommand])
-        )
+        settings: .clangd(ClangWorkspaceSettings(compilationDatabaseChanges: [pathString: compileCommand]))
       )
       clangd.send(notification)
+    } else {
+      logger.error("No longer have build settings for \(url.path) but can't send null build settings to clangd")
     }
   }
 

Sources/SourceKitLSP/DocumentManager.swift

@@ -191,6 +191,15 @@ package final class DocumentManager: InMemoryDocumentManager, Sendable {
     }
   }
 
+  /// Returns the latest open snapshot of `uri` or, if no document with that URI is open, reads the file contents of
+  /// that file from disk.
+  package func latestSnapshotOrDisk(_ uri: DocumentURI, language: Language) -> DocumentSnapshot? {
+    if let snapshot = try? self.latestSnapshot(uri) {
+      return snapshot
+    }
+    return try? DocumentSnapshot(withContentsFromDisk: uri, language: language)
+  }
+
   package func fileHasInMemoryModifications(_ uri: DocumentURI) -> Bool {
     guard let document = try? latestSnapshot(uri), let fileURL = uri.fileURL else {
       return false

Sources/SourceKitLSP/Rename.swift

@@ -482,14 +482,6 @@ package struct CrossLanguageName: Sendable {
 /// The kinds of symbol occurrence roles that should be renamed.
 fileprivate let renameRoles: SymbolRole = [.declaration, .definition, .reference]
 
-extension DocumentManager {
-  /// Returns the latest open snapshot of `uri` or, if no document with that URI is open, reads the file contents of
-  /// that file from disk.
-  fileprivate func latestSnapshotOrDisk(_ uri: DocumentURI, language: Language) -> DocumentSnapshot? {
-    return (try? self.latestSnapshot(uri)) ?? (try? DocumentSnapshot(withContentsFromDisk: uri, language: language))
-  }
-}
-
 extension SourceKitLSPServer {
   /// Returns a `DocumentSnapshot`, a position and the corresponding language service that references
   /// `usr` from a Swift file. If `usr` is not referenced from Swift, returns `nil`.
@@ -564,22 +556,6 @@ extension SourceKitLSPServer {
     return nil
   }
 
-  // FIXME: (async-workaround): Needed to work around rdar://127977642
-  private func translateClangNameToSwift(
-    _ swiftLanguageService: SwiftLanguageService,
-    at symbolLocation: SymbolLocation,
-    in snapshot: DocumentSnapshot,
-    isObjectiveCSelector: Bool,
-    name: String
-  ) async throws -> String {
-    return try await swiftLanguageService.translateClangNameToSwift(
-      at: symbolLocation,
-      in: snapshot,
-      isObjectiveCSelector: isObjectiveCSelector,
-      name: name
-    )
-  }
-
   private func getCrossLanguageName(
     forDefinitionOccurrence definitionOccurrence: SymbolOccurrence,
     overrideName: String? = nil,
@@ -614,8 +590,7 @@ extension SourceKitLSPServer {
       let swiftName: String?
       if let swiftReference = await getReferenceFromSwift(usr: usr, index: index, workspace: workspace) {
         let isObjectiveCSelector = definitionLanguage == .objective_c && definitionSymbol.kind.isMethod
-        swiftName = try await self.translateClangNameToSwift(
-          swiftReference.swiftLanguageService,
+        swiftName = try await swiftReference.swiftLanguageService.translateClangNameToSwift(
           at: swiftReference.location,
           in: swiftReference.snapshot,
           isObjectiveCSelector: isObjectiveCSelector,

Sources/SourceKitLSP/Swift/CodeActions/ConvertIntegerLiteral.swift

@@ -40,25 +40,8 @@ struct ConvertIntegerLiteral: SyntaxCodeActionProvider {
         continue
       }
 
-      //TODO: Add this to swift-syntax?
-      let prefix: String
-      switch radix {
-      case .binary:
-        prefix = "0b"
-      case .octal:
-        prefix = "0o"
-      case .hex:
-        prefix = "0x"
-      case .decimal:
-        prefix = ""
-      #if RESILIENT_LIBRARIES
-      @unknown default:
-        fatalError("Unknown case")
-      #endif
-      }
-
       let convertedValue: ExprSyntax =
-        "\(raw: prefix)\(raw: String(integerValue, radix: radix.size))"
+        "\(raw: radix.literalPrefix)\(raw: String(integerValue, radix: radix.size))"
       let edit = TextEdit(
         range: scope.snapshot.range(of: integerExpr),
         newText: convertedValue.description

Sources/SourceKitLSP/Swift/CursorInfo.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
+import SKLogging
 import SourceKitD
 
 /// Detailed information about a symbol under the cursor.
@@ -57,6 +58,7 @@ struct CursorInfo {
 
   init?(
     _ dict: SKDResponseDictionary,
+    documentManager: DocumentManager,
     sourcekitd: some SourceKitD
   ) {
     let keys = sourcekitd.keys
@@ -70,12 +72,14 @@ struct CursorInfo {
       let line: Int = dict[keys.line],
       let column: Int = dict[keys.column]
     {
-      let position = Position(
-        line: line - 1,
-        // FIXME: we need to convert the utf8/utf16 column, which may require reading the file!
-        utf16index: column - 1
-      )
-      location = Location(uri: DocumentURI(filePath: filepath, isDirectory: false), range: Range(position))
+      let uri = DocumentURI(filePath: filepath, isDirectory: false)
+      if let snapshot = documentManager.latestSnapshotOrDisk(uri, language: .swift) {
+        let position = snapshot.positionOf(zeroBasedLine: line - 1, utf8Column: column - 1)
+        location = Location(uri: uri, range: Range(position))
+      } else {
+        logger.error("Failed to get snapshot for \(uri.forLogging) to convert position")
+        location = nil
+      }
     } else {
       location = nil
     }
@@ -142,6 +146,7 @@ extension SwiftLanguageService {
     _ range: Range<Position>,
     additionalParameters appendAdditionalParameters: ((SKDRequestDictionary) -> Void)? = nil
   ) async throws -> (cursorInfo: [CursorInfo], refactorActions: [SemanticRefactorCommand]) {
+    let documentManager = try self.documentManager
     let snapshot = try documentManager.latestSnapshot(uri)
 
     let offsetRange = snapshot.utf8OffsetRange(of: range)
@@ -162,10 +167,12 @@ extension SwiftLanguageService {
     let dict = try await sendSourcekitdRequest(skreq, fileContents: snapshot.text)
 
     var cursorInfoResults: [CursorInfo] = []
-    if let cursorInfo = CursorInfo(dict, sourcekitd: sourcekitd) {
+    if let cursorInfo = CursorInfo(dict, documentManager: documentManager, sourcekitd: sourcekitd) {
       cursorInfoResults.append(cursorInfo)
     }
-    cursorInfoResults += dict[keys.secondarySymbols]?.compactMap { CursorInfo($0, sourcekitd: sourcekitd) } ?? []
+    cursorInfoResults +=
+      dict[keys.secondarySymbols]?
+      .compactMap { CursorInfo($0, documentManager: documentManager, sourcekitd: sourcekitd) } ?? []
     let refactorActions =
       [SemanticRefactorCommand](
         array: dict[keys.refactorActions],

Sources/SourceKitLSP/Swift/Diagnostic.swift

@@ -340,10 +340,8 @@ extension DiagnosticRelatedInformation {
     let snapshot: DocumentSnapshot
     if filePath == primaryDocumentSnapshot.uri.pseudoPath {
       snapshot = primaryDocumentSnapshot
-    } else if let inMemorySnapshot = try? documentManager.latestSnapshot(uri) {
-      snapshot = inMemorySnapshot
-    } else if let snapshotFromDisk = try? DocumentSnapshot(withContentsFromDisk: uri, language: .swift) {
-      snapshot = snapshotFromDisk
+    } else if let loadedSnapshot = documentManager.latestSnapshotOrDisk(uri, language: .swift) {
+      snapshot = loadedSnapshot
     } else {
       return nil
     }