[clang-tools-extra] r365882 - [clangd] Don't run the prepare for tweaks that are disabled.
Haojian Wu via cfe-commits
cfe-commits at lists.llvm.org
Fri Jul 12 01:50:20 PDT 2019
Author: hokein
Date: Fri Jul 12 01:50:20 2019
New Revision: 365882
URL: http://llvm.org/viewvc/llvm-project?rev=365882&view=rev
Log:
[clangd] Don't run the prepare for tweaks that are disabled.
Summary: Previously, we ran the prepare, even for the tweaks that are disabled.
Reviewers: sammccall
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D64565
Modified:
clang-tools-extra/trunk/clangd/ClangdServer.cpp
clang-tools-extra/trunk/clangd/ClangdServer.h
clang-tools-extra/trunk/clangd/refactor/Tweak.cpp
clang-tools-extra/trunk/clangd/refactor/Tweak.h
clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp
Modified: clang-tools-extra/trunk/clangd/ClangdServer.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/ClangdServer.cpp?rev=365882&r1=365881&r2=365882&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/ClangdServer.cpp (original)
+++ clang-tools-extra/trunk/clangd/ClangdServer.cpp Fri Jul 12 01:50:20 2019
@@ -101,7 +101,7 @@ ClangdServer::ClangdServer(const GlobalC
: nullptr),
GetClangTidyOptions(Opts.GetClangTidyOptions),
SuggestMissingIncludes(Opts.SuggestMissingIncludes),
- EnableHiddenFeatures(Opts.HiddenFeatures), TweakFilter(Opts.TweakFilter),
+ TweakFilter(Opts.TweakFilter),
WorkspaceRoot(Opts.WorkspaceRoot),
// Pass a callback into `WorkScheduler` to extract symbols from a newly
// parsed file and rebuild the file index synchronously each time an AST
@@ -333,11 +333,9 @@ void ClangdServer::enumerateTweaks(PathR
if (!Selection)
return CB(Selection.takeError());
std::vector<TweakRef> Res;
- for (auto &T : prepareTweaks(*Selection)) {
- if (!TweakFilter(T->id()) || (T->hidden() && !EnableHiddenFeatures))
- continue;
+ for (auto &T : prepareTweaks(*Selection, TweakFilter))
Res.push_back({T->id(), T->title(), T->intent()});
- }
+
CB(std::move(Res));
};
Modified: clang-tools-extra/trunk/clangd/ClangdServer.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/ClangdServer.h?rev=365882&r1=365881&r2=365882&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/ClangdServer.h (original)
+++ clang-tools-extra/trunk/clangd/ClangdServer.h Fri Jul 12 01:50:20 2019
@@ -126,10 +126,6 @@ public:
bool SuggestMissingIncludes = false;
- /// Enable hidden features mostly useful to clangd developers.
- /// e.g. tweaks to dump the AST.
- bool HiddenFeatures = false;
-
/// Clangd will execute compiler drivers matching one of these globs to
/// fetch system include path.
std::vector<std::string> QueryDriverGlobs;
@@ -137,9 +133,10 @@ public:
/// Enable semantic highlighting features.
bool SemanticHighlighting = false;
- /// Returns true if the StringRef is a tweak that should be enabled
- std::function<bool(llvm::StringRef)> TweakFilter =
- [](llvm::StringRef TweakToSearch) { return true; };
+ /// Returns true if the tweak should be enabled.
+ std::function<bool(const Tweak &)> TweakFilter = [](const Tweak &T) {
+ return !T.hidden(); // only enable non-hidden tweaks.
+ };
};
// Sensible default options for use in tests.
// Features like indexing must be enabled if desired.
@@ -322,7 +319,7 @@ private:
bool SuggestMissingIncludes = false;
bool EnableHiddenFeatures = false;
- std::function<bool(llvm::StringRef)> TweakFilter;
+ std::function<bool(const Tweak &)> TweakFilter;
// GUARDED_BY(CachedCompletionFuzzyFindRequestMutex)
llvm::StringMap<llvm::Optional<FuzzyFindRequest>>
Modified: clang-tools-extra/trunk/clangd/refactor/Tweak.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/refactor/Tweak.cpp?rev=365882&r1=365881&r2=365882&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/refactor/Tweak.cpp (original)
+++ clang-tools-extra/trunk/clangd/refactor/Tweak.cpp Fri Jul 12 01:50:20 2019
@@ -46,13 +46,15 @@ Tweak::Selection::Selection(ParsedAST &A
Cursor = SM.getComposedLoc(SM.getMainFileID(), RangeBegin);
}
-std::vector<std::unique_ptr<Tweak>> prepareTweaks(const Tweak::Selection &S) {
+std::vector<std::unique_ptr<Tweak>>
+prepareTweaks(const Tweak::Selection &S,
+ llvm::function_ref<bool(const Tweak &)> Filter) {
validateRegistry();
std::vector<std::unique_ptr<Tweak>> Available;
for (const auto &E : TweakRegistry::entries()) {
std::unique_ptr<Tweak> T = E.instantiate();
- if (!T->prepare(S))
+ if (!Filter(*T) || !T->prepare(S))
continue;
Available.push_back(std::move(T));
}
Modified: clang-tools-extra/trunk/clangd/refactor/Tweak.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/refactor/Tweak.h?rev=365882&r1=365881&r2=365882&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/refactor/Tweak.h (original)
+++ clang-tools-extra/trunk/clangd/refactor/Tweak.h Fri Jul 12 01:50:20 2019
@@ -110,9 +110,11 @@ public:
TweakRegistrationFor##Subclass(#Subclass, /*Description=*/""); \
const char *Subclass::id() const { return #Subclass; }
-/// Calls prepare() on all tweaks, returning those that can run on the
-/// selection.
-std::vector<std::unique_ptr<Tweak>> prepareTweaks(const Tweak::Selection &S);
+/// Calls prepare() on all tweaks that satisfy the filter, returning those that
+/// can run on the selection.
+std::vector<std::unique_ptr<Tweak>>
+prepareTweaks(const Tweak::Selection &S,
+ llvm::function_ref<bool(const Tweak &)> Filter);
// Calls prepare() on the tweak with a given ID.
// If prepare() returns false, returns an error.
Modified: clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp?rev=365882&r1=365881&r2=365882&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp (original)
+++ clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp Fri Jul 12 01:50:20 2019
@@ -472,7 +472,6 @@ int main(int argc, char *argv[]) {
}
Opts.StaticIndex = StaticIdx.get();
Opts.AsyncThreadsCount = WorkerThreadsCount;
- Opts.HiddenFeatures = HiddenFeatures;
clangd::CodeCompleteOptions CCOpts;
CCOpts.IncludeIneligibleResults = IncludeIneligibleResults;
@@ -531,11 +530,14 @@ int main(int argc, char *argv[]) {
}
Opts.SuggestMissingIncludes = SuggestMissingIncludes;
Opts.QueryDriverGlobs = std::move(QueryDriverGlobs);
- if (TweakList.getNumOccurrences())
- Opts.TweakFilter = [&](llvm::StringRef TweakToSearch) {
- // return true if any tweak matches the TweakToSearch
- return llvm::find(TweakList, TweakToSearch) != TweakList.end();
- };
+
+ Opts.TweakFilter = [&](const Tweak &T) {
+ if (T.hidden() && !HiddenFeatures)
+ return false;
+ if (TweakList.getNumOccurrences())
+ return llvm::is_contained(TweakList, T.id());
+ return true;
+ };
llvm::Optional<OffsetEncoding> OffsetEncodingFromFlag;
if (ForceOffsetEncoding != OffsetEncoding::UnsupportedEncoding)
OffsetEncodingFromFlag = ForceOffsetEncoding;
More information about the cfe-commits
mailing list