mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-27 06:46:07 +00:00
Code Issues Projects Releases Wiki Activity

[clang-format] Fix a bug that joins template closer and =

Browse Source 
Also fixes the documentation for SpaceBeforeAssignmentOperators.

See discussions at https://reviews.llvm.org/D66332

Differential Revision: https://reviews.llvm.org/D66384

llvm-svn: 369214
This commit is contained in:
Owen Pan 2019-08-18 18:51:39 +00:00
parent 63b3c56fca
commit 37860d524e
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/docs/ClangFormatStyleOptions.rst
View File

@ -2050,8 +2050,8 @@ the configuration (without a prefix: ``Auto``).
.. code-block:: c++
true: false:
int a = 5; vs. int a=5;
a += 42 a+=42;
int a = 5; vs. int a= 5;
a += 42; a+= 42;
**SpaceBeforeCpp11BracedList** (``bool``)
If ``true``, a space will be inserted before a C++11 braced list

4
clang/include/clang/Format/Format.h
View File

@ -1738,8 +1738,8 @@ struct FormatStyle {
/// If ``false``, spaces will be removed before assignment operators.
/// \code
/// true: false:
/// int a = 5; vs. int a=5;
/// a += 42 a+=42;
/// int a = 5; vs. int a= 5;
/// a += 42; a+= 42;
/// \endcode
bool SpaceBeforeAssignmentOperators;

2
clang/lib/Format/TokenAnnotator.cpp
View File

@ -2870,7 +2870,7 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
Left.isOneOf(tok::arrow, tok::period, tok::arrowstar, tok::periodstar) ||
(Right.is(tok::period) && Right.isNot(TT_DesignatedInitializerPeriod)))
return false;
if (!Style.SpaceBeforeAssignmentOperators &&
if (!Style.SpaceBeforeAssignmentOperators && Left.isNot(TT_TemplateCloser) &&
Right.getPrecedence() == prec::Assignment)
return false;
if (Style.Language == FormatStyle::LK_Java && Right.is(tok::coloncolon) &&

9
clang/unittests/Format/FormatTest.cpp
View File

@ -6620,8 +6620,15 @@ TEST_F(FormatTest, UnderstandsTemplateParameters) {
verifyFormat("A<A<int>> a;", getChromiumStyle(FormatStyle::LK_Cpp));
verifyFormat("int i = a<1> >> 1;");
// template closer followed by a token that starts with > or =
verifyFormat("bool b = a<1> > 1;");
verifyFormat("bool b = a<1> >= 1;");
verifyFormat("int i = a<1> >> 1;");
FormatStyle Style = getLLVMStyle();
Style.SpaceBeforeAssignmentOperators = false;
verifyFormat("bool b= a<1> == 1;", Style);
verifyFormat("a<int> = 1;", Style);
verifyFormat("a<int> >>= 1;", Style);
verifyFormat("test >> a >> b;");
verifyFormat("test << a >> b;");