[PATCH] D141288: [clang-format] Inherit RightAlign options across scopes
Emilia Dreamer via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue Jan 10 20:02:42 PST 2023
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG51ba660a0700: [clang-format] Inherit RightAlign options across scopes (authored by rymiel).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D141288/new/
https://reviews.llvm.org/D141288
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
@@ -17693,6 +17693,20 @@
"dvsdsv <<= 5;\n"
"int dsvvdvsdvvv = 123;",
Alignment);
+ verifyFormat("int xxx = 5;\n"
+ "xxx = 5;\n"
+ "{\n"
+ " int yyy = 6;\n"
+ " yyy = 6;\n"
+ "}",
+ Alignment);
+ verifyFormat("int xxx = 5;\n"
+ "xxx += 5;\n"
+ "{\n"
+ " int yyy = 6;\n"
+ " yyy += 6;\n"
+ "}",
+ Alignment);
// Test that `<=` is not treated as a compound assignment.
verifyFormat("aa &= 5;\n"
"b <= 10;\n"
Index: clang/lib/Format/WhitespaceManager.cpp
===================================================================
--- clang/lib/Format/WhitespaceManager.cpp
+++ clang/lib/Format/WhitespaceManager.cpp
@@ -609,7 +609,8 @@
++CommasBeforeMatch;
} else if (Changes[i].indentAndNestingLevel() > IndentAndNestingLevel) {
// Call AlignTokens recursively, skipping over this scope block.
- unsigned StoppedAt = AlignTokens(Style, Matches, Changes, i, ACS);
+ unsigned StoppedAt =
+ AlignTokens(Style, Matches, Changes, i, ACS, RightJustify);
i = StoppedAt - 1;
continue;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D141288.488064.patch
Type: text/x-patch
Size: 1488 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20230111/ef7478c1/attachment.bin>
More information about the cfe-commits
mailing list