[PATCH] D72144: Treat C# `using` as a control statement
Jonathan B Coe via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Jan 23 02:58:20 PST 2020
jbcoe updated this revision to Diff 239836.
jbcoe added a comment.
Extended tests and added some comments explaining why seeming duplicated tests are useful.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72144/new/
https://reviews.llvm.org/D72144
Files:
clang/lib/Format/TokenAnnotator.cpp
clang/unittests/Format/FormatTestCSharp.cpp
Index: clang/unittests/Format/FormatTestCSharp.cpp
===================================================================
--- clang/unittests/Format/FormatTestCSharp.cpp
+++ clang/unittests/Format/FormatTestCSharp.cpp
@@ -235,20 +235,46 @@
Style.SpaceBeforeParens = FormatStyle::SBPO_Always;
verifyFormat("public void foo () {\n"
" using (StreamWriter sw = new StreamWriter (filenameA)) {}\n"
+ " using () {}\n"
"}",
Style);
+ // Ensure clang-format affects top-level snippets correctly.
verifyFormat("using (StreamWriter sw = new StreamWriter (filenameB)) {}",
Style);
Style.SpaceBeforeParens = FormatStyle::SBPO_Never;
verifyFormat("public void foo() {\n"
" using(StreamWriter sw = new StreamWriter(filenameB)) {}\n"
+ " using() {}\n"
"}",
Style);
+ // Ensure clang-format affects top-level snippets correctly.
verifyFormat("using(StreamWriter sw = new StreamWriter(filenameB)) {}",
Style);
+
+ Style.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements;
+ verifyFormat("public void foo() {\n"
+ " using (StreamWriter sw = new StreamWriter(filenameA)) {}\n"
+ " using () {}\n"
+ "}",
+ Style);
+
+ // Ensure clang-format affects top-level snippets correctly.
+ verifyFormat("using (StreamWriter sw = new StreamWriter(filenameB)) {}",
+ Style);
+
+ Style.SpaceBeforeParens = FormatStyle::SBPO_NonEmptyParentheses;
+ verifyFormat("public void foo() {\n"
+ " using (StreamWriter sw = new StreamWriter (filenameA)) {}\n"
+ " using() {}\n"
+ "}",
+ Style);
+
+ // Ensure clang-format affects top-level snippets correctly.
+ verifyFormat("using (StreamWriter sw = new StreamWriter (filenameB)) {}",
+ Style);
}
TEST_F(FormatTestCSharp, CSharpRegions) {
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -2869,7 +2869,8 @@
// space between keywords and paren e.g. "using ("
if (Right.is(tok::l_paren))
if (Left.is(tok::kw_using))
- return spaceRequiredBeforeParens(Left);
+ return Style.SpaceBeforeParens == FormatStyle::SBPO_ControlStatements ||
+ spaceRequiredBeforeParens(Right);
} else if (Style.Language == FormatStyle::LK_JavaScript) {
if (Left.is(TT_JsFatArrow))
return true;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D72144.239836.patch
Type: text/x-patch
Size: 2624 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200123/a065c92d/attachment.bin>
More information about the cfe-commits
mailing list