commit 2bc38701850ea612d40109e6e006c4d8f21cad0b
author Daniel Jasper <djasper@google.com> Mon Feb 22 20:24:11 2016 +0000
committer Daniel Jasper <djasper@google.com> Mon Feb 22 20:24:11 2016 +0000
tree 6ce3e14fdf95283b3c3677620fd9fc6a2855fee5
parent 3b09d279be164f3e9a16b18eced38ee75a00e6fe

clang-format: [JS] Add @return to the supported JSDoc pragmas in Google
style.

llvm-svn: 261563

clang/lib/Format/Format.cpp

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 28648ca..85a0152 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -587,7 +587,7 @@
     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) {