Hi djasper,
Parameters can have templated types and default values (= ...), which is another
location in which a template closer should be followed by whitespace.
http://reviews.llvm.org/D9446
Files:
lib/Format/TokenAnnotator.cpp
unittests/Format/FormatTestJS.cpp
Index: lib/Format/TokenAnnotator.cpp
===================================================================
--- lib/Format/TokenAnnotator.cpp
+++ lib/Format/TokenAnnotator.cpp
@@ -1804,7 +1804,7 @@
Line.First->isOneOf(Keywords.kw_import, tok::kw_export))
return false;
if (Left.is(TT_TemplateCloser) &&
- !Right.isOneOf(tok::l_brace, tok::comma, tok::l_square,
+ !Right.isOneOf(tok::equal, tok::l_brace, tok::comma, tok::l_square,
Keywords.kw_implements, Keywords.kw_extends))
// Type assertions ('<type>expr') are not followed by whitespace. Other
// locations that should have whitespace following are identified by the
@@ -1839,6 +1839,7 @@
(Right.is(tok::equal) || Left.is(tok::equal)))
return false;
+
if (Right.is(TT_TrailingReturnArrow) || Left.is(TT_TrailingReturnArrow))
return true;
if (Left.is(tok::comma))
Index: unittests/Format/FormatTestJS.cpp
===================================================================
--- unittests/Format/FormatTestJS.cpp
+++ unittests/Format/FormatTestJS.cpp
@@ -687,6 +687,8 @@
verifyFormat("foo<Y>(a);");
verifyFormat("var x: X<Y>[];");
verifyFormat("class C extends D<E> implements F<G>, H<I> {}");
+ verifyFormat("function f(a: List<any> = null) {\n}");
+ verifyFormat("function f(): List<any> {\n}");
}
TEST_F(FormatTestJS, OptionalTypes) {
EMAIL PREFERENCES
http://reviews.llvm.org/settings/panel/emailpreferences/
Index: lib/Format/TokenAnnotator.cpp
===================================================================
--- lib/Format/TokenAnnotator.cpp
+++ lib/Format/TokenAnnotator.cpp
@@ -1804,7 +1804,7 @@
Line.First->isOneOf(Keywords.kw_import, tok::kw_export))
return false;
if (Left.is(TT_TemplateCloser) &&
- !Right.isOneOf(tok::l_brace, tok::comma, tok::l_square,
+ !Right.isOneOf(tok::equal, tok::l_brace, tok::comma, tok::l_square,
Keywords.kw_implements, Keywords.kw_extends))
// Type assertions ('<type>expr') are not followed by whitespace. Other
// locations that should have whitespace following are identified by the
@@ -1839,6 +1839,7 @@
(Right.is(tok::equal) || Left.is(tok::equal)))
return false;
+
if (Right.is(TT_TrailingReturnArrow) || Left.is(TT_TrailingReturnArrow))
return true;
if (Left.is(tok::comma))
Index: unittests/Format/FormatTestJS.cpp
===================================================================
--- unittests/Format/FormatTestJS.cpp
+++ unittests/Format/FormatTestJS.cpp
@@ -687,6 +687,8 @@
verifyFormat("foo<Y>(a);");
verifyFormat("var x: X<Y>[];");
verifyFormat("class C extends D<E> implements F<G>, H<I> {}");
+ verifyFormat("function f(a: List<any> = null) {\n}");
+ verifyFormat("function f(): List<any> {\n}");
}
TEST_F(FormatTestJS, OptionalTypes) {
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
