[PATCH] D29323: [clang-format] Don't reflow comment lines starting with '@'.
Krasimir Georgiev via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue Jan 31 03:49:24 PST 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rL293617: [clang-format] Don't reflow comment lines starting with '@'. (authored by krasimir).
Changed prior to commit:
https://reviews.llvm.org/D29323?vs=86405&id=86406#toc
Repository:
rL LLVM
https://reviews.llvm.org/D29323
Files:
cfe/trunk/lib/Format/BreakableToken.cpp
cfe/trunk/unittests/Format/FormatTest.cpp
Index: cfe/trunk/lib/Format/BreakableToken.cpp
===================================================================
--- cfe/trunk/lib/Format/BreakableToken.cpp
+++ cfe/trunk/lib/Format/BreakableToken.cpp
@@ -304,7 +304,9 @@
// Simple heuristic for what to reflow: content should contain at least two
// characters and either the first or second character must be
// non-punctuation.
- return Content.size() >= 2 && !Content.endswith("\\") &&
+ return Content.size() >= 2 &&
+ // Lines starting with '@' commonly have special meaning.
+ !Content.startswith("@") && !Content.endswith("\\") &&
// Note that this is UTF-8 safe, since if isPunctuation(Content[0]) is
// true, then the first code point must be 1 byte long.
(!isPunctuation(Content[0]) || !isPunctuation(Content[1]));
Index: cfe/trunk/unittests/Format/FormatTest.cpp
===================================================================
--- cfe/trunk/unittests/Format/FormatTest.cpp
+++ cfe/trunk/unittests/Format/FormatTest.cpp
@@ -2244,6 +2244,15 @@
"// long long long long\n"
"// ... --- ...",
getLLVMStyleWithColumns(20)));
+
+ // Don't reflow lines starting with '@'.
+ EXPECT_EQ("// long long long\n"
+ "// long\n"
+ "// @param arg",
+ format("// long long long long\n"
+ "// @param arg",
+ getLLVMStyleWithColumns(20)));
+
// Reflow lines that have a non-punctuation character among their first 2
// characters.
EXPECT_EQ("// long long long\n"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29323.86406.patch
Type: text/x-patch
Size: 1596 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170131/0106bc91/attachment.bin>
More information about the cfe-commits
mailing list