intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-21 03:21:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[clang-format] Add OneLineFormatOffRegex option (#137577)"

Browse Source 
This reverts commit b8bb1ccb4f which triggered
an assertion failure in CodeGenTest.TestNonAlterTest.
This commit is contained in:
Owen Pan
2025-04-30 00:09:29 -07:00
parent 38cb7d5e75
commit 7752e0a10b
7 changed files with 0 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
clang/docs/ClangFormatStyleOptions.rst
View File

@@ -5195,29 +5195,6 @@ the configuration (without a prefix: ``Auto``).
Add a space in front of an Objective-C protocol list, i.e. use
``Foo <Protocol>`` instead of ``Foo<Protocol>``.
.. _OneLineFormatOffRegex:
**OneLineFormatOffRegex** (``String``) :versionbadge:`clang-format 21` :ref:`¶ <OneLineFormatOffRegex>`
A regular expression that describes markers for turning formatting off for
one line. If it matches a comment that is the only token of a line,
clang-format skips the comment and the next line. Otherwise, clang-format
skips lines containing a matched token.
.. code-block:: c++
// OneLineFormatOffRegex: ^(// NOLINT|logger$)
// results in the output below:
int a;
int b ; // NOLINT
int c;
// NOLINTNEXTLINE
int d ;
int e;
s = "// NOLINT";
logger() ;
logger2();
my_logger();
.. _PPIndentWidth:
**PPIndentWidth** (``Integer``) :versionbadge:`clang-format 13` :ref:`¶ <PPIndentWidth>`

1
clang/docs/ReleaseNotes.rst
View File

@@ -720,7 +720,6 @@ clang-format
top of the file.
- Add ``EnumTrailingComma`` option for inserting/removing commas at the end of
``enum`` enumerator lists.
- Add ``OneLineFormatOffRegex`` option for turning formatting off for one line.
libclang
--------

22
clang/include/clang/Format/Format.h
View File

@@ -3654,27 +3654,6 @@ struct FormatStyle {
/// \version 3.7
bool ObjCSpaceBeforeProtocolList;
/// A regular expression that describes markers for turning formatting off for
/// one line. If it matches a comment that is the only token of a line,
/// clang-format skips the comment and the next line. Otherwise, clang-format
/// skips lines containing a matched token.
/// \code
/// // OneLineFormatOffRegex: ^(// NOLINT|logger$)
/// // results in the output below:
/// int a;
/// int b ; // NOLINT
/// int c;
/// // NOLINTNEXTLINE
/// int d ;
/// int e;
/// s = "// NOLINT";
/// logger() ;
/// logger2();
/// my_logger();
/// \endcode
/// \version 21
std::string OneLineFormatOffRegex;
/// Different ways to try to fit all constructor initializers on a line.
enum PackConstructorInitializersStyle : int8_t {
/// Always put each constructor initializer on its own line.
@@ -5420,7 +5399,6 @@ struct FormatStyle {
ObjCPropertyAttributeOrder == R.ObjCPropertyAttributeOrder &&
ObjCSpaceAfterProperty == R.ObjCSpaceAfterProperty &&
ObjCSpaceBeforeProtocolList == R.ObjCSpaceBeforeProtocolList &&
OneLineFormatOffRegex == R.OneLineFormatOffRegex &&
PackConstructorInitializers == R.PackConstructorInitializers &&
PenaltyBreakAssignment == R.PenaltyBreakAssignment &&
PenaltyBreakBeforeFirstCallParameter ==

1
clang/lib/Format/Format.cpp
View File

@@ -1100,7 +1100,6 @@ template <> struct MappingTraits<FormatStyle> {
IO.mapOptional("ObjCSpaceAfterProperty", Style.ObjCSpaceAfterProperty);
IO.mapOptional("ObjCSpaceBeforeProtocolList",
Style.ObjCSpaceBeforeProtocolList);
IO.mapOptional("OneLineFormatOffRegex", Style.OneLineFormatOffRegex);
IO.mapOptional("PackConstructorInitializers",
Style.PackConstructorInitializers);
IO.mapOptional("PenaltyBreakAssignment", Style.PenaltyBreakAssignment);

35
clang/lib/Format/FormatTokenLexer.cpp
View File

@@ -83,43 +83,8 @@ FormatTokenLexer::FormatTokenLexer(
ArrayRef<FormatToken *> FormatTokenLexer::lex() {
assert(Tokens.empty());
assert(FirstInLineIndex == 0);
const llvm::Regex FormatOffRegex(Style.OneLineFormatOffRegex);
enum { FO_None, FO_CurrentLine, FO_NextLine } FormatOff = FO_None;
do {
Tokens.push_back(getNextToken());
auto &Tok = *Tokens.back();
const auto NewlinesBefore = Tok.NewlinesBefore;
switch (FormatOff) {
case FO_CurrentLine:
if (NewlinesBefore == 0)
Tok.Finalized = true;
else
FormatOff = FO_None;
break;
case FO_NextLine:
if (NewlinesBefore > 1) {
FormatOff = FO_None;
} else {
Tok.Finalized = true;
FormatOff = FO_CurrentLine;
}
break;
default:
if (!FormattingDisabled && FormatOffRegex.match(Tok.TokenText)) {
if (Tok.is(tok::comment) &&
(NewlinesBefore > 0 || &Tok == Tokens.front())) {
Tok.Finalized = true;
FormatOff = FO_NextLine;
} else {
for (auto *Token : reverse(Tokens)) {
Token->Finalized = true;
if (Token->NewlinesBefore > 0)
break;
}
FormatOff = FO_CurrentLine;
}
}
}
if (Style.isJavaScript()) {
tryParseJSRegexLiteral();
handleTemplateStrings();

1
clang/unittests/Format/ConfigParseTest.cpp
View File

@@ -295,7 +295,6 @@ TEST(ConfigParseTest, ParsesConfiguration) {
FormatStyle Style = {};
Style.Language = FormatStyle::LK_Cpp;
CHECK_PARSE("CommentPragmas: '// abc$'", CommentPragmas, "// abc$");
CHECK_PARSE("OneLineFormatOffRegex: // ab$", OneLineFormatOffRegex, "// ab$");
Style.QualifierAlignment = FormatStyle::QAS_Right;
CHECK_PARSE("QualifierAlignment: Leave", QualifierAlignment,

99
clang/unittests/Format/FormatTest.cpp
View File

@@ -24954,105 +24954,6 @@ TEST_F(FormatTest, DisableRegions) {
"// clang-format on");
}
TEST_F(FormatTest, OneLineFormatOffRegex) {
auto Style = getLLVMStyle();
Style.OneLineFormatOffRegex = "// format off$";
verifyFormat(" // format off\n"
" int i ;\n"
"int j;",
" // format off\n"
" int i ;\n"
" int j ;",
Style);
verifyFormat("// format off?\n"
"int i;",
" // format off?\n"
" int i ;",
Style);
verifyFormat("f(\"// format off\");", " f(\"// format off\") ;", Style);
verifyFormat("int i;\n"
" // format off\n"
" int j ;\n"
"int k;",
" int i ;\n"
" // format off\n"
" int j ;\n"
" int k ;",
Style);
verifyFormat(" // format off\n"
"\n"
"int i;",
" // format off\n"
" \n"
" int i ;",
Style);
verifyFormat("int i;\n"
" int j ; // format off\n"
"int k;",
" int i ;\n"
" int j ; // format off\n"
" int k ;",
Style);
verifyFormat("// clang-format off\n"
" int i ;\n"
" int j ; // format off\n"
" int k ;\n"
"// clang-format on\n"
"f();",
" // clang-format off\n"
" int i ;\n"
" int j ; // format off\n"
" int k ;\n"
" // clang-format on\n"
" f() ;",
Style);
Style.OneLineFormatOffRegex = "^/\\* format off \\*/";
verifyFormat("int i;\n"
" /* format off */ int j ;\n"
"int k;",
" int i ;\n"
" /* format off */ int j ;\n"
" int k ;",
Style);
verifyFormat("f(\"/* format off */\");", " f(\"/* format off */\") ;", Style);
Style.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign;
verifyFormat("#define A \\\n"
" do { \\\n"
" /* format off */\\\n"
" f() ; \\\n"
" g(); \\\n"
" } while (0)",
"# define A\\\n"
" do{ \\\n"
" /* format off */\\\n"
" f() ; \\\n"
" g() ;\\\n"
" } while (0 )",
Style);
Style.ColumnLimit = 50;
Style.OneLineFormatOffRegex = "^LogErrorPrint$";
verifyFormat(" myproject::LogErrorPrint(logger, \"Don't split me!\");\n"
"myproject::MyLogErrorPrinter(myLogger,\n"
" \"Split me!\");",
" myproject::LogErrorPrint(logger, \"Don't split me!\");\n"
" myproject::MyLogErrorPrinter(myLogger, \"Split me!\");",
Style);
Style.OneLineFormatOffRegex = "//(< clang-format off| NO_TRANSLATION)$";
verifyNoChange(
" int i ; //< clang-format off\n"
" msg = sprintf(\"Long string with placeholders.\"); // NO_TRANSLATION",
Style);
}
TEST_F(FormatTest, DoNotCrashOnInvalidInput) {
format("? ) =");
verifyNoCrash("#define a\\\n /**/}");