adamcz updated this revision to Diff 312206.
adamcz marked an inline comment as done.
adamcz added a comment.
address comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D93220/new/
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,18 @@
// 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)) {
+ if (auto HeaderFile = toHeaderFile(*Header, FileName)) {
if (auto Spelled =
Inserter->calculateIncludePath(*HeaderFile, FileName))
HeaderForHash = *Spelled;
+ } else {
+ vlog("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,18 @@
// 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)) {
+ if (auto HeaderFile = toHeaderFile(*Header, FileName)) {
if (auto Spelled =
Inserter->calculateIncludePath(*HeaderFile, FileName))
HeaderForHash = *Spelled;
+ } else {
+ vlog("Code completion header path manipulation failed {0}",
+ HeaderFile.takeError());
+ }
+ }
+ }
llvm::SmallString<256> Scratch;
if (IndexResult) {
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
