diff options
| author | Kadir Cetinkaya <kadircet@google.com> | 2020-04-24 23:52:19 +0200 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2020-06-10 12:00:38 +0200 |
| commit | 52f2d6d4b20dbc4c72f87c27e6e7375496fe0e38 (patch) | |
| tree | 193a558518ad45cb17a55ea37addb7217cd8924d | |
| parent | 30d05b898c6e84160507a66aabba6aceb129a9c7 (diff) | |
| download | bcm5719-llvm-52f2d6d4b20dbc4c72f87c27e6e7375496fe0e38.tar.gz bcm5719-llvm-52f2d6d4b20dbc4c72f87c27e6e7375496fe0e38.zip | |
[clangd] Disable all dependency outputs
Summary: Fixes https://github.com/clangd/clangd/issues/322
Reviewers: sammccall
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, usaxena95, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D78833
(cherry picked from commit 294b9d43cae77ea15453ec82203368903db4f538)
Fixes https://github.com/clangd/clangd/issues/422
| -rw-r--r-- | clang-tools-extra/clangd/Compiler.cpp | 9 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/test/dependency-output.test | 12 |
2 files changed, 21 insertions, 0 deletions
diff --git a/clang-tools-extra/clangd/Compiler.cpp b/clang-tools-extra/clangd/Compiler.cpp index eae753b5c9b..47cec5ae12e 100644 --- a/clang-tools-extra/clangd/Compiler.cpp +++ b/clang-tools-extra/clangd/Compiler.cpp @@ -65,6 +65,15 @@ buildCompilerInvocation(const ParseInputs &Inputs, CI->getFrontendOpts().DisableFree = false; CI->getLangOpts()->CommentOpts.ParseAllComments = true; CI->getLangOpts()->RetainCommentsFromSystemHeaders = true; + + // Disable any dependency outputting, we don't want to generate files or write + // to stdout/stderr. + CI->getDependencyOutputOpts().ShowIncludesDest = + ShowIncludesDestination::None; + CI->getDependencyOutputOpts().OutputFile.clear(); + CI->getDependencyOutputOpts().HeaderIncludeOutputFile.clear(); + CI->getDependencyOutputOpts().DOTOutputFile.clear(); + CI->getDependencyOutputOpts().ModuleDependencyOutputDir.clear(); return CI; } diff --git a/clang-tools-extra/clangd/test/dependency-output.test b/clang-tools-extra/clangd/test/dependency-output.test new file mode 100644 index 00000000000..10b493d6611 --- /dev/null +++ b/clang-tools-extra/clangd/test/dependency-output.test @@ -0,0 +1,12 @@ +# RUN: clangd -lit-test < %s | FileCheck -strict-whitespace %s +{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}} +--- +{"jsonrpc":"2.0","method":"workspace/didChangeConfiguration","params":{"settings":{"compilationDatabaseChanges":{"/clangd-test/foo.c": +{"workingDirectory":"/clangd-test", "compilationCommand": ["clang", "-c", "-Xclang", "--show-includes", "-Xclang", "-sys-header-deps", "foo.c"]}}}}} +--- +{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"test:///foo.c","languageId":"cpp","version":1,"text":"int a;\n#include <stddef.h>"}}} +#CHECK-NOT: Note: including file +--- +{"jsonrpc":"2.0","id":3,"method":"shutdown"} +--- +{"jsonrpc":"2.0","method":"exit"} |
