From 162510f61991171ecef7f8c47db732fcc4e7b85e Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Mon, 8 Oct 2018 10:44:54 +0000 Subject: [PATCH] [clangd] Update the out-of-date yaml-symbol-file flag in clangd. Summary: The flag is stale due to the recent changes of clangd indexer, this patch renames the flag to "index-file". Reviewers: sammccall Subscribers: ilya-biryukov, ioeric, MaskRay, jkorous, arphaman, kadircet, cfe-commits Differential Revision: https://reviews.llvm.org/D52976 llvm-svn: 343963 --- clang-tools-extra/clangd/tool/ClangdMain.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp index aebff51..a7a9fdd 100644 --- a/clang-tools-extra/clangd/tool/ClangdMain.cpp +++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp @@ -158,11 +158,11 @@ static llvm::cl::opt HeaderInsertionDecorators( "an include line will be inserted or not."), llvm::cl::init(true)); -static llvm::cl::opt YamlSymbolFile( - "yaml-symbol-file", +static llvm::cl::opt IndexFile( + "index-file", llvm::cl::desc( - "YAML-format global symbol file to build the static index. Clangd will " - "use the static index for global code completion.\n" + "Index file to build the static index. The file must have been created " + "by a compatible clangd-index.\n" "WARNING: This option is experimental only, and will be removed " "eventually. Don't rely on it."), llvm::cl::init(""), llvm::cl::Hidden); @@ -288,12 +288,12 @@ int main(int argc, char *argv[]) { Opts.BuildDynamicSymbolIndex = EnableIndex; std::unique_ptr StaticIdx; std::future AsyncIndexLoad; // Block exit while loading the index. - if (EnableIndex && !YamlSymbolFile.empty()) { + if (EnableIndex && !IndexFile.empty()) { // Load the index asynchronously. Meanwhile SwapIndex returns no results. SwapIndex *Placeholder; StaticIdx.reset(Placeholder = new SwapIndex(llvm::make_unique())); AsyncIndexLoad = runAsync([Placeholder, &Opts] { - if (auto Idx = loadIndex(YamlSymbolFile, Opts.URISchemes, UseDex)) + if (auto Idx = loadIndex(IndexFile, Opts.URISchemes, UseDex)) Placeholder->reset(std::move(Idx)); }); if (RunSynchronously) -- 2.7.4