[clang-format] Do not update cursor pos if no includes replacement

Author: NorthBlue333

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,20 +3132,24 @@ 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(
                                  IncludesBeginOffset, IncludesBlockSize)))) {
     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

clang/unittests/Format/SortIncludesTest.cpp

@@ -821,6 +821,30 @@ TEST_F(SortIncludesTest, CalculatesCorrectCursorPositionWithRegrouping) {
   EXPECT_EQ(27u, newCursor(Code, 28)); // Start of last line
 }
 
+TEST_F(SortIncludesTest, CalculatesCorrectCursorPositionWhenNoReplacementsWithRegroupingAndCRLF) {
+  Style.IncludeBlocks = Style.IBS_Regroup;
+  FmtStyle.LineEnding = FormatStyle::LE_CRLF;
+  Style.IncludeCategories = {
+      {"^\"aa\"", 1, 0, false},
+      {"^\"b\"", 1, 1, false},
+      {".*", 2, 2, false}};
+  std::string Code = "#include \"aa\"\r\n" // Start of line: 0
+                     "\r\n"                // Start of line: 15
+                     "#include \"b\"\r\n"  // Start of line: 17
+                     "\r\n"                // Start of line: 31
+                     "#include \"c\"\r\n"  // Start of line: 33
+                     "\r\n"                // Start of line: 47
+                     "int i;";             // Start of line: 49
+  EXPECT_EQ(Code, sort(Code));
+  EXPECT_EQ(0u, newCursor(Code, 0));
+  EXPECT_EQ(15u, newCursor(Code, 15));
+  EXPECT_EQ(17u, newCursor(Code, 17));
+  EXPECT_EQ(31u, newCursor(Code, 31));
+  EXPECT_EQ(33u, newCursor(Code, 33));
+  EXPECT_EQ(47u, newCursor(Code, 47));
+  EXPECT_EQ(49u, newCursor(Code, 49));
+}
+
 TEST_F(SortIncludesTest, DeduplicateIncludes) {
   EXPECT_EQ("#include <a>\n"
             "#include <b>\n"