Author: kadircet Date: Mon Mar 11 04:01:14 2019 New Revision: 355820 URL: http://llvm.org/viewvc/llvm-project?rev=355820&view=rev Log: [clangd] Respect Origin option in createStaticIndexingAction
Summary: Currently createStaticIndexingAction always set Origin to Static, which makes it hard to change it later on by different indexers(One needs to go over each symbol making a new copy). This patch changes that behavior to rather respect it if set by user. Reviewers: ioeric Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D59205 Modified: clang-tools-extra/trunk/clangd/index/IndexAction.cpp clang-tools-extra/trunk/clangd/index/IndexAction.h Modified: clang-tools-extra/trunk/clangd/index/IndexAction.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/IndexAction.cpp?rev=355820&r1=355819&r2=355820&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/index/IndexAction.cpp (original) +++ clang-tools-extra/trunk/clangd/index/IndexAction.cpp Mon Mar 11 04:01:14 2019 @@ -183,7 +183,8 @@ std::unique_ptr<FrontendAction> createSt index::IndexingOptions::SystemSymbolFilterKind::All; Opts.CollectIncludePath = true; Opts.CountReferences = true; - Opts.Origin = SymbolOrigin::Static; + if (Opts.Origin == SymbolOrigin::Unknown) + Opts.Origin = SymbolOrigin::Static; Opts.StoreAllDocumentation = false; if (RefsCallback != nullptr) { Opts.RefFilter = RefKind::All; Modified: clang-tools-extra/trunk/clangd/index/IndexAction.h URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/IndexAction.h?rev=355820&r1=355819&r2=355820&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/index/IndexAction.h (original) +++ clang-tools-extra/trunk/clangd/index/IndexAction.h Mon Mar 11 04:01:14 2019 @@ -22,7 +22,7 @@ namespace clangd { // - include paths are always collected, and canonicalized appropriately // - references are always counted // - all references are collected (if RefsCallback is non-null) -// - the symbol origin is always Static +// - the symbol origin is set to Static if not specified by caller std::unique_ptr<FrontendAction> createStaticIndexingAction( SymbolCollector::Options Opts, std::function<void(SymbolSlab)> SymbolsCallback, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits