adamcz created this revision.
Herald added subscribers: usaxena95, kadircet, arphaman.
adamcz requested review of this revision.
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov.
Herald added a project: clang.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D93220
Files:
clang-tools-extra/clangd/CodeComplete.cpp
Index: clang-tools-extra/clangd/CodeComplete.cpp
===================================================================
--- clang-tools-extra/clangd/CodeComplete.cpp
+++ clang-tools-extra/clangd/CodeComplete.cpp
@@ -182,12 +182,19 @@
// strings (literal or URI) mapping to the same file. We still want to
// bundle those, so we must resolve the header to be included here.
std::string HeaderForHash;
- if (Inserter)
- if (auto Header = headerToInsertIfAllowed(Opts))
- if (auto HeaderFile = toHeaderFile(*Header, FileName))
+ if (Inserter) {
+ if (auto Header = headerToInsertIfAllowed(Opts)) {
+ auto HeaderFile = toHeaderFile(*Header, FileName);
+ if (HeaderFile) {
if (auto Spelled =
Inserter->calculateIncludePath(*HeaderFile, FileName))
HeaderForHash = *Spelled;
+ } else {
+ elog("Code completion header path manipulation failed {0}",
+ HeaderFile.takeError());
+ }
+ }
+ }
llvm::SmallString<256> Scratch;
if (IndexResult) {
Index: clang-tools-extra/clangd/CodeComplete.cpp
===================================================================
--- clang-tools-extra/clangd/CodeComplete.cpp
+++ clang-tools-extra/clangd/CodeComplete.cpp
@@ -182,12 +182,19 @@
// strings (literal or URI) mapping to the same file. We still want to
// bundle those, so we must resolve the header to be included here.
std::string HeaderForHash;
- if (Inserter)
- if (auto Header = headerToInsertIfAllowed(Opts))
- if (auto HeaderFile = toHeaderFile(*Header, FileName))
+ if (Inserter) {
+ if (auto Header = headerToInsertIfAllowed(Opts)) {
+ auto HeaderFile = toHeaderFile(*Header, FileName);
+ if (HeaderFile) {
if (auto Spelled =
Inserter->calculateIncludePath(*HeaderFile, FileName))
HeaderForHash = *Spelled;
+ } else {
+ elog("Code completion header path manipulation failed {0}",
+ HeaderFile.takeError());
+ }
+ }
+ }
llvm::SmallString<256> Scratch;
if (IndexResult) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
