[clang] 280609c - [clang-format][NFC] Minor improvement to FormatToken::isTypeName()

[Owen Pan via cfe-commits]

Author: Owen Pan
Date: 2025-01-31T18:52:53-08:00
New Revision: 280609c215e4a684cad215ea5be913293de0d255

URL: https://github.com/llvm/llvm-project/commit/280609c215e4a684cad215ea5be913293de0d255
DIFF: https://github.com/llvm/llvm-project/commit/280609c215e4a684cad215ea5be913293de0d255.diff

LOG: [clang-format][NFC] Minor improvement to FormatToken::isTypeName()

Added: 
    

Modified: 
    clang/lib/Format/FormatToken.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Format/FormatToken.cpp b/clang/lib/Format/FormatToken.cpp
index 963e8f87793fa0..99bce1f5f09851 100644
--- a/clang/lib/Format/FormatToken.cpp
+++ b/clang/lib/Format/FormatToken.cpp
@@ -42,11 +42,12 @@ static SmallVector<StringRef> CppNonKeywordTypes = {
 };
 
 bool FormatToken::isTypeName(const LangOptions &LangOpts) const {
+  if (is(TT_TypeName) || Tok.isSimpleTypeSpecifier(LangOpts))
+    return true;
   const bool IsCpp = LangOpts.CXXOperatorNames;
-  return is(TT_TypeName) || Tok.isSimpleTypeSpecifier(LangOpts) ||
-         (IsCpp && is(tok::identifier) &&
-          std::binary_search(CppNonKeywordTypes.begin(),
-                             CppNonKeywordTypes.end(), TokenText));
+  return IsCpp && is(tok::identifier) &&
+         std::binary_search(CppNonKeywordTypes.begin(),
+                            CppNonKeywordTypes.end(), TokenText);
 }
 
 bool FormatToken::isTypeOrIdentifier(const LangOptions &LangOpts) const {