Author: djasper Date: Fri Jan 8 02:14:58 2016 New Revision: 257159 URL: http://llvm.org/viewvc/llvm-project?rev=257159&view=rev Log: clang-format: [JS] Add some Closure Compiler JSDoc tags to the default Google configuration so that they aren't line-wrapped.
Modified: cfe/trunk/lib/Format/Format.cpp cfe/trunk/unittests/Format/FormatTestJS.cpp Modified: cfe/trunk/lib/Format/Format.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=257159&r1=257158&r2=257159&view=diff ============================================================================== --- cfe/trunk/lib/Format/Format.cpp (original) +++ cfe/trunk/lib/Format/Format.cpp Fri Jan 8 02:14:58 2016 @@ -583,6 +583,7 @@ FormatStyle getGoogleStyle(FormatStyle:: GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; GoogleStyle.AlwaysBreakBeforeMultilineStrings = false; GoogleStyle.BreakBeforeTernaryOperators = false; + GoogleStyle.CommentPragmas = "@(export|visibility) {"; GoogleStyle.MaxEmptyLinesToKeep = 3; GoogleStyle.SpacesInContainerLiterals = false; } else if (Language == FormatStyle::LK_Proto) { Modified: cfe/trunk/unittests/Format/FormatTestJS.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestJS.cpp?rev=257159&r1=257158&r2=257159&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTestJS.cpp (original) +++ cfe/trunk/unittests/Format/FormatTestJS.cpp Fri Jan 8 02:14:58 2016 @@ -1030,5 +1030,15 @@ TEST_F(FormatTestJS, WrapAfterParen) { " bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}"); } +TEST_F(FormatTestJS, JSDocAnnotations) { + EXPECT_EQ("/**\n" + " * @export {this.is.a.long.path.to.a.Type}\n" + " */", + format("/**\n" + " * @export {this.is.a.long.path.to.a.Type}\n" + " */", + getGoogleJSStyleWithColumns(20))); +} + } // end namespace tooling } // end namespace clang _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits