Address review feedback

Author: naveen-seth

clang/docs/ReleaseNotes.rst

@@ -1025,9 +1025,6 @@ clang-format
   ``enum`` enumerator lists.
 - Add ``OneLineFormatOffRegex`` option for turning formatting off for one line.
 - Add ``SpaceAfterOperatorKeyword`` option.
-- Support trailing whitespace in line splicing.
-  (P2223R2 <https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2021/p2223r2.pdf>_, #GH145226)
-
 
 clang-refactor
 --------------

clang/lib/Format/FormatTokenLexer.cpp

@@ -1204,25 +1204,22 @@ static size_t countLeadingWhitespace(StringRef Text) {
   const unsigned char *const End = Text.bytes_end();
   const unsigned char *Cur = Begin;
   while (Cur < End) {
-    if (isspace(Cur[0])) {
+    if (isWhitespace(Cur[0])) {
       ++Cur;
     } else if (Cur[0] == '\\') {
-      // A '\' followed by a optional horizontal whitespace (P22232R2) and then
-      // newline  always escapes the newline, regardless  of whether there is
-      // another '\' before it.
+      // A backslash followed by optional horizontal whitespaces (P22232R2) and
+      // then a newline always escapes the newline.
       // The source has a null byte at the end. So the end of the entire input
       // isn't reached yet. Also the lexer doesn't break apart an escaped
       // newline.
-      const unsigned char *Lookahead = Cur + 1;
+      const auto *Lookahead = Cur + 1;
       while (isHorizontalWhitespace(*Lookahead))
         ++Lookahead;
-      if (*Lookahead == '\n' || *Lookahead == '\r') {
-        // Splice found, consume it.
-        Cur = Lookahead + 1;
-        continue;
-      }
-      // No line splice found; the '\' is a token.
-      break;
+      // No line splice found; the backslash is a token.
+      if (!isVerticalWhitespace(*Lookahead))
+        break;
+      // Splice found, consume it.
+      Cur = Lookahead + 1;
     } else if (Cur[0] == '?' && Cur[1] == '?' && Cur[2] == '/' &&
                (Cur[3] == '\n' || Cur[3] == '\r')) {
       // Newlines can also be escaped by a '?' '?' '/' trigraph. By the way, the

clang/unittests/Format/FormatTest.cpp

@@ -25769,25 +25769,17 @@ TEST_F(FormatTest, OperatorPassedAsAFunctionPtr) {
 }
 
 TEST_F(FormatTest, LineSpliceWithTrailingWhitespace) {
-  // Test that each sequence of a backslash (\) immediately followed by zero or
-  // more horizontal whitespace characters and then a new-line character is
-  // treated as a single logical line while formatting (as per P2223R2).
-  FormatStyle Style = getLLVMStyle();
+  auto Style = getLLVMStyle();
   Style.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign;
   Style.UseTab = FormatStyle::UT_Never;
 
-  verifyFormat("int i;",
-               "  \\  \n"
-               "  int i;",
-               Style);
-  verifyFormat("#define FOO(args) \\\n  struct a {};\n",
+  verifyFormat("int i;", "  \\  \n"
+                         "  int i;");
+  verifyFormat("#define FOO(args) \\\n"
+               "  struct a {};",
                "#define FOO( args )   \\   \n"
                "struct a{\\\t\t\t\n"
-               "  };\n",
-               Style);
-  verifyFormat("comment here",
-               "comment \\ \n"
-               "here",
+               "  };",
                Style);
 }