Revert "[clang-format] Add an option to format integer literal separators"

Revert "[clang-format] Disable FixRanges in IntegerLiteralSeparatorTest"

Breaks buildbots, details in https://reviews.llvm.org/D140543

This reverts commit 879bd91.
This reverts commit 46c94e5.

Author: vitalybuka

clang/docs/ClangFormatStyleOptions.rst

@@ -3159,37 +3159,6 @@ the configuration (without a prefix: ``Auto``).
 
 
 
-**IntegerLiteralSeparator** (``IntegerLiteralSeparatorStyle``) :versionbadge:`clang-format 16`
-  Format integer literal separators (``'`` for C++ and ``_`` for C#, Java,
-  and JavaScript).
-
-  Nested configuration flags:
-
-  Separator format of integer literals of different bases.
-  <0: Remove separators.
-   0: Leave the literal as is.
-  >0: Insert separators between digits, starting from the rightmost digit.
-
-  * ``int8_t Binary`` .. code-block:: c++
-
-       -1: 0b100111101101
-        0: 0b10011'11'0110'1
-        3: 0b100'111'101'101
-        4: 0b1001'1110'1101
-
-  * ``int8_t Decimal`` .. code-block:: c++
-
-       -1: 18446744073709550592ull
-        0: 184467'440737'0'95505'92ull
-        3: 18'446'744'073'709'550'592ull
-
-  * ``int8_t Hex`` .. code-block:: c++
-
-       -1: 0xDEADBEEFDEADBEEFuz
-        0: 0xDEAD'BEEF'DE'AD'BEE'Fuz
-        2: 0xDE'AD'BE'EF'DE'AD'BE'EFuz
-
-
 **JavaImportGroups** (``List of Strings``) :versionbadge:`clang-format 8`
   A vector of prefixes ordered by the desired groups for Java imports.
 

clang/docs/ReleaseNotes.rst

@@ -867,8 +867,6 @@ clang-format
 - Add ``RequiresExpressionIndentation`` option for configuring the alignment of requires-expressions.
   The default value of this option is ``OuterScope``, which differs in behavior from clang-format 15.
   To match the default behavior of clang-format 15, use the ``Keyword`` value.
-- Add ``IntegerLiteralSeparator`` option for fixing integer literal separators
-  in C++, C#, Java, and JavaScript.
 
 clang-extdef-mapping
 --------------------

clang/include/clang/Format/Format.h

