summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2016-02-22 20:24:11 +0000
committerDaniel Jasper <djasper@google.com>2016-02-22 20:24:11 +0000
commit2bc38701850ea612d40109e6e006c4d8f21cad0b (patch)
tree6ce3e14fdf95283b3c3677620fd9fc6a2855fee5 /clang/lib/Format
parent3b09d279be164f3e9a16b18eced38ee75a00e6fe (diff)
downloadbcm5719-llvm-2bc38701850ea612d40109e6e006c4d8f21cad0b.tar.gz
bcm5719-llvm-2bc38701850ea612d40109e6e006c4d8f21cad0b.zip
clang-format: [JS] Add @return to the supported JSDoc pragmas in Google
style. llvm-svn: 261563
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/Format.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 28648cafb1e..85a0152e295 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -587,7 +587,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
GoogleStyle.AlwaysBreakBeforeMultilineStrings = false;
GoogleStyle.BreakBeforeTernaryOperators = false;
- GoogleStyle.CommentPragmas = "@(export|see|visibility) ";
+ GoogleStyle.CommentPragmas = "@(export|return|see|visibility) ";
GoogleStyle.MaxEmptyLinesToKeep = 3;
GoogleStyle.SpacesInContainerLiterals = false;
} else if (Language == FormatStyle::LK_Proto) {
OpenPOWER on IntegriCloud