Remove options to override the index store path and index database path

We should always infer these from the build system and I can’t think of a reason to override these settings.

Author: ahoppen

Sources/SKOptions/SourceKitLSPOptions.swift

@@ -182,10 +182,6 @@ public struct SourceKitLSPOptions: Sendable, Codable, Equatable {
   }
 
   public struct IndexOptions: Sendable, Codable, Equatable {
-    /// Directory in which a separate compilation stores the index store. By default, inferred from the build system.
-    public var indexStorePath: String?
-    /// Directory in which the indexstore-db should be stored. By default, inferred from the build system.
-    public var indexDatabasePath: String?
     /// Path remappings for remapping index data for local use.
     public var indexPrefixMap: [String: String]?
     /// A hint indicating how many cores background indexing should use at most (value between 0 and 1). Background indexing is not required to honor this setting.
@@ -208,23 +204,17 @@ public struct SourceKitLSPOptions: Sendable, Codable, Equatable {
     }
 
     public init(
-      indexStorePath: String? = nil,
-      indexDatabasePath: String? = nil,
       indexPrefixMap: [String: String]? = nil,
       maxCoresPercentageToUseForBackgroundIndexing: Double? = nil,
       updateIndexStoreTimeout: Int? = nil
     ) {
-      self.indexStorePath = indexStorePath
-      self.indexDatabasePath = indexDatabasePath
       self.indexPrefixMap = indexPrefixMap
       self.maxCoresPercentageToUseForBackgroundIndexing = maxCoresPercentageToUseForBackgroundIndexing
       self.updateIndexStoreTimeout = updateIndexStoreTimeout
     }
 
     static func merging(base: IndexOptions, override: IndexOptions?) -> IndexOptions {
       return IndexOptions(
-        indexStorePath: override?.indexStorePath ?? base.indexStorePath,
-        indexDatabasePath: override?.indexDatabasePath ?? base.indexDatabasePath,
         indexPrefixMap: override?.indexPrefixMap ?? base.indexPrefixMap,
         maxCoresPercentageToUseForBackgroundIndexing: override?.maxCoresPercentageToUseForBackgroundIndexing
           ?? base.maxCoresPercentageToUseForBackgroundIndexing,

Sources/SKTestSupport/IndexedSingleSwiftFileTestProject.swift

@@ -147,13 +147,8 @@ package struct IndexedSingleSwiftFileTestProject {
     }
 
     // Create the test client
-    var options = try await SourceKitLSPOptions.testDefault()
-    options.indexOrDefault = SourceKitLSPOptions.IndexOptions(
-      indexStorePath: try indexURL.filePath,
-      indexDatabasePath: try indexDBURL.filePath
-    )
     self.testClient = try await TestSourceKitLSPClient(
-      options: options,
+      options: try await SourceKitLSPOptions.testDefault(),
       capabilities: capabilities,
       workspaceFolders: [
         WorkspaceFolder(uri: DocumentURI(testWorkspaceDirectory))

Sources/SourceKitLSP/Workspace.swift

@@ -272,17 +272,13 @@ package final class Workspace: Sendable, BuildSystemManagerDelegate {
 
     let indexOptions = options.indexOrDefault
     let indexStorePath: URL? =
-      if let indexStorePath = indexOptions.indexStorePath {
-        URL(fileURLWithPath: indexStorePath, relativeTo: rootUri?.fileURL)
-      } else if let indexStorePath = await buildSystemManager.initializationData?.indexStorePath {
+      if let indexStorePath = await buildSystemManager.initializationData?.indexStorePath {
         URL(fileURLWithPath: indexStorePath, relativeTo: rootUri?.fileURL)
       } else {
         nil
       }
     let indexDatabasePath: URL? =
-      if let indexDatabasePath = indexOptions.indexDatabasePath {
-        URL(fileURLWithPath: indexDatabasePath, relativeTo: rootUri?.fileURL)
-      } else if let indexDatabasePath = await buildSystemManager.initializationData?.indexDatabasePath {
+      if let indexDatabasePath = await buildSystemManager.initializationData?.indexDatabasePath {
         URL(fileURLWithPath: indexDatabasePath, relativeTo: rootUri?.fileURL)
       } else {
         nil

Sources/sourcekit-lsp/SourceKitLSP.swift

@@ -112,18 +112,6 @@ struct SourceKitLSP: AsyncParsableCommand {
   )
   var clangdOptions = [String]()
 
-  @Option(
-    name: .customLong("index-store-path", withSingleDash: true),
-    help: "Override index-store-path from the build system"
-  )
-  var indexStorePath: String?
-
-  @Option(
-    name: .customLong("index-db-path", withSingleDash: true),
-    help: "Override index-database-path from the build system"
-  )
-  var indexDatabasePath: String?
-
   @Option(
     name: .customLong("index-prefix-map", withSingleDash: true),
     parsing: .unconditionalSingleValue,
@@ -177,8 +165,6 @@ struct SourceKitLSP: AsyncParsableCommand {
       compilationDatabase: SourceKitLSPOptions.CompilationDatabaseOptions(searchPaths: compilationDatabaseSearchPaths),
       clangdOptions: clangdOptions,
       index: SourceKitLSPOptions.IndexOptions(
-        indexStorePath: indexStorePath,
-        indexDatabasePath: indexDatabasePath,
         indexPrefixMap: [String: String](
           indexPrefixMappings.map { ($0.original, $0.replacement) },
           uniquingKeysWith: { lhs, rhs in rhs }