forked from OSchip/llvm-project
clang-format: [JS/Java] ignore Objective-C constructs in JS & Java.
Summary: Java and JavaScript support annotations and decorators, respectively, that use a leading "@" token. clang-format currently detects this as an Objective-C construct and applies special formatting, for example no whitespace around "=" operators. This change disables the distinction for Java and JavaScript, which leads to normal formatting of single line annotated and initialized properties. Before: class X { @foo() bar=false; } After: class X { @foo() bar = false; } Reviewers: djasper, bkramer Subscribers: klimek, cfe-commits Differential Revision: https://reviews.llvm.org/D32532 llvm-svn: 301399
This commit is contained in:
parent
07a0307a40
commit
ad06391ca9
|
@ -1120,7 +1120,11 @@ private:
|
|||
Current.Type = TT_FunctionAnnotationRParen;
|
||||
}
|
||||
}
|
||||
} else if (Current.is(tok::at) && Current.Next) {
|
||||
} else if (Current.is(tok::at) && Current.Next &&
|
||||
Style.Language != FormatStyle::LK_JavaScript &&
|
||||
Style.Language != FormatStyle::LK_Java) {
|
||||
// In Java & JavaScript, "@..." is a decorator or annotation. In ObjC, it
|
||||
// marks declarations and properties that need special formatting.
|
||||
switch (Current.Next->Tok.getObjCKeywordID()) {
|
||||
case tok::objc_interface:
|
||||
case tok::objc_implementation:
|
||||
|
|
|
@ -1239,6 +1239,9 @@ TEST_F(FormatTestJS, MetadataAnnotations) {
|
|||
"}");
|
||||
verifyFormat("class X {}\n"
|
||||
"class Y {}");
|
||||
verifyFormat("class X {\n"
|
||||
" @property() private isReply = false;\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
TEST_F(FormatTestJS, TypeAliases) {
|
||||
|
|
Loading…
Reference in New Issue