[PATCH] D85016: [clang-format] Add space between method modifier and a tuple return type in C#
Ćukasz Krawczyk via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Fri Jul 31 03:17:59 PDT 2020
lbk created this revision.
lbk added reviewers: jbcoe, krasimir.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
lbk requested review of this revision.
"public (string name, int age) methodTuple() {}" is now properly spaced
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D85016
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
@@ -777,6 +777,9 @@
verifyFormat(R"(private float[ , ] Values;)", Style);
verifyFormat(R"(string dirPath = args?[ 0 ];)", Style);
verifyFormat(R"(char[ ,, ] rawCharArray = MakeCharacterGrid();)", Style);
+
+ // Method returning tuple
+ verifyFormat(R"(public (string name, int age) methodTuple() {})", Style);
}
TEST_F(FormatTestCSharp, CSharpNullableTypes) {
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -3115,6 +3115,16 @@
Keywords.kw_lock))
return Style.SpaceBeforeParens == FormatStyle::SBPO_ControlStatements ||
spaceRequiredBeforeParens(Right);
+
+ // space between method modifier and opening parenthesis of a tuple return
+ // type
+ if (Left.isOneOf(tok::kw_public, tok::kw_private, tok::kw_protected,
+ tok::kw_virtual, tok::kw_extern, tok::kw_static,
+ tok::kw_new, Keywords.kw_internal, Keywords.kw_abstract,
+ Keywords.kw_sealed, Keywords.kw_override,
+ Keywords.kw_async, Keywords.kw_unsafe) &&
+ Right.is(tok::l_paren))
+ return true;
} else if (Style.Language == FormatStyle::LK_JavaScript) {
if (Left.is(TT_JsFatArrow))
return true;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D85016.282175.patch
Type: text/x-patch
Size: 1594 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200731/2da534be/attachment.bin>
More information about the cfe-commits
mailing list