@@ -2450,37 +2450,6 @@ struct FormatStyle {
   /// \version 11
   TrailingCommaStyle InsertTrailingCommas;
 
-  /// Separator format of integer literals of different bases.
-  /// <0: Remove separators.
-  ///  0: Leave the literal as is.
-  /// >0: Insert separators between digits, starting from the rightmost digit.
-  struct IntegerLiteralSeparatorStyle {
-    /// \code
-    ///    -1: 0b100111101101
-    ///     0: 0b10011'11'0110'1
-    ///     3: 0b100'111'101'101
-    ///     4: 0b1001'1110'1101
-    /// \endcode
-    int8_t Binary;
-    /// \code
-    ///    -1: 18446744073709550592ull
-    ///     0: 184467'440737'0'95505'92ull
-    ///     3: 18'446'744'073'709'550'592ull
-    /// \endcode
-    int8_t Decimal;
-    /// \code
-    ///    -1: 0xDEADBEEFDEADBEEFuz
-    ///     0: 0xDEAD'BEEF'DE'AD'BEE'Fuz
-    ///     2: 0xDE'AD'BE'EF'DE'AD'BE'EFuz
-    /// \endcode
-    int8_t Hex;
-  };
-
-  /// Format integer literal separators (``'`` for C++ and ``_`` for C#, Java,
-  /// and JavaScript).
-  /// \version 16
-  IntegerLiteralSeparatorStyle IntegerLiteralSeparator;
-
   /// A vector of prefixes ordered by the desired groups for Java imports.
   ///
   /// One group's prefix can be a subset of another - the longest prefix is
@@ -4120,10 +4089,6 @@ struct FormatStyle {
            IndentWidth == R.IndentWidth &&
            IndentWrappedFunctionNames == R.IndentWrappedFunctionNames &&
            InsertBraces == R.InsertBraces &&
-           IntegerLiteralSeparator.Binary == R.IntegerLiteralSeparator.Binary &&
-           IntegerLiteralSeparator.Decimal ==
-               R.IntegerLiteralSeparator.Decimal &&
-           IntegerLiteralSeparator.Hex == R.IntegerLiteralSeparator.Hex &&
            JavaImportGroups == R.JavaImportGroups &&
            JavaScriptQuotes == R.JavaScriptQuotes &&
            JavaScriptWrapImports == R.JavaScriptWrapImports &&

clang/lib/Format/CMakeLists.txt

@@ -8,7 +8,6 @@ add_clang_library(clangFormat
   Format.cpp
   FormatToken.cpp
   FormatTokenLexer.cpp
-  IntegerLiteralSeparatorFixer.cpp
   MacroCallReconstructor.cpp
   MacroExpander.cpp
   NamespaceEndCommentsFixer.cpp

clang/lib/Format/Format.cpp

@@ -20,7 +20,6 @@
 #include "FormatInternal.h"
 #include "FormatToken.h"
 #include "FormatTokenLexer.h"
-#include "IntegerLiteralSeparatorFixer.h"
 #include "NamespaceEndCommentsFixer.h"
 #include "QualifierAlignmentFixer.h"
 #include "SortJavaScriptImports.h"
@@ -336,14 +335,6 @@ struct ScalarEnumerationTraits<FormatStyle::IndentExternBlockStyle> {
   }
 };
 
-template <> struct MappingTraits<FormatStyle::IntegerLiteralSeparatorStyle> {
-  static void mapping(IO &IO, FormatStyle::IntegerLiteralSeparatorStyle &Base) {
-    IO.mapOptional("Binary", Base.Binary);
-    IO.mapOptional("Decimal", Base.Decimal);
-    IO.mapOptional("Hex", Base.Hex);
-  }
-};
-
 template <> struct ScalarEnumerationTraits<FormatStyle::JavaScriptQuoteStyle> {
   static void enumeration(IO &IO, FormatStyle::JavaScriptQuoteStyle &Value) {
     IO.enumCase(Value, "Leave", FormatStyle::JSQS_Leave);
@@ -890,7 +881,6 @@ template <> struct MappingTraits<FormatStyle> {
                    Style.IndentWrappedFunctionNames);
     IO.mapOptional("InsertBraces", Style.InsertBraces);
     IO.mapOptional("InsertTrailingCommas", Style.InsertTrailingCommas);
-    IO.mapOptional("IntegerLiteralSeparator", Style.IntegerLiteralSeparator);
     IO.mapOptional("JavaImportGroups", Style.JavaImportGroups);
     IO.mapOptional("JavaScriptQuotes", Style.JavaScriptQuotes);
     IO.mapOptional("JavaScriptWrapImports", Style.JavaScriptWrapImports);
@@ -1345,7 +1335,6 @@ FormatStyle getLLVMStyle(FormatStyle::LanguageKind Language) {
   LLVMStyle.IndentWrappedFunctionNames = false;
   LLVMStyle.InsertBraces = false;
   LLVMStyle.InsertTrailingCommas = FormatStyle::TCS_None;
-  LLVMStyle.IntegerLiteralSeparator = {/*Binary=*/0, /*Decimal=*/0, /*Hex=*/0};
   LLVMStyle.JavaScriptQuotes = FormatStyle::JSQS_Leave;
   LLVMStyle.JavaScriptWrapImports = true;
   LLVMStyle.KeepEmptyLinesAtTheStartOfBlocks = true;
@@ -3402,10 +3391,6 @@ reformat(const FormatStyle &Style, StringRef Code,
       AnalyzerPass;
   SmallVector<AnalyzerPass, 8> Passes;
 
-  Passes.emplace_back([&](const Environment &Env) {
-    return IntegerLiteralSeparatorFixer().process(Env, Expanded);
-  });
-
   if (Style.isCpp()) {
     if (Style.QualifierAlignment != FormatStyle::QAS_Leave) {
       Passes.emplace_back([&](const Environment &Env) {