diff options
| author | Kadir Cetinkaya <kadircet@google.com> | 2019-07-17 13:14:02 +0000 |
|---|---|---|
| committer | Kadir Cetinkaya <kadircet@google.com> | 2019-07-17 13:14:02 +0000 |
| commit | 6011a285edf2cf45ee6d660b6219abe3db9e7dc1 (patch) | |
| tree | 1f7749f18dd29d2db11700e5fadf2c1c828a2f97 | |
| parent | 0257c6b659f1a81e6071b606da49c91d5d586c7d (diff) | |
| download | bcm5719-llvm-6011a285edf2cf45ee6d660b6219abe3db9e7dc1.tar.gz bcm5719-llvm-6011a285edf2cf45ee6d660b6219abe3db9e7dc1.zip | |
[clangd] Handle windows line endings in QueryDriver
Summary: fixes second case of https://github.com/clangd/clangd/issues/93
Reviewers: sammccall
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D64789
llvm-svn: 366320
| -rw-r--r-- | clang-tools-extra/clangd/QueryDriverDatabase.cpp | 4 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/test/system-include-extractor.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/clang-tools-extra/clangd/QueryDriverDatabase.cpp b/clang-tools-extra/clangd/QueryDriverDatabase.cpp index d71ee3184cf..110b8fc43fc 100644 --- a/clang-tools-extra/clangd/QueryDriverDatabase.cpp +++ b/clang-tools-extra/clangd/QueryDriverDatabase.cpp @@ -63,7 +63,9 @@ std::vector<std::string> parseDriverOutput(llvm::StringRef Output) { llvm::SmallVector<llvm::StringRef, 8> Lines; Output.split(Lines, '\n', /*MaxSplit=*/-1, /*KeepEmpty=*/false); - auto StartIt = std::find(Lines.begin(), Lines.end(), SIS); + auto StartIt = + std::find_if(Lines.begin(), Lines.end(), + [](llvm::StringRef Line) { return Line.trim() == SIS; }); if (StartIt == Lines.end()) { elog("System include extraction: start marker not found: {0}", Output); return {}; diff --git a/clang-tools-extra/clangd/test/system-include-extractor.test b/clang-tools-extra/clangd/test/system-include-extractor.test index 130afbd828c..8f99db9122a 100644 --- a/clang-tools-extra/clangd/test/system-include-extractor.test +++ b/clang-tools-extra/clangd/test/system-include-extractor.test @@ -5,7 +5,7 @@ # RUN: echo '#!/bin/bash' >> %t.dir/my_driver.sh # RUN: echo '[ "$0" = "%t.dir/my_driver.sh" ] || exit' >> %t.dir/my_driver.sh # RUN: echo 'echo line to ignore >&2' >> %t.dir/my_driver.sh -# RUN: echo 'echo \#include \<...\> search starts here: >&2' >> %t.dir/my_driver.sh +# RUN: echo 'echo -e "#include <...> search starts here:\r" >&2' >> %t.dir/my_driver.sh # RUN: echo 'echo %t.dir/my/dir/ >&2' >> %t.dir/my_driver.sh # RUN: echo 'echo %t.dir/my/dir2/ >&2' >> %t.dir/my_driver.sh # RUN: echo 'echo End of search list. >&2' >> %t.dir/my_driver.sh |
