From a0f2dfb96e247443f43400a3a5634ee5e2d0ffbd Mon Sep 17 00:00:00 2001 From: "Maxim.Medvedev" Date: Sat, 12 May 2012 19:04:36 +0400 Subject: [PATCH] formatting --- .../groovy/lang/groovydoc/lexer/gdoc.flex | 93 +++++++++++-------- 1 file changed, 54 insertions(+), 39 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/gdoc.flex b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/gdoc.flex index d587bed073fe..80f95491eb07 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/gdoc.flex +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/lexer/gdoc.flex @@ -77,48 +77,63 @@ IDENTIFIER={ALPHA}({ALPHA}|{DIGIT}|[":.-"])* %% - "/**" { yybegin(COMMENT_DATA_START); return mGDOC_COMMENT_START; } - {WHITE_DOC_SPACE_CHAR}+ { return WHITE_SPACE; } - {WHITE_DOC_SPACE_NO_NL}+ { return mGDOC_COMMENT_DATA; } - [\n\r]+{WHITE_DOC_SPACE_CHAR}* { return WHITE_SPACE; } + "/**" { yybegin(COMMENT_DATA_START); + return mGDOC_COMMENT_START; } + {WHITE_DOC_SPACE_CHAR}+ { return WHITE_SPACE; } + {WHITE_DOC_SPACE_NO_NL}+ { return mGDOC_COMMENT_DATA; } + [\n\r]+{WHITE_DOC_SPACE_CHAR}* { return WHITE_SPACE; } - {WHITE_DOC_SPACE_CHAR}+ { yybegin(COMMENT_DATA); return WHITE_SPACE; } - ({ALPHA}|[_0-9\."$"\[\]])+ { return mGDOC_TAG_VALUE_TOKEN; } - [\(] { yybegin(DOC_TAG_VALUE_IN_PAREN); return mGDOC_TAG_VALUE_LPAREN; } - [\)] { yybegin(DOC_TAG_VALUE); return mGDOC_TAG_VALUE_RPAREN; } - [#] { return mGDOC_TAG_VALUE_SHARP_TOKEN; } - [,] { return mGDOC_TAG_VALUE_COMMA; } - {WHITE_DOC_SPACE_CHAR}+ { return WHITE_SPACE; } + {WHITE_DOC_SPACE_CHAR}+ { yybegin(COMMENT_DATA); + return WHITE_SPACE; } + ({ALPHA}|[_0-9\."$"\[\]])+ { return mGDOC_TAG_VALUE_TOKEN; } + [\(] { yybegin(DOC_TAG_VALUE_IN_PAREN); + return mGDOC_TAG_VALUE_LPAREN; } + [\)] { yybegin(DOC_TAG_VALUE); + return mGDOC_TAG_VALUE_RPAREN; } + [#] { return mGDOC_TAG_VALUE_SHARP_TOKEN; } + [,] { return mGDOC_TAG_VALUE_COMMA; } + {WHITE_DOC_SPACE_CHAR}+ { return WHITE_SPACE; } - "@param" { yybegin(PARAM_TAG_SPACE); return mGDOC_TAG_NAME; } - {WHITE_DOC_SPACE_CHAR}+ {yybegin(DOC_TAG_VALUE); return WHITE_SPACE;} - [\<] { yybegin(DOC_TAG_VALUE_IN_LTGT); return mGDOC_TAG_VALUE_LT; } - {IDENTIFIER} { return mGDOC_TAG_VALUE_TOKEN; } - [\>] { yybegin(COMMENT_DATA); return mGDOC_TAG_VALUE_GT; } + "@param" { yybegin(PARAM_TAG_SPACE); + return mGDOC_TAG_NAME; } + {WHITE_DOC_SPACE_CHAR}+ { yybegin(DOC_TAG_VALUE); + return WHITE_SPACE;} + [\<] { yybegin(DOC_TAG_VALUE_IN_LTGT); + return mGDOC_TAG_VALUE_LT; } + {IDENTIFIER} { return mGDOC_TAG_VALUE_TOKEN; } + [\>] { yybegin(COMMENT_DATA); + return mGDOC_TAG_VALUE_GT; } - "{" { - if (checkAhead('@')){ - yybegin(INLINE_TAG_NAME); - } - else{ - yybegin(COMMENT_DATA); - } - return mGDOC_INLINE_TAG_START; -} - "@"{IDENTIFIER} { yybegin(TAG_DOC_SPACE); return mGDOC_TAG_NAME; } - "}" { yybegin(COMMENT_DATA); return mGDOC_INLINE_TAG_END; } + "{" { if (checkAhead('@')){ + yybegin(INLINE_TAG_NAME); + } + else{ + yybegin(COMMENT_DATA); + } + return mGDOC_INLINE_TAG_START; + } + + "@"{IDENTIFIER} { yybegin(TAG_DOC_SPACE); + return mGDOC_TAG_NAME; } + "}" { yybegin(COMMENT_DATA); + return mGDOC_INLINE_TAG_END; } - . { yybegin(COMMENT_DATA); return mGDOC_COMMENT_DATA; } - "@"{IDENTIFIER} { yybegin(TAG_DOC_SPACE); return mGDOC_TAG_NAME; } - {WHITE_DOC_SPACE_CHAR}+ { + . { yybegin(COMMENT_DATA); + return mGDOC_COMMENT_DATA; } + "@"{IDENTIFIER} { yybegin(TAG_DOC_SPACE); + return mGDOC_TAG_NAME; } + {WHITE_DOC_SPACE_CHAR}+ { if (checkAhead('<') || checkAhead('\"')) { + yybegin(COMMENT_DATA); + } + else if (checkAhead('\u007b') ) { + yybegin(COMMENT_DATA); //lbrace - there's some error in JLex when typing lbrace directly + } + else { + yybegin(DOC_TAG_VALUE); + } + return WHITE_SPACE; + } - if (checkAhead('<') || checkAhead('\"')) yybegin(COMMENT_DATA); - else if (checkAhead('\u007b') ) yybegin(COMMENT_DATA); //lbrace - there's some error in JLex when typing lbrace directly - else yybegin(DOC_TAG_VALUE); - - return WHITE_SPACE; -} - -"*"+"/" { return mGDOC_COMMENT_END; } -[^] { return mGDOC_COMMENT_BAD_CHARACTER; } \ No newline at end of file +"*"+"/" { return mGDOC_COMMENT_END; } +[^] { return mGDOC_COMMENT_BAD_CHARACTER; } \ No newline at end of file