From a7cb3c367d6280b996ff6884534c96c19b53df1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johel=20Ernesto=20Guerrero=20Pe=C3=B1a?=
 <johelegp@gmail.com>
Date: Wed, 25 Sep 2024 12:17:42 -0400
Subject: [PATCH] refactor: add missing `Cpp2` to member names

---
 clang/lib/Format/UnwrappedLineParser.cpp | 10 +++++-----
 clang/lib/Format/UnwrappedLineParser.h   |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index 82d4fa9c4e3095..b242a0d76444f5 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -3129,24 +3129,24 @@ void UnwrappedLineParser::parseCpp2ParameterDeclaration() {
   parseCpp2Identifier();
 }
 
-bool UnwrappedLineParser::skipBalancedTokens(CurrentToken &Tok) {
+bool UnwrappedLineParser::skipCpp2BalancedTokens(CurrentToken &Tok) {
   if (!isCpp2OpeningPunctuator(Tok, tok::unknown))
     return false;
   const auto Closer = getCpp2ClosingPunctuator(Tok);
   do {
     Tok = getNextNonComment(Tokens);
     if (isCpp2OpeningPunctuator(Tok, tok::unknown))
-      skipBalancedTokens(Tok);
+      skipCpp2BalancedTokens(Tok);
   } while (!Tok->isOneOf(Closer, tok::eof));
   if (Tok->is(Closer))
     Tok = getNextNonComment(Tokens);
   return true;
 }
 
-auto UnwrappedLineParser::skipDeclarationSignature(
+auto UnwrappedLineParser::skipCpp2DeclarationSignature(
     CurrentToken Tok, const tok::TokenKind Closer) -> CurrentToken {
   while (!Tok->isOneOf(Closer, tok::eof, tok::comma)) {
-    if (skipBalancedTokens(Tok))
+    if (skipCpp2BalancedTokens(Tok))
       continue;
     Tok = getNextNonComment(Tokens);
   }
@@ -3212,7 +3212,7 @@ auto UnwrappedLineParser::atCpp2ParameterDeclarationSeq(
     if (startsCpp2Identifier(Res.Tok) && Opener == tok::less)
       continue;
 
-    Tok = skipDeclarationSignature(Tok, Closer);
+    Tok = skipCpp2DeclarationSignature(Tok, Closer);
   }
 
   if (Tok->is(Closer)) {
diff --git a/clang/lib/Format/UnwrappedLineParser.h b/clang/lib/Format/UnwrappedLineParser.h
index 07dd249191a882..71bdcabb90993c 100644
--- a/clang/lib/Format/UnwrappedLineParser.h
+++ b/clang/lib/Format/UnwrappedLineParser.h
@@ -294,8 +294,9 @@ class UnwrappedLineParser {
   void parseCpp2ThisSpecifier();
   auto atCpp2ParameterDeclarationHead(CurrentToken);
   void parseCpp2ParameterDeclaration();
-  bool skipBalancedTokens(CurrentToken &);
-  CurrentToken skipDeclarationSignature(CurrentToken, tok::TokenKind Closer);
+  bool skipCpp2BalancedTokens(CurrentToken &);
+  CurrentToken skipCpp2DeclarationSignature(CurrentToken,
+                                            tok::TokenKind Closer);
   Cpp2ListOf atCpp2ParameterDeclarationSeq(CurrentToken, tok::TokenKind Opener);
   void parseCpp2ParameterDeclarationSeq(Cpp2Punctuator Opener);
   Cpp2ListOf atCpp2TemplateParameterDeclarationList(CurrentToken);