[PATCH] D117759: [clang-format][NFC] Clean up tryMergeLessLess()

[Owen Pan via Phabricator via cfe-commits]

owenpan created this revision.
owenpan added reviewers: MyDeveloperDay, curdeius, HazardyKnusperkeks, pjessesco.
owenpan added a project: clang-format.
owenpan requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D117759

Files:
  clang/lib/Format/FormatTokenLexer.cpp


Index: clang/lib/Format/FormatTokenLexer.cpp
===================================================================
--- clang/lib/Format/FormatTokenLexer.cpp
+++ clang/lib/Format/FormatTokenLexer.cpp
@@ -430,19 +430,15 @@
     return false;
 
   auto First = Tokens.end() - 3;
-  bool FourthTokenIsLess = false;
+  auto X = Tokens.size() > 3 ? First[-1] : nullptr;
+  auto Y = First[2];
 
-  if (Tokens.size() > 3) {
-    auto Fourth = (Tokens.end() - 4)[0];
-    FourthTokenIsLess = Fourth->is(tok::less);
-
-    // Do not remove a whitespace between the two "<" e.g. "operator< <>".
-    if (First[2]->is(tok::greater) && Fourth->is(tok::kw_operator))
-      return false;
-  }
+  // Do not remove a whitespace between the two "<" e.g. "operator< <>".
+  if (Y->is(tok::greater) && X && X->is(tok::kw_operator))
+    return false;
 
-  if (First[2]->is(tok::less) || First[1]->isNot(tok::less) ||
-      First[0]->isNot(tok::less) || FourthTokenIsLess)
+  if (Y->is(tok::less) || First[1]->isNot(tok::less) ||
+      First[0]->isNot(tok::less) || (X && X->is(tok::less)))
     return false;
 
   // Only merge if there currently is no whitespace between the two "<".


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D117759.401556.patch
Type: text/x-patch
Size: 1166 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220120/53ce87d8/attachment.bin>