This revision was automatically updated to reflect the committed changes.
Closed by commit rG8b626a2caa67: [clang-format] Fix another bug in
AlignConsecutiveAssignments (authored by owenpan).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D124956/new/
https://reviews.llvm.org/D124956
Files:
clang/lib/Format/WhitespaceManager.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -18023,6 +18023,12 @@
"}",
Style);
+ verifyFormat("unsigned i = 0;\n"
+ "int a[] = {\n"
+ " 1234567890,\n"
+ " -1234567890};",
+ Style);
+
Style.ColumnLimit = 120;
// clang-format off
Index: clang/lib/Format/WhitespaceManager.cpp
===================================================================
--- clang/lib/Format/WhitespaceManager.cpp
+++ clang/lib/Format/WhitespaceManager.cpp
@@ -398,6 +398,8 @@
Changes[OuterScopeStart - 1].Tok->is(TT_LambdaLBrace))
return false;
}
+ if (Changes[ScopeStart].NewlinesBefore > 0)
+ return false;
return true;
}
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -18023,6 +18023,12 @@
"}",
Style);
+ verifyFormat("unsigned i = 0;\n"
+ "int a[] = {\n"
+ " 1234567890,\n"
+ " -1234567890};",
+ Style);
+
Style.ColumnLimit = 120;
// clang-format off
Index: clang/lib/Format/WhitespaceManager.cpp
===================================================================
--- clang/lib/Format/WhitespaceManager.cpp
+++ clang/lib/Format/WhitespaceManager.cpp
@@ -398,6 +398,8 @@
Changes[OuterScopeStart - 1].Tok->is(TT_LambdaLBrace))
return false;
}
+ if (Changes[ScopeStart].NewlinesBefore > 0)
+ return false;
return true;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
