VitaNuo updated this revision to Diff 539121. VitaNuo added a comment. Address comment.
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D154962/new/ https://reviews.llvm.org/D154962 Files: clang-tools-extra/clangd/Headers.cpp Index: clang-tools-extra/clangd/Headers.cpp =================================================================== --- clang-tools-extra/clangd/Headers.cpp +++ clang-tools-extra/clangd/Headers.cpp @@ -21,6 +21,7 @@ #include "llvm/Support/Path.h" #include <cstring> #include <optional> +#include <string> namespace clang { namespace clangd { @@ -53,8 +54,9 @@ auto &Inc = Out->MainFileIncludes.back(); Inc.Written = (IsAngled ? "<" + FileName + ">" : "\"" + FileName + "\"").str(); - Inc.Resolved = - std::string(File ? File->getFileEntry().tryGetRealPathName() : ""); + Inc.Resolved = std::string( + File ? getCanonicalPath(*File, SM.getFileManager()).value_or("") + : ""); Inc.HashOffset = SM.getFileOffset(HashLoc); Inc.HashLine = SM.getLineNumber(SM.getFileID(HashLoc), Inc.HashOffset) - 1;
Index: clang-tools-extra/clangd/Headers.cpp =================================================================== --- clang-tools-extra/clangd/Headers.cpp +++ clang-tools-extra/clangd/Headers.cpp @@ -21,6 +21,7 @@ #include "llvm/Support/Path.h" #include <cstring> #include <optional> +#include <string> namespace clang { namespace clangd { @@ -53,8 +54,9 @@ auto &Inc = Out->MainFileIncludes.back(); Inc.Written = (IsAngled ? "<" + FileName + ">" : "\"" + FileName + "\"").str(); - Inc.Resolved = - std::string(File ? File->getFileEntry().tryGetRealPathName() : ""); + Inc.Resolved = std::string( + File ? getCanonicalPath(*File, SM.getFileManager()).value_or("") + : ""); Inc.HashOffset = SM.getFileOffset(HashLoc); Inc.HashLine = SM.getLineNumber(SM.getFileID(HashLoc), Inc.HashOffset) - 1;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits