llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: None (NorthBlue333) <details> <summary>Changes</summary> Hello, This PR should fix https://github.com/llvm/llvm-project/issues/77450. I have not added tests though. Also, a similar fix might be required on `sortJavaImports`. --- Full diff: https://github.com/llvm/llvm-project/pull/77456.diff 1 Files Affected: - (modified) clang/lib/Format/Format.cpp (+10-4) ``````````diff diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index f798d555bf9929..a91f6a639fb00b 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -3119,6 +3119,7 @@ static void sortCppIncludes(const FormatStyle &Style, return; } + unsigned NewCursor = UINT_MAX; std::string result; for (unsigned Index : Indices) { if (!result.empty()) { @@ -3131,13 +3132,10 @@ static void sortCppIncludes(const FormatStyle &Style, } result += Includes[Index].Text; if (Cursor && CursorIndex == Index) - *Cursor = IncludesBeginOffset + result.size() - CursorToEOLOffset; + NewCursor = IncludesBeginOffset + result.size() - CursorToEOLOffset; CurrentCategory = Includes[Index].Category; } - if (Cursor && *Cursor >= IncludesEndOffset) - *Cursor += result.size() - IncludesBlockSize; - // If the #includes are out of order, we generate a single replacement fixing // the entire range of blocks. Otherwise, no replacement is generated. if (replaceCRLF(result) == replaceCRLF(std::string(Code.substr( @@ -3145,6 +3143,14 @@ static void sortCppIncludes(const FormatStyle &Style, return; } + if (Cursor) { + if (UINT_MAX != NewCursor) { + *Cursor = NewCursor; + } else if (*Cursor >= IncludesEndOffset) { + *Cursor += result.size() - IncludesBlockSize; + } + } + auto Err = Replaces.add(tooling::Replacement( FileName, Includes.front().Offset, IncludesBlockSize, result)); // FIXME: better error handling. For now, just skip the replacement for the `````````` </details> https://github.com/llvm/llvm-project/pull/77456 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
