diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Format/Format.cpp | 15 | ||||
| -rw-r--r-- | lib/Format/UnwrappedLineParser.cpp | 12 |
2 files changed, 25 insertions, 2 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 7a6b6e2081..5c433834c8 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -510,8 +510,19 @@ private: if (Newlines == 0 && !Token.IsFirst) Newlines = 1; unsigned Indent = Line.Level * 2; - if ((Token.Tok.is(tok::kw_public) || Token.Tok.is(tok::kw_protected) || - Token.Tok.is(tok::kw_private)) && + + bool IsAccessModifier = false; + if (Token.Tok.is(tok::kw_public) || Token.Tok.is(tok::kw_protected) || + Token.Tok.is(tok::kw_private)) + IsAccessModifier = true; + else if (Token.Tok.is(tok::at) && Line.Tokens.size() > 1 && + (Line.Tokens[1].Tok.isObjCAtKeyword(tok::objc_public) || + Line.Tokens[1].Tok.isObjCAtKeyword(tok::objc_protected) || + Line.Tokens[1].Tok.isObjCAtKeyword(tok::objc_package) || + Line.Tokens[1].Tok.isObjCAtKeyword(tok::objc_private))) + IsAccessModifier = true; + + if (IsAccessModifier && static_cast<int>(Indent) + Style.AccessModifierOffset >= 0) Indent += Style.AccessModifierOffset; if (!Line.InPPDirective || Token.HasUnescapedNewline) diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp index d7220259b7..adb536324a 100644 --- a/lib/Format/UnwrappedLineParser.cpp +++ b/lib/Format/UnwrappedLineParser.cpp @@ -198,6 +198,18 @@ void UnwrappedLineParser::parseStructuralElement() { int TokenNumber = 0; switch (FormatTok.Tok.getKind()) { + case tok::at: + nextToken(); + switch (FormatTok.Tok.getObjCKeywordID()) { + case tok::objc_public: + case tok::objc_protected: + case tok::objc_package: + case tok::objc_private: + return parseAccessSpecifier(); + default: + break; + } + break; case tok::kw_namespace: parseNamespace(); return; |