[clang] 5fc482c - [clang-format] Disable IntegerLiteralSeparator for C++ before c++14 (#151273)

[via cfe-commits]

Author: Owen Pan
Date: 2025-07-30T09:43:46-07:00
New Revision: 5fc482cfc0fa70c98e14d64d83dffbf7da03c303

URL: https://github.com/llvm/llvm-project/commit/5fc482cfc0fa70c98e14d64d83dffbf7da03c303
DIFF: https://github.com/llvm/llvm-project/commit/5fc482cfc0fa70c98e14d64d83dffbf7da03c303.diff

LOG: [clang-format] Disable IntegerLiteralSeparator for C++ before c++14 (#151273)

Fixes #151102

Added: 
    

Modified: 
    clang/lib/Format/IntegerLiteralSeparatorFixer.cpp
    clang/unittests/Format/IntegerLiteralSeparatorTest.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp b/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp
index 80487fa673bf0..7772a5619c4bd 100644
--- a/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp
+++ b/clang/lib/Format/IntegerLiteralSeparatorFixer.cpp
@@ -45,15 +45,18 @@ std::pair<tooling::Replacements, unsigned>
 IntegerLiteralSeparatorFixer::process(const Environment &Env,
                                       const FormatStyle &Style) {
   switch (Style.Language) {
-  case FormatStyle::LK_Cpp:
-  case FormatStyle::LK_ObjC:
-    Separator = '\'';
-    break;
   case FormatStyle::LK_CSharp:
   case FormatStyle::LK_Java:
   case FormatStyle::LK_JavaScript:
     Separator = '_';
     break;
+  case FormatStyle::LK_Cpp:
+  case FormatStyle::LK_ObjC:
+    if (Style.Standard >= FormatStyle::LS_Cpp14) {
+      Separator = '\'';
+      break;
+    }
+    [[fallthrough]];
   default:
     return {};
   }

diff  --git a/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp b/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp
index 8681c3d2f89ce..53b6dd8efadff 100644
--- a/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp
+++ b/clang/unittests/Format/IntegerLiteralSeparatorTest.cpp
@@ -83,6 +83,9 @@ TEST_F(IntegerLiteralSeparatorTest, SingleQuoteAsSeparator) {
                "d = 5678_km;\n"
                "h = 0xDEF_u16;",
                Style);
+
+  Style.Standard = FormatStyle::LS_Cpp11;
+  verifyFormat("ld = 1234L;", Style);
 }
 
 TEST_F(IntegerLiteralSeparatorTest, UnderscoreAsSeparator) {