diff options
| -rw-r--r-- | clang/lib/Frontend/FrontendAction.cpp | 4 | ||||
| -rw-r--r-- | clang/test/Index/complete-and-plugins.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp index e4fb022c2a1..122dc23388c 100644 --- a/clang/lib/Frontend/FrontendAction.cpp +++ b/clang/lib/Frontend/FrontendAction.cpp @@ -153,6 +153,10 @@ FrontendAction::CreateWrappedASTConsumer(CompilerInstance &CI, if (FrontendPluginRegistry::begin() == FrontendPluginRegistry::end()) return Consumer; + // If this is a code completion run, avoid invoking the plugin consumers + if (CI.hasCodeCompletionConsumer()) + return Consumer; + // Collect the list of plugins that go before the main action (in Consumers) // or after it (in AfterConsumers) std::vector<std::unique_ptr<ASTConsumer>> Consumers; diff --git a/clang/test/Index/complete-and-plugins.c b/clang/test/Index/complete-and-plugins.c new file mode 100644 index 00000000000..0592aaa9ef3 --- /dev/null +++ b/clang/test/Index/complete-and-plugins.c @@ -0,0 +1,6 @@ +// RUN: c-index-test -code-completion-at=%s:7:1 -load %llvmshlibdir/PrintFunctionNames%pluginext -add-plugin print-fns %s | FileCheck %s +// REQUIRES: plugins, examples +// CHECK: macro definition:{{.*}} +// CHECK-NOT: top-level-decl: "x" + +void x(); |
