diff options
Diffstat (limited to 'clang-tools-extra/clangd/Headers.cpp')
| -rw-r--r-- | clang-tools-extra/clangd/Headers.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/clang-tools-extra/clangd/Headers.cpp b/clang-tools-extra/clangd/Headers.cpp index a5759a4ef7c..d4c304fe63b 100644 --- a/clang-tools-extra/clangd/Headers.cpp +++ b/clang-tools-extra/clangd/Headers.cpp @@ -175,6 +175,8 @@ void IncludeInserter::addExisting(const Inclusion &Inc) { bool IncludeInserter::shouldInsertInclude( const HeaderFile &DeclaringHeader, const HeaderFile &InsertedHeader) const { assert(DeclaringHeader.valid() && InsertedHeader.valid()); + if (!HeaderSearchInfo && !InsertedHeader.Verbatim) + return false; if (FileName == DeclaringHeader.File || FileName == InsertedHeader.File) return false; auto Included = [&](llvm::StringRef Header) { @@ -190,7 +192,9 @@ IncludeInserter::calculateIncludePath(const HeaderFile &DeclaringHeader, if (InsertedHeader.Verbatim) return InsertedHeader.File; bool IsSystem = false; - std::string Suggested = HeaderSearchInfo.suggestPathToFileForDiagnostics( + if (!HeaderSearchInfo) + return "\"" + InsertedHeader.File + "\""; + std::string Suggested = HeaderSearchInfo->suggestPathToFileForDiagnostics( InsertedHeader.File, BuildDir, &IsSystem); if (IsSystem) Suggested = "<" + Suggested + ">"; |
