Skip to content

Revert "Allow double dash for IndexStore-related CLI arguments" #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2020
Merged

Revert "Allow double dash for IndexStore-related CLI arguments" #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ if getenv("SWIFTCI_USE_LOCAL_DEPS") == nil {
.package(url: "https://github.com/apple/indexstore-db.git", .branch("master")),
.package(url: "https://github.com/apple/swift-package-manager.git", .branch("master")),
.package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("master")),
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.3.1")),
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.3.0")),
]
} else {
package.dependencies += [
Expand Down
8 changes: 4 additions & 4 deletions Sources/sourcekit-lsp/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,16 @@ struct Main: ParsableCommand {
var clangdOptions = [String]()

@Option(
name: [.long, .customLong("index-store-path", withSingleDash: true)],
name: .customLong("index-store-path", withSingleDash: true),
help: "Override index-store-path from the build system"
)
var indexStorePath: AbsolutePath?

@Option(
name: [.long, .customLong("index-db-path", withSingleDash: true)],
name: .customLong("index-db-path", withSingleDash: true),
help: "Override index-database-path from the build system"
)
var indexDBPath: AbsolutePath?
var indexDatabasePath: AbsolutePath?

@Option(
help: "Whether to enable server-side filtering in code-completion"
Expand All @@ -135,7 +135,7 @@ struct Main: ParsableCommand {
serverOptions.buildSetup.flags.swiftCompilerFlags = buildFlagsSwift
serverOptions.clangdOptions = clangdOptions
serverOptions.indexOptions.indexStorePath = indexStorePath
serverOptions.indexOptions.indexDatabasePath = indexDBPath
serverOptions.indexOptions.indexDatabasePath = indexDatabasePath
serverOptions.completionOptions.serverSideFiltering = completionServerSideFiltering
serverOptions.completionOptions.maxResults = completionMaxResults

Expand Down