[clang-tools-extra] [Clangd] Sanitize path before recording into IncludeStructure during buildPreamble (PR #70798)
via cfe-commits
cfe-commits at lists.llvm.org
Tue Oct 31 06:27:34 PDT 2023
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff 562ce8bbd23d96ee64992bcda041bf67e7c51057 65c1b38c4eb83469794e53328caed492e956a728 -- clang-tools-extra/clangd/Headers.cpp
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang-tools-extra/clangd/Headers.cpp b/clang-tools-extra/clangd/Headers.cpp
index 5af7abd71ae1..446044a83a65 100644
--- a/clang-tools-extra/clangd/Headers.cpp
+++ b/clang-tools-extra/clangd/Headers.cpp
@@ -57,7 +57,8 @@ public:
Inc.Written =
(IsAngled ? "<" + FileName + ">" : "\"" + FileName + "\"").str();
Inc.Resolved = std::string(
- File ? maybeCaseFoldPath(getCanonicalPath(*File, SM.getFileManager()).value_or(""))
+ File ? maybeCaseFoldPath(
+ getCanonicalPath(*File, SM.getFileManager()).value_or(""))
: "");
Inc.HashOffset = SM.getFileOffset(HashLoc);
Inc.HashLine =
@@ -209,7 +210,8 @@ IncludeStructure::HeaderID IncludeStructure::getOrCreateID(FileEntryRef Entry) {
// Main file's FileEntry was not known at IncludeStructure creation time.
if (&Entry.getFileEntry() == MainFileEntry) {
if (RealPathNames.front().empty())
- RealPathNames.front() = maybeCaseFoldPath(MainFileEntry->tryGetRealPathName().str());
+ RealPathNames.front() =
+ maybeCaseFoldPath(MainFileEntry->tryGetRealPathName().str());
return MainFileID;
}
auto R = UIDToIndex.try_emplace(
@@ -220,7 +222,8 @@ IncludeStructure::HeaderID IncludeStructure::getOrCreateID(FileEntryRef Entry) {
IncludeStructure::HeaderID Result = R.first->getSecond();
std::string &RealPathName = RealPathNames[static_cast<unsigned>(Result)];
if (RealPathName.empty())
- RealPathName = maybeCaseFoldPath(Entry.getFileEntry().tryGetRealPathName().str());
+ RealPathName =
+ maybeCaseFoldPath(Entry.getFileEntry().tryGetRealPathName().str());
return Result;
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/70798
More information about the cfe-commits
mailing list