diff --git a/gen/org/elixir_lang/parser/ElixirParser.java b/gen/org/elixir_lang/parser/ElixirParser.java index eaed43546..9d54939ad 100644 --- a/gen/org/elixir_lang/parser/ElixirParser.java +++ b/gen/org/elixir_lang/parser/ElixirParser.java @@ -1936,7 +1936,7 @@ private static boolean expressionList_1_0(PsiBuilder b, int l) { } /* ********************************************************** */ - // EOL | CLOSING_BIT | CLOSING_BRACKET | CLOSING_CURLY | CLOSING_PARENTHESIS | INTERPOLATION_END | SEMICOLON | STAB_OPERATOR | END | blockIdentifier | EEX_CLOSING + // EOL | CLOSING_BIT | CLOSING_BRACKET | CLOSING_CURLY | CLOSING_PARENTHESIS | COMMA | INTERPOLATION_END | SEMICOLON | STAB_OPERATOR | END | blockIdentifier | EEX_CLOSING static boolean expressionRecoverUntil(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "expressionRecoverUntil")) return false; boolean r; @@ -1946,6 +1946,7 @@ static boolean expressionRecoverUntil(PsiBuilder b, int l) { if (!r) r = consumeToken(b, CLOSING_BRACKET); if (!r) r = consumeToken(b, CLOSING_CURLY); if (!r) r = consumeToken(b, CLOSING_PARENTHESIS); + if (!r) r = consumeToken(b, COMMA); if (!r) r = consumeToken(b, INTERPOLATION_END); if (!r) r = consumeToken(b, SEMICOLON); if (!r) r = consumeToken(b, STAB_OPERATOR); @@ -3656,6 +3657,26 @@ private static boolean multiplicationInfixOperator_1(PsiBuilder b, int l) { return r; } + /* ********************************************************** */ + // stabInfixOperator stabBody? + public static boolean noArgumentStabOperation(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "noArgumentStabOperation")) return false; + if (!nextTokenIs(b, "", EOL, STAB_OPERATOR)) return false; + boolean r; + Marker m = enter_section_(b, l, _NONE_, STAB_OPERATION, ""); + r = stabInfixOperator(b, l + 1); + r = r && noArgumentStabOperation_1(b, l + 1); + exit_section_(b, l, m, r, false, null); + return r; + } + + // stabBody? + private static boolean noArgumentStabOperation_1(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "noArgumentStabOperation_1")) return false; + stabBody(b, l + 1); + return true; + } + /* ********************************************************** */ // noParenthesesOneArgument | // noParenthesesManyArguments @@ -4566,7 +4587,7 @@ private static boolean stabBody_1_0(PsiBuilder b, int l) { /* ********************************************************** */ // EEX_CLOSING eex EEX_OPENING | - // !stabOperationPrefix expression + // expression !(infixComma | stabInfixOperator) static boolean stabBodyExpression(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "stabBodyExpression")) return false; boolean r; @@ -4589,27 +4610,38 @@ private static boolean stabBodyExpression_0(PsiBuilder b, int l) { return r; } - // !stabOperationPrefix expression + // expression !(infixComma | stabInfixOperator) private static boolean stabBodyExpression_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "stabBodyExpression_1")) return false; boolean r; Marker m = enter_section_(b); - r = stabBodyExpression_1_0(b, l + 1); - r = r && expression(b, l + 1); + r = expression(b, l + 1); + r = r && stabBodyExpression_1_1(b, l + 1); exit_section_(b, m, null, r); return r; } - // !stabOperationPrefix - private static boolean stabBodyExpression_1_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "stabBodyExpression_1_0")) return false; + // !(infixComma | stabInfixOperator) + private static boolean stabBodyExpression_1_1(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "stabBodyExpression_1_1")) return false; boolean r; Marker m = enter_section_(b, l, _NOT_); - r = !stabOperationPrefix(b, l + 1); + r = !stabBodyExpression_1_1_0(b, l + 1); exit_section_(b, l, m, r, false, null); return r; } + // infixComma | stabInfixOperator + private static boolean stabBodyExpression_1_1_0(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "stabBodyExpression_1_1_0")) return false; + boolean r; + Marker m = enter_section_(b); + r = infixComma(b, l + 1); + if (!r) r = stabInfixOperator(b, l + 1); + exit_section_(b, m, null, r); + return r; + } + /* ********************************************************** */ // EEX_EMPTY_MARKER | endOfExpression static boolean stabBodyExpressionSeparator(PsiBuilder b, int l) { @@ -4676,15 +4708,13 @@ private static boolean stabOperation_1(PsiBuilder b, int l) { /* ********************************************************** */ // stabParenthesesSignature stabInfixOperator | - // stabNoParenthesesSignature stabInfixOperator | - // stabInfixOperator + // stabNoParenthesesSignature stabInfixOperator static boolean stabOperationPrefix(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "stabOperationPrefix")) return false; boolean r; Marker m = enter_section_(b); r = stabOperationPrefix_0(b, l + 1); if (!r) r = stabOperationPrefix_1(b, l + 1); - if (!r) r = stabInfixOperator(b, l + 1); exit_section_(b, m, null, r); return r; } @@ -4712,32 +4742,44 @@ private static boolean stabOperationPrefix_1(PsiBuilder b, int l) { } /* ********************************************************** */ - // stabOperation (stabBodyExpressionSeparator stabOperation)* + // noArgumentStabOperation | + // stabOperation (stabBodyExpressionSeparator stabOperation)* static boolean stabOperations(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "stabOperations")) return false; boolean r; Marker m = enter_section_(b); - r = stabOperation(b, l + 1); - r = r && stabOperations_1(b, l + 1); + r = noArgumentStabOperation(b, l + 1); + if (!r) r = stabOperations_1(b, l + 1); exit_section_(b, m, null, r); return r; } - // (stabBodyExpressionSeparator stabOperation)* + // stabOperation (stabBodyExpressionSeparator stabOperation)* private static boolean stabOperations_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "stabOperations_1")) return false; + boolean r; + Marker m = enter_section_(b); + r = stabOperation(b, l + 1); + r = r && stabOperations_1_1(b, l + 1); + exit_section_(b, m, null, r); + return r; + } + + // (stabBodyExpressionSeparator stabOperation)* + private static boolean stabOperations_1_1(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "stabOperations_1_1")) return false; int c = current_position_(b); while (true) { - if (!stabOperations_1_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "stabOperations_1", c)) break; + if (!stabOperations_1_1_0(b, l + 1)) break; + if (!empty_element_parsed_guard_(b, "stabOperations_1_1", c)) break; c = current_position_(b); } return true; } // stabBodyExpressionSeparator stabOperation - private static boolean stabOperations_1_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "stabOperations_1_0")) return false; + private static boolean stabOperations_1_1_0(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "stabOperations_1_1_0")) return false; boolean r; Marker m = enter_section_(b); r = stabBodyExpressionSeparator(b, l + 1); diff --git a/src/org/elixir_lang/Elixir.bnf b/src/org/elixir_lang/Elixir.bnf index 40a94d8c7..94e8532ca 100644 --- a/src/org/elixir_lang/Elixir.bnf +++ b/src/org/elixir_lang/Elixir.bnf @@ -541,7 +541,7 @@ private expression ::= emptyParentheses | // CLOSING_* because they are endings to subexpressions // STAB_OPERATOR because it ends when clause for no parentheses stab guard clauses // blockIdentifier for one-liner blockItems where there isn't a newline between block expressions and following blockIdentifier. -private expressionRecoverUntil ::= EOL | CLOSING_BIT | CLOSING_BRACKET | CLOSING_CURLY | CLOSING_PARENTHESIS | INTERPOLATION_END | SEMICOLON | STAB_OPERATOR | END | blockIdentifier | EEX_CLOSING +private expressionRecoverUntil ::= EOL | CLOSING_BIT | CLOSING_BRACKET | CLOSING_CURLY | CLOSING_PARENTHESIS | COMMA | INTERPOLATION_END | SEMICOLON | STAB_OPERATOR | END | blockIdentifier | EEX_CLOSING private expressionRecoverWhile ::= !expressionRecoverUntil private expressionList ::= expression (endOfExpression expression)* @@ -2149,10 +2149,9 @@ stabInfixOperator ::= eolStar STAB_OPERATOR eolStar * for grouping stab followed by expression into stab, so it is equivalent to expr_list (expressionList) */ private stabOperationPrefix ::= stabParenthesesSignature stabInfixOperator | - stabNoParenthesesSignature stabInfixOperator | - stabInfixOperator + stabNoParenthesesSignature stabInfixOperator private stabBodyExpression ::= EEX_CLOSING eex EEX_OPENING | - !stabOperationPrefix expression + expression !(infixComma | stabInfixOperator) private stabBodyExpressionSeparator ::= EEX_EMPTY_MARKER | endOfExpression private stabBodyExpressionSeparatorMaybe ::= stabBodyExpressionSeparator? stabBody ::= stabBodyExpression (stabBodyExpressionSeparator stabBodyExpression)* @@ -2164,6 +2163,8 @@ stabBody ::= stabBodyExpression (stabBodyExpressionSeparator stabBodyExpression) ] } +noArgumentStabOperation ::= stabInfixOperator stabBody? + { elementType = stabOperation } stabOperation ::= stabOperationPrefix stabBody? { implements = "org.elixir_lang.psi.Quotable" @@ -2176,7 +2177,8 @@ stabOperation ::= stabOperationPrefix stabBody? ] } -private stabOperations ::= stabOperation (stabBodyExpressionSeparator stabOperation)* +private stabOperations ::= noArgumentStabOperation | + stabOperation (stabBodyExpressionSeparator stabOperation)* // @see https://github.com/elixir-lang/elixir/blob/de39bbaca277002797e52ffbde617ace06233a2b/lib/elixir/src/elixir_parser.yrl#L268-L269 stab ::= stabOperations | stabBody diff --git a/src/org/elixir_lang/Elixir.flex b/src/org/elixir_lang/Elixir.flex index 1a8714033..5adf6fed3 100644 --- a/src/org/elixir_lang/Elixir.flex +++ b/src/org/elixir_lang/Elixir.flex @@ -334,6 +334,8 @@ HORIZONTAL_SPACE = [ \t] VERTICAL_SPACE = [\n\r] SPACE = {HORIZONTAL_SPACE} | {VERTICAL_SPACE} WHITE_SPACE=[\ \t\f] +MULTILINE_WHITE_SPACE = ({ESCAPED_EOL} | {EOL} | {WHITE_SPACE})+ +LAST_EOL = {MULTILINE_WHITE_SPACE}? {EOL} ({ESCAPED_EOL} | {WHITE_SPACE})* // see https://github.com/elixir-lang/elixir/blob/de39bbaca277002797e52ffbde617ace06233a2b/lib/elixir/src/elixir_tokenizer.erl#L609-L610 SPACE_SENSITIVE={DUAL_OPERATOR}[^(\[<{%+-/>:] @@ -547,6 +549,8 @@ SIGIL_HEREDOC_TERMINATOR = {SIGIL_DOUBLE_QUOTES_HEREDOC_TERMINATOR}|{SIGIL_SINGL GROUP_TERMINATOR = {QUOTE_TERMINATOR}|{SIGIL_TERMINATOR} GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} +ANY = [^] + /* * States - Ordered lexigraphically */ @@ -576,6 +580,9 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} %state HEXADECIMAL_WHOLE_NUMBER %state INTERPOLATION %state KEYWORD_PAIR_MAYBE +%state KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE +%state LAST_EOL +%state MULTILINE_WHITE_SPACE_MAYBE %state NAMED_SIGIL %state OCTAL_WHOLE_NUMBER %state SIGN_OPERATION @@ -593,7 +600,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} Rules that aren't dependent on detecting the end of INTERPOLATION can be shared between and */ { - {AFTER} { pushAndBegin(KEYWORD_PAIR_MAYBE); + {AFTER} { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.AFTER; } // Must be before any single operator's match {REFERENCABLE_OPERATOR} / {REFERENCE_INFIX_OPERATOR} { pushAndBegin(REFERENCE_OPERATION); @@ -617,7 +624,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {BIT_STRING_OPERATOR} / {COLON}{SPACE} { // Definitely a Keyword pair, but KEYWORD_PAIR_MAYBE state will still work. pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.BIT_STRING_OPERATOR; } - {CATCH} { pushAndBegin(KEYWORD_PAIR_MAYBE); + {CATCH} { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.CATCH; } {CAPTURE_OPERATOR} { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.CAPTURE_OPERATOR; } @@ -627,9 +634,9 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {CLOSING_BIT} { return ElixirTypes.CLOSING_BIT; } {CLOSING_BRACKET} { return ElixirTypes.CLOSING_BRACKET; } {CLOSING_PARENTHESIS} { return ElixirTypes.CLOSING_PARENTHESIS; } - {DO} { pushAndBegin(KEYWORD_PAIR_MAYBE); + {DO} { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.DO; } - {ELSE} { pushAndBegin(KEYWORD_PAIR_MAYBE); + {ELSE} { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.ELSE; } {EOL} { pushAndBegin(SIGN_OPERATION_MAYBE); return ElixirTypes.EOL; } @@ -638,6 +645,24 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} // see https://github.com/elixir-lang/elixir/blob/de39bbaca277002797e52ffbde617ace06233a2b/lib/elixir/src/elixir_tokenizer.erl#L605-L613 {ESCAPED_EOL}|{WHITE_SPACE}+ / {SPACE_SENSITIVE} { return ElixirTypes.SIGNIFICANT_WHITE_SPACE; } {ESCAPED_EOL}|{WHITE_SPACE}+ { return TokenType.WHITE_SPACE; } + {MULTILINE_WHITE_SPACE} / {COMMENT} { return TokenType.WHITE_SPACE; } + {MULTILINE_WHITE_SPACE} / {END} { return TokenType.WHITE_SPACE; } + {LAST_EOL} / {IDENTIFIER_TOKEN} { CharSequence text = yytext(); + int length = text.length(); + + for (int i = length - 1; i >= 0; i--) { + if (text.charAt(i) == '\n') { + if (i == 0 || text.charAt(i - 1) != '\\') { + yypushback(length - i); + break; + } + } + } + + pushAndBegin(LAST_EOL); + + return TokenType.WHITE_SPACE; + } {CHAR_TOKENIZER} { pushAndBegin(CHAR_TOKENIZATION); return ElixirTypes.CHAR_TOKENIZER; } /* So that that atom of comparison operator consumes all 3 ':' instead of {TYPE_OPERATOR} consuming '::' @@ -669,7 +694,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} return ElixirTypes.DUAL_OPERATOR; } {FALSE} { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.FALSE; } - {FN} { pushAndBegin(KEYWORD_PAIR_MAYBE); + {FN} { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.FN; } {OPENING_BRACKET} { return ElixirTypes.OPENING_BRACKET; } /* Must be before {OPENING_CURLY} so entire "{}" is matched instead of just "{" @@ -682,7 +707,8 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {OPENING_CURLY} { // use stack to match up nested OPENING_CURLY and CLOSING_CURLY pushAndBegin(YYINITIAL); return ElixirTypes.OPENING_CURLY; } - {OPENING_PARENTHESIS} { return ElixirTypes.OPENING_PARENTHESIS; } + {OPENING_PARENTHESIS} { pushAndBegin(MULTILINE_WHITE_SPACE_MAYBE); + return ElixirTypes.OPENING_PARENTHESIS; } // Must be before {IDENTIFIER_TOKEN} as "in" would be parsed as an identifier since it's a lowercase alphanumeric. {IN_OPERATOR} { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.IN_OPERATOR; } @@ -696,7 +722,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {OR_WORD_OPERATOR} { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.OR_WORD_OPERATOR; } // Must be before {IDENTIFIER_TOKEN} as "rescue" would be parsed as an identifier since it's a lowercase alphanumeric. - {RESCUE} { pushAndBegin(KEYWORD_PAIR_MAYBE); + {RESCUE} { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.RESCUE; } // Must be before {IDENTIFIER_TOKEN} as "true" would be parsed as an identifier since it's a lowercase alphanumeric. {TRUE} { pushAndBegin(KEYWORD_PAIR_MAYBE); @@ -729,7 +755,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {RELATIONAL_OPERATOR} { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.RELATIONAL_OPERATOR; } {SEMICOLON} { return ElixirTypes.SEMICOLON; } - {STAB_OPERATOR} { pushAndBegin(KEYWORD_PAIR_MAYBE); + {STAB_OPERATOR} { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.STAB_OPERATOR; } {STRUCT_OPERATOR} { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.STRUCT_OPERATOR; } @@ -773,7 +799,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {OPERATOR} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.ATOM_FRAGMENT; } - {EOL}|. { return TokenType.BAD_CHARACTER; } + {ANY} { return TokenType.BAD_CHARACTER; } } { @@ -795,7 +821,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} { {INVALID_BINARY_DIGITS} { return ElixirTypes.INVALID_BINARY_DIGITS; } {VALID_BINARY_DIGITS} { return ElixirTypes.VALID_BINARY_DIGITS; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } } @@ -807,18 +833,18 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} } { - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); - handleInState(stackFrame.getLastLexicalState()); } + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + handleInState(stackFrame.getLastLexicalState()); } } { - {EOL}|. { handleInState(KEYWORD_PAIR_MAYBE); } + {ANY} { handleInState(KEYWORD_PAIR_MAYBE); } } { {ESCAPE} { yybegin(ESCAPE_SEQUENCE); return ElixirTypes.ESCAPE; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.CHAR_LIST_FRAGMENT; } } @@ -826,7 +852,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} { {DUAL_OPERATOR} { yybegin(DECIMAL_EXPONENT); return ElixirTypes.DUAL_OPERATOR; } - {EOL}|. { handleInState(DECIMAL_EXPONENT); } + {ANY} { handleInState(DECIMAL_EXPONENT); } } { @@ -857,7 +883,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {DECIMAL_SEPARATOR} { return ElixirTypes.DECIMAL_SEPARATOR; } {INVALID_DECIMAL_DIGITS} { return ElixirTypes.INVALID_DECIMAL_DIGITS; } {VALID_DECIMAL_DIGITS} { return ElixirTypes.VALID_DECIMAL_DIGITS; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } } @@ -970,7 +996,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {WHITE_SPACE}+ { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.SIGNIFICANT_WHITE_SPACE; } - {EOL}|. { handleInState(KEYWORD_PAIR_MAYBE); } + {ANY} { handleInState(KEYWORD_PAIR_MAYBE); } } { @@ -1069,7 +1095,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} return fragmentType(); } } - {EOL}|. { return fragmentType(); } + {ANY} { return fragmentType(); } } { @@ -1128,26 +1154,26 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} } { - {WHITE_SPACE}+{GROUP_HEREDOC_TERMINATOR} { - String groupHeredocTerminator = yytext().toString().trim(); - - // manual lookahead pushes terminator back - yypushback(3); - - if (isTerminator(groupHeredocTerminator)) { - yybegin(GROUP_HEREDOC_END); - return ElixirTypes.HEREDOC_PREFIX_WHITE_SPACE; - } else { - yybegin(GROUP_HEREDOC_LINE_BODY); - return ElixirTypes.HEREDOC_LINE_WHITE_SPACE_TOKEN; - } - } - {WHITE_SPACE}+ { - yybegin(GROUP_HEREDOC_LINE_BODY); - return ElixirTypes.HEREDOC_LINE_WHITE_SPACE_TOKEN; - } - {GROUP_HEREDOC_TERMINATOR} { handleInState(GROUP_HEREDOC_END); } - {EOL}|. { handleInState(GROUP_HEREDOC_LINE_BODY); } + {WHITE_SPACE}+{GROUP_HEREDOC_TERMINATOR} { + String groupHeredocTerminator = yytext().toString().trim(); + + // manual lookahead pushes terminator back + yypushback(3); + + if (isTerminator(groupHeredocTerminator)) { + yybegin(GROUP_HEREDOC_END); + return ElixirTypes.HEREDOC_PREFIX_WHITE_SPACE; + } else { + yybegin(GROUP_HEREDOC_LINE_BODY); + return ElixirTypes.HEREDOC_LINE_WHITE_SPACE_TOKEN; + } + } + {WHITE_SPACE}+ { + yybegin(GROUP_HEREDOC_LINE_BODY); + return ElixirTypes.HEREDOC_LINE_WHITE_SPACE_TOKEN; + } + {GROUP_HEREDOC_TERMINATOR} { handleInState(GROUP_HEREDOC_END); } + {ANY} { handleInState(GROUP_HEREDOC_LINE_BODY); } } { @@ -1179,14 +1205,14 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {HEXADECIMAL_DIGIT}{1,2} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.VALID_HEXADECIMAL_DIGITS; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } } { {INVALID_HEXADECIMAL_DIGITS} { return ElixirTypes.INVALID_HEXADECIMAL_DIGITS; } {VALID_HEXADECIMAL_DIGITS} { return ElixirTypes.VALID_HEXADECIMAL_DIGITS; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } } @@ -1199,12 +1225,26 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} return ElixirTypes.INTERPOLATION_END; } } - { - {COLON} / {SPACE} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); - yybegin(stackFrame.getLastLexicalState()); - return ElixirTypes.KEYWORD_PAIR_COLON; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); - handleInState(stackFrame.getLastLexicalState()); } + { + {MULTILINE_WHITE_SPACE} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + yybegin(stackFrame.getLastLexicalState()); + return TokenType.WHITE_SPACE; } +} + + { + {COLON} / {SPACE} { yybegin(MULTILINE_WHITE_SPACE_MAYBE); + return ElixirTypes.KEYWORD_PAIR_COLON; } +} + + { + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + handleInState(stackFrame.getLastLexicalState()); } +} + + { + {EOL} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + yybegin(stackFrame.getLastLexicalState()); + return ElixirTypes.EOL; } } { @@ -1220,7 +1260,7 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} { {INVALID_OCTAL_DIGITS} { return ElixirTypes.INVALID_OCTAL_DIGITS; } {VALID_OCTAL_DIGITS} { return ElixirTypes.VALID_OCTAL_DIGITS; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } } @@ -1241,21 +1281,21 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} { {SIGIL_MODIFIER} { return ElixirTypes.SIGIL_MODIFIER; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } } { {ESCAPED_EOL}|{WHITE_SPACE}+ { return TokenType.WHITE_SPACE; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } } { - {COLON} / {SPACE} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); - yybegin(stackFrame.getLastLexicalState()); - return ElixirTypes.KEYWORD_PAIR_COLON; } - {EOL}|. { handleInState(SIGN_OPERATION); } + {COLON} / {SPACE} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + yybegin(stackFrame.getLastLexicalState()); + return ElixirTypes.KEYWORD_PAIR_COLON; } + {ANY} { handleInState(SIGN_OPERATION); } } { @@ -1277,13 +1317,13 @@ GROUP_HEREDOC_TERMINATOR = {QUOTE_HEREDOC_TERMINATOR}|{SIGIL_HEREDOC_TERMINATOR} {HEXADECIMAL_DIGIT}{1,4} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.VALID_HEXADECIMAL_DIGITS; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } } { {INVALID_UNKNOWN_BASE_DIGITS} { return ElixirTypes.INVALID_UNKNOWN_BASE_DIGITS; } - {EOL}|. { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + {ANY} { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } } diff --git a/src/org/elixir_lang/ElixirFlexLexer.java b/src/org/elixir_lang/ElixirFlexLexer.java index b62844490..1b33bf4c7 100644 --- a/src/org/elixir_lang/ElixirFlexLexer.java +++ b/src/org/elixir_lang/ElixirFlexLexer.java @@ -49,16 +49,19 @@ public class ElixirFlexLexer implements FlexLexer { public static final int HEXADECIMAL_WHOLE_NUMBER = 46; public static final int INTERPOLATION = 48; public static final int KEYWORD_PAIR_MAYBE = 50; - public static final int NAMED_SIGIL = 52; - public static final int OCTAL_WHOLE_NUMBER = 54; - public static final int SIGN_OPERATION = 56; - public static final int SIGN_OPERATION_KEYWORD_PAIR_MAYBE = 58; - public static final int SIGN_OPERATION_MAYBE = 60; - public static final int REFERENCE_OPERATION = 62; - public static final int SIGIL = 64; - public static final int SIGIL_MODIFIERS = 66; - public static final int UNICODE_ESCAPE_SEQUENCE = 68; - public static final int UNKNOWN_BASE_WHOLE_NUMBER = 70; + public static final int KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE = 52; + public static final int LAST_EOL = 54; + public static final int MULTILINE_WHITE_SPACE_MAYBE = 56; + public static final int NAMED_SIGIL = 58; + public static final int OCTAL_WHOLE_NUMBER = 60; + public static final int SIGN_OPERATION = 62; + public static final int SIGN_OPERATION_KEYWORD_PAIR_MAYBE = 64; + public static final int SIGN_OPERATION_MAYBE = 66; + public static final int REFERENCE_OPERATION = 68; + public static final int SIGIL = 70; + public static final int SIGIL_MODIFIERS = 72; + public static final int UNICODE_ESCAPE_SEQUENCE = 74; + public static final int UNKNOWN_BASE_WHOLE_NUMBER = 76; /** * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l @@ -71,7 +74,7 @@ public class ElixirFlexLexer implements FlexLexer { 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, - 32, 32, 33, 33, 34, 34, 35, 35 + 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38 }; /** @@ -106,49 +109,50 @@ public static int ZZ_CMAP(int ch) { private static final int [] ZZ_ACTION = zzUnpackAction(); private static final String ZZ_ACTION_PACKED_0 = - "\46\0\1\1\1\2\1\3\2\4\4\5\1\6\2\5"+ + "\55\0\1\1\1\2\1\3\2\4\4\5\1\6\2\5"+ "\1\7\1\10\1\11\1\12\1\13\1\11\2\5\1\14"+ "\1\15\1\1\1\5\1\15\1\16\1\17\1\20\1\5"+ "\1\21\1\22\1\23\2\5\1\24\1\25\1\26\1\27"+ "\1\0\1\30\1\31\1\32\1\23\1\33\1\34\1\35"+ "\2\36\1\1\4\37\1\1\7\37\1\1\1\37\1\1"+ - "\1\37\1\0\1\40\1\41\1\42\1\43\1\44\1\45"+ - "\1\46\1\47\1\50\1\0\1\51\1\52\1\0\1\53"+ - "\1\54\1\0\1\55\1\56\1\0\1\57\1\60\1\61"+ - "\1\62\1\0\1\63\1\64\1\0\1\65\1\57\1\66"+ - "\2\67\4\70\1\71\2\70\1\66\1\72\1\73\1\74"+ - "\1\75\1\73\2\70\1\66\1\76\1\66\1\70\1\76"+ - "\1\77\1\100\1\70\1\101\2\70\1\102\1\0\2\103"+ - "\1\104\1\105\1\106\1\0\1\107\1\110\1\111\1\0"+ - "\1\112\1\113\1\114\1\115\1\116\1\117\1\0\1\115"+ - "\2\0\1\120\1\121\1\0\1\122\1\0\1\123\1\0"+ + "\1\37\1\40\1\41\1\42\1\43\1\44\1\45\1\46"+ + "\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56"+ + "\1\57\1\60\1\61\1\62\1\63\1\64\1\65\1\57"+ + "\1\66\2\67\4\70\1\71\2\70\1\66\1\72\1\73"+ + "\1\74\1\75\1\73\2\70\1\66\1\76\1\66\1\70"+ + "\1\76\1\77\1\100\1\70\1\101\2\70\1\102\1\0"+ + "\1\30\2\103\1\104\1\105\1\106\1\0\1\107\1\110"+ + "\1\111\1\0\1\112\1\113\1\114\1\115\1\116\1\117"+ + "\1\115\2\0\1\120\1\121\1\0\1\122\1\0\1\123"+ "\1\124\2\123\1\125\1\0\2\1\1\126\1\127\1\130"+ - "\1\131\1\114\1\0\1\132\2\133\1\0\3\134\1\135"+ - "\1\136\1\0\1\137\1\130\1\30\2\140\1\0\17\130"+ - "\1\141\1\130\1\141\3\130\1\0\1\142\1\143\1\144"+ - "\1\145\1\0\1\127\1\146\1\147\30\0\1\150\1\151"+ - "\1\152\1\0\1\4\1\153\1\154\2\0\1\155\6\5"+ - "\1\156\2\5\1\157\1\0\1\152\1\160\1\161\1\162"+ - "\1\161\2\0\1\163\1\5\1\164\1\165\1\30\1\0"+ - "\1\5\1\166\1\167\1\170\1\171\2\5\1\25\1\0"+ - "\1\172\3\0\1\37\1\0\1\37\1\0\2\37\2\0"+ - "\1\37\1\173\1\0\1\174\1\175\1\0\1\67\1\176"+ - "\5\70\1\177\2\70\1\200\1\0\1\175\1\201\2\202"+ - "\1\0\1\203\1\70\1\204\1\205\1\70\1\206\2\70"+ - "\2\0\1\114\1\207\1\210\1\0\1\211\2\0\1\212"+ - "\7\0\1\127\1\213\2\0\1\30\5\0\1\214\13\0"+ - "\1\127\17\0\1\5\1\215\1\5\1\216\1\217\1\156"+ - "\1\220\1\5\1\11\1\160\1\0\1\221\3\5\1\222"+ - "\2\5\1\223\1\224\1\70\1\225\1\70\1\226\1\177"+ - "\1\227\1\70\1\73\1\201\1\230\4\70\1\231\1\114"+ - "\1\232\2\0\1\233\1\234\1\235\1\0\1\236\1\0"+ - "\1\237\1\240\1\5\1\0\1\241\3\5\1\242\1\243"+ - "\1\70\1\244\3\70\1\114\1\245\1\0\1\246\1\247"+ - "\1\5\1\250\1\251\1\252\1\70\1\253\1\254\1\114"+ - "\1\255\1\256\1\257\1\114"; + "\1\131\1\114\1\132\2\52\1\133\1\52\1\134\1\0"+ + "\1\135\1\0\2\135\1\136\1\137\1\140\1\130\1\30"+ + "\2\141\17\130\1\142\1\130\1\142\3\130\2\0\1\143"+ + "\1\144\1\145\1\146\1\127\1\147\1\150\37\0\1\151"+ + "\1\152\1\153\1\0\1\4\1\154\1\155\2\0\1\156"+ + "\6\5\1\157\2\5\1\160\1\0\1\153\1\161\1\162"+ + "\1\163\1\162\2\0\1\164\1\5\1\165\1\166\1\30"+ + "\1\0\1\5\1\167\1\170\1\171\1\172\2\5\1\25"+ + "\2\173\4\0\1\174\3\0\1\175\3\0\1\37\1\0"+ + "\1\37\1\0\2\37\2\0\1\37\1\176\1\0\1\177"+ + "\1\200\1\0\1\67\1\201\5\70\1\202\2\70\1\203"+ + "\1\0\1\200\1\204\2\205\1\0\1\206\1\70\1\207"+ + "\1\210\1\30\1\0\1\70\1\211\2\70\2\0\1\114"+ + "\1\212\1\213\1\0\1\214\2\0\1\215\7\0\1\127"+ + "\1\216\4\0\1\30\1\0\1\217\4\0\1\220\13\0"+ + "\1\127\21\0\1\5\1\221\1\5\1\222\1\223\1\157"+ + "\1\224\1\5\1\11\1\161\1\0\1\225\2\5\1\0"+ + "\1\5\1\226\2\5\2\173\2\0\1\227\1\0\1\230"+ + "\1\70\1\231\1\70\1\232\1\202\1\233\1\70\1\73"+ + "\1\204\1\234\4\70\1\235\1\114\1\236\2\0\1\237"+ + "\1\240\1\241\2\0\1\242\1\0\1\243\1\244\1\5"+ + "\1\0\1\245\3\5\2\246\1\247\1\250\1\70\1\251"+ + "\3\70\1\114\1\252\1\0\1\253\1\254\1\5\1\255"+ + "\1\256\1\257\1\70\1\260\1\261\1\114\1\262\1\263"+ + "\1\264\1\114"; private static int [] zzUnpackAction() { - int [] result = new int[492]; + int [] result = new int[524]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -178,66 +182,70 @@ private static int zzUnpackAction(String packed, int offset, int [] result) { "\0\u03f0\0\u042f\0\u046e\0\u04ad\0\u04ec\0\u052b\0\u056a\0\u05a9"+ "\0\u05e8\0\u0627\0\u0666\0\u06a5\0\u06e4\0\u0723\0\u0762\0\u07a1"+ "\0\u07e0\0\u081f\0\u085e\0\u089d\0\u08dc\0\u091b\0\u095a\0\u0999"+ - "\0\u095a\0\u09d8\0\u0a17\0\u0a56\0\u0a95\0\u0ad4\0\u0b13\0\u0b52"+ + "\0\u09d8\0\u0a17\0\u0a56\0\u0a95\0\u0ad4\0\u0b13\0\u0b52\0\u0b13"+ "\0\u0b91\0\u0bd0\0\u0c0f\0\u0c4e\0\u0c8d\0\u0ccc\0\u0d0b\0\u0d4a"+ "\0\u0d89\0\u0dc8\0\u0e07\0\u0e46\0\u0e85\0\u0ec4\0\u0f03\0\u0f42"+ - "\0\u0f81\0\u0f81\0\u0fc0\0\u0f81\0\u095a\0\u0fff\0\u103e\0\u107d"+ - "\0\u095a\0\u10bc\0\u095a\0\u095a\0\u10fb\0\u113a\0\u095a\0\u1179"+ - "\0\u11b8\0\u095a\0\u095a\0\u095a\0\u11f7\0\u1236\0\u1275\0\u12b4"+ - "\0\u12f3\0\u1332\0\u1371\0\u13b0\0\u13ef\0\u142e\0\u146d\0\u14ac"+ - "\0\u14eb\0\u152a\0\u1569\0\u15a8\0\u15e7\0\u1626\0\u095a\0\u1665"+ - "\0\u095a\0\u095a\0\u095a\0\u095a\0\u095a\0\u095a\0\u095a\0\u095a"+ - "\0\u16a4\0\u16e3\0\u1722\0\u095a\0\u1761\0\u095a\0\u095a\0\u17a0"+ - "\0\u095a\0\u095a\0\u17df\0\u095a\0\u181e\0\u185d\0\u095a\0\u189c"+ - "\0\u095a\0\u095a\0\u18db\0\u181e\0\u191a\0\u095a\0\u1959\0\u1998"+ - "\0\u19d7\0\u1a16\0\u1a55\0\u1a94\0\u1ad3\0\u1b12\0\u1b51\0\u1b90"+ - "\0\u1bcf\0\u1c0e\0\u1c4d\0\u095a\0\u1c8c\0\u1ccb\0\u1d0a\0\u1d49"+ - "\0\u1d88\0\u1dc7\0\u1e06\0\u1e45\0\u095a\0\u095a\0\u1e84\0\u095a"+ - "\0\u1ec3\0\u1f02\0\u095a\0\u1f41\0\u1f80\0\u1fbf\0\u1ffe\0\u095a"+ - "\0\u095a\0\u203d\0\u095a\0\u095a\0\u095a\0\u207c\0\u095a\0\u095a"+ - "\0\u20bb\0\u095a\0\u095a\0\u20fa\0\u2139\0\u2178\0\u21b7\0\u21f6"+ - "\0\u2235\0\u095a\0\u2274\0\u095a\0\u22b3\0\u095a\0\u22f2\0\u2331"+ - "\0\u2370\0\u23af\0\u095a\0\u23ee\0\u242d\0\u246c\0\u095a\0\u24ab"+ - "\0\u095a\0\u24ea\0\u2529\0\u2568\0\u095a\0\u095a\0\u25a7\0\u25e6"+ - "\0\u095a\0\u2625\0\u2664\0\u095a\0\u26a3\0\u26e2\0\u2721\0\u2760"+ - "\0\u279f\0\u095a\0\u25a7\0\u27de\0\u281d\0\u285c\0\u289b\0\u28da"+ - "\0\u2919\0\u2958\0\u2997\0\u29d6\0\u2a15\0\u2a54\0\u2a93\0\u2ad2"+ - "\0\u2b11\0\u2b50\0\u2b8f\0\u2bce\0\u2c0d\0\u2c4c\0\u2c8b\0\u2cca"+ - "\0\u2d09\0\u2760\0\u095a\0\u095a\0\u095a\0\u095a\0\u2d48\0\u2d87"+ - "\0\u095a\0\u2dc6\0\u2e05\0\u2e44\0\u2e83\0\u2ec2\0\u2f01\0\u2f40"+ - "\0\u2f7f\0\u2fbe\0\u2ffd\0\u303c\0\u307b\0\u30ba\0\u30f9\0\u3138"+ - "\0\u3177\0\u31b6\0\u31f5\0\u3234\0\u3273\0\u32b2\0\u095a\0\u32f1"+ - "\0\u3330\0\u336f\0\u33ae\0\u0f81\0\u33ed\0\u342c\0\u0f81\0\u0f81"+ - "\0\u095a\0\u0f81\0\u346b\0\u342c\0\u34aa\0\u095a\0\u34e9\0\u3528"+ - "\0\u3567\0\u35a6\0\u35e5\0\u3624\0\u3663\0\u0a95\0\u36a2\0\u0f81"+ - "\0\u36e1\0\u3720\0\u0f81\0\u0f81\0\u375f\0\u379e\0\u37dd\0\u381c"+ - "\0\u385b\0\u0f81\0\u389a\0\u38d9\0\u3918\0\u3957\0\u095a\0\u37dd"+ - "\0\u0a95\0\u3996\0\u39d5\0\u095a\0\u3a14\0\u095a\0\u3a53\0\u3a92"+ - "\0\u3ad1\0\u3b10\0\u3b10\0\u3b4f\0\u3b8e\0\u3bcd\0\u3c0c\0\u1275"+ - "\0\u3c4b\0\u3c8a\0\u191a\0\u3cc9\0\u095a\0\u3d08\0\u3d08\0\u095a"+ - "\0\u095a\0\u3d47\0\u095a\0\u3d86\0\u3dc5\0\u3e04\0\u3e43\0\u3e82"+ - "\0\u3ec1\0\u1a16\0\u3f00\0\u095a\0\u3f3f\0\u3f7e\0\u095a\0\u3fbd"+ - "\0\u1a16\0\u3ffc\0\u403b\0\u095a\0\u407a\0\u1a16\0\u40b9\0\u40f8"+ - "\0\u4137\0\u4176\0\u41b5\0\u095a\0\u095a\0\u41f4\0\u095a\0\u4233"+ - "\0\u4272\0\u095a\0\u42b1\0\u42f0\0\u432f\0\u436e\0\u43ad\0\u43ec"+ - "\0\u442b\0\u095a\0\u095a\0\u446a\0\u44a9\0\u095a\0\u44e8\0\u2cca"+ - "\0\u4527\0\u4566\0\u45a5\0\u095a\0\u45e4\0\u4623\0\u4662\0\u46a1"+ - "\0\u46e0\0\u471f\0\u475e\0\u479d\0\u281d\0\u47dc\0\u481b\0\u485a"+ - "\0\u4899\0\u48d8\0\u48d8\0\u4917\0\u4956\0\u4995\0\u49d4\0\u4a13"+ - "\0\u4a52\0\u4a91\0\u4ad0\0\u4b0f\0\u4b4e\0\u4b8d\0\u4bcc\0\u4c0b"+ - "\0\u0a95\0\u4c4a\0\u37dd\0\u0a95\0\u0f81\0\u37dd\0\u4c89\0\u0f81"+ - "\0\u0f81\0\u4cc8\0\u0f81\0\u4d07\0\u0f81\0\u4d46\0\u095a\0\u4d85"+ - "\0\u4dc4\0\u095a\0\u095a\0\u4e03\0\u1a16\0\u4e42\0\u1a16\0\u095a"+ - "\0\u1a16\0\u4e81\0\u095a\0\u095a\0\u095a\0\u4ec0\0\u4eff\0\u4f3e"+ - "\0\u4f7d\0\u095a\0\u4fbc\0\u095a\0\u4ffb\0\u503a\0\u095a\0\u095a"+ - "\0\u095a\0\u2d09\0\u095a\0\u5079\0\u37dd\0\u0a95\0\u50b8\0\u50f7"+ - "\0\u0a95\0\u5136\0\u5175\0\u51b4\0\u1a16\0\u1a16\0\u51f3\0\u1a16"+ - "\0\u5232\0\u5271\0\u52b0\0\u52ef\0\u095a\0\u532e\0\u0a95\0\u095a"+ - "\0\u536d\0\u0a95\0\u0a95\0\u1a16\0\u53ac\0\u1a16\0\u1a16\0\u53eb"+ - "\0\u095a\0\u0a95\0\u1a16\0\u095a"; + "\0\u0f81\0\u0fc0\0\u0fff\0\u103e\0\u107d\0\u10bc\0\u10fb\0\u113a"+ + "\0\u113a\0\u1179\0\u113a\0\u0b13\0\u11b8\0\u11f7\0\u1236\0\u0b13"+ + "\0\u1275\0\u0b13\0\u12b4\0\u12f3\0\u1332\0\u0b13\0\u1371\0\u13b0"+ + "\0\u0b13\0\u0b13\0\u0b13\0\u13ef\0\u142e\0\u146d\0\u14ac\0\u14eb"+ + "\0\u152a\0\u1569\0\u15a8\0\u15e7\0\u1626\0\u1665\0\u16a4\0\u16e3"+ + "\0\u1722\0\u1761\0\u17a0\0\u17df\0\u181e\0\u0b13\0\u0b13\0\u0b13"+ + "\0\u0b13\0\u0b13\0\u0b13\0\u0b13\0\u0b13\0\u0b13\0\u185d\0\u189c"+ + "\0\u0b13\0\u0b13\0\u0b13\0\u0b13\0\u0b13\0\u0b13\0\u18db\0\u191a"+ + "\0\u0b13\0\u0b13\0\u0b13\0\u18db\0\u1959\0\u0b13\0\u1998\0\u19d7"+ + "\0\u1a16\0\u1a55\0\u1a94\0\u1ad3\0\u1b12\0\u1b51\0\u1b90\0\u1bcf"+ + "\0\u1c0e\0\u1c4d\0\u1c8c\0\u0b13\0\u1ccb\0\u1d0a\0\u1d49\0\u1d88"+ + "\0\u1dc7\0\u1e06\0\u1e45\0\u1e84\0\u0b13\0\u0b13\0\u1ec3\0\u0b13"+ + "\0\u1f02\0\u1f41\0\u0b13\0\u1f80\0\u1fbf\0\u1ffe\0\u203d\0\u207c"+ + "\0\u0b13\0\u0b13\0\u20bb\0\u0b13\0\u0b13\0\u0b13\0\u20fa\0\u0b13"+ + "\0\u0b13\0\u2139\0\u0b13\0\u0b13\0\u2178\0\u21b7\0\u21f6\0\u2235"+ + "\0\u2274\0\u0b13\0\u22b3\0\u0b13\0\u22f2\0\u0b13\0\u2331\0\u2370"+ + "\0\u23af\0\u0b13\0\u23ee\0\u242d\0\u246c\0\u0b13\0\u24ab\0\u0b13"+ + "\0\u24ea\0\u2529\0\u0b13\0\u2568\0\u25a7\0\u25e6\0\u2625\0\u0b13"+ + "\0\u2664\0\u0b13\0\u26a3\0\u26e2\0\u2721\0\u0b13\0\u2760\0\u279f"+ + "\0\u27de\0\u281d\0\u0b13\0\u285c\0\u289b\0\u28da\0\u2919\0\u2958"+ + "\0\u2997\0\u29d6\0\u2a15\0\u2a54\0\u2a93\0\u2ad2\0\u2b11\0\u2b50"+ + "\0\u2b8f\0\u2bce\0\u2c0d\0\u2c4c\0\u2c8b\0\u2cca\0\u2d09\0\u2d48"+ + "\0\u2d87\0\u2dc6\0\u27de\0\u0b13\0\u0b13\0\u0b13\0\u0b13\0\u2e05"+ + "\0\u0b13\0\u2e44\0\u2e83\0\u2ec2\0\u2f01\0\u2f40\0\u2f7f\0\u2fbe"+ + "\0\u2ffd\0\u303c\0\u307b\0\u30ba\0\u30f9\0\u3138\0\u3177\0\u31b6"+ + "\0\u31f5\0\u3234\0\u3273\0\u32b2\0\u32f1\0\u0b13\0\u3330\0\u336f"+ + "\0\u33ae\0\u0a17\0\u33ed\0\u0a56\0\u342c\0\u346b\0\u346b\0\u34aa"+ + "\0\u34e9\0\u3528\0\u113a\0\u3567\0\u35a6\0\u113a\0\u113a\0\u0b13"+ + "\0\u113a\0\u35e5\0\u35a6\0\u3624\0\u0b13\0\u3663\0\u36a2\0\u36e1"+ + "\0\u3720\0\u375f\0\u379e\0\u37dd\0\u0c4e\0\u381c\0\u113a\0\u385b"+ + "\0\u389a\0\u113a\0\u113a\0\u38d9\0\u3918\0\u3957\0\u3996\0\u39d5"+ + "\0\u113a\0\u3a14\0\u3a53\0\u3a92\0\u3ad1\0\u0b13\0\u3957\0\u0c4e"+ + "\0\u3b10\0\u3b4f\0\u0b13\0\u3b8e\0\u3bcd\0\u3c0c\0\u3c4b\0\u12b4"+ + "\0\u3c8a\0\u3cc9\0\u3d08\0\u3d47\0\u3d86\0\u0b13\0\u3dc5\0\u3e04"+ + "\0\u3e43\0\u3e82\0\u3e82\0\u3ec1\0\u3f00\0\u3f3f\0\u3f7e\0\u146d"+ + "\0\u3fbd\0\u3ffc\0\u1959\0\u403b\0\u0b13\0\u407a\0\u407a\0\u0b13"+ + "\0\u0b13\0\u40b9\0\u0b13\0\u40f8\0\u4137\0\u4176\0\u41b5\0\u41f4"+ + "\0\u4233\0\u1a55\0\u4272\0\u0b13\0\u42b1\0\u42f0\0\u0b13\0\u432f"+ + "\0\u1a55\0\u436e\0\u43ad\0\u0b13\0\u43ec\0\u442b\0\u446a\0\u1a55"+ + "\0\u44a9\0\u44e8\0\u4527\0\u4566\0\u45a5\0\u0b13\0\u0b13\0\u45e4"+ + "\0\u0b13\0\u4623\0\u4662\0\u0b13\0\u46a1\0\u46e0\0\u471f\0\u475e"+ + "\0\u479d\0\u47dc\0\u481b\0\u0b13\0\u0b13\0\u2625\0\u25a7\0\u485a"+ + "\0\u4899\0\u0b13\0\u48d8\0\u0b13\0\u2d48\0\u4917\0\u4956\0\u4995"+ + "\0\u0b13\0\u49d4\0\u4a13\0\u4a52\0\u4a91\0\u4ad0\0\u4b0f\0\u4b4e"+ + "\0\u4b8d\0\u289b\0\u4bcc\0\u4c0b\0\u4c4a\0\u4c89\0\u4cc8\0\u4cc8"+ + "\0\u4d07\0\u4d46\0\u4d85\0\u4dc4\0\u4e03\0\u4e42\0\u4e81\0\u4ec0"+ + "\0\u4eff\0\u4f3e\0\u4f7d\0\u4fbc\0\u4ffb\0\u503a\0\u5079\0\u0c4e"+ + "\0\u50b8\0\u3957\0\u0c4e\0\u113a\0\u3957\0\u50f7\0\u113a\0\u113a"+ + "\0\u5136\0\u113a\0\u5175\0\u113a\0\u51b4\0\u51f3\0\u0b13\0\u5232"+ + "\0\u5271\0\u0b13\0\u52b0\0\u52ef\0\u532e\0\u0b13\0\u536d\0\u0b13"+ + "\0\u53ac\0\u1a55\0\u53eb\0\u1a55\0\u0b13\0\u1a55\0\u542a\0\u0b13"+ + "\0\u0b13\0\u0b13\0\u5469\0\u54a8\0\u54e7\0\u5526\0\u0b13\0\u5565"+ + "\0\u0b13\0\u55a4\0\u55e3\0\u0b13\0\u0b13\0\u0b13\0\u2d87\0\u0b13"+ + "\0\u0b13\0\u5622\0\u3957\0\u0c4e\0\u5661\0\u56a0\0\u0c4e\0\u56df"+ + "\0\u571e\0\u575d\0\u3b8e\0\u0b13\0\u1a55\0\u1a55\0\u579c\0\u1a55"+ + "\0\u57db\0\u581a\0\u5859\0\u5898\0\u0b13\0\u58d7\0\u0c4e\0\u0b13"+ + "\0\u5916\0\u0c4e\0\u0c4e\0\u1a55\0\u5955\0\u1a55\0\u1a55\0\u5994"+ + "\0\u0b13\0\u0c4e\0\u1a55\0\u0b13"; private static int [] zzUnpackRowMap() { - int [] result = new int[492]; + int [] result = new int[524]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -260,431 +268,449 @@ private static int zzUnpackRowMap(String packed, int offset, int [] result) { private static final int [] ZZ_TRANS = zzUnpackTrans(); private static final String ZZ_TRANS_PACKED_0 = - "\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56"+ - "\1\57\1\60\1\61\1\62\1\63\1\64\1\65\1\66"+ - "\1\67\1\70\1\71\1\72\1\73\1\74\1\75\1\76"+ - "\1\77\1\100\1\101\1\102\1\103\1\104\1\105\1\106"+ - "\1\55\1\107\1\110\3\55\1\111\1\112\1\113\1\114"+ - "\1\115\2\116\1\117\1\120\1\112\1\121\1\55\1\112"+ - "\1\106\1\55\1\112\1\106\1\55\1\112\1\122\1\123"+ - "\1\124\1\125\1\126\1\0\1\47\1\127\1\47\1\130"+ - "\1\131\4\132\1\133\2\132\1\134\1\135\1\136\1\137"+ - "\1\140\1\141\2\132\1\142\1\143\1\144\1\132\1\145"+ - "\1\146\2\147\1\132\1\147\2\47\6\132\1\47\1\132"+ - "\2\47\1\150\1\47\1\0\2\47\1\132\1\47\2\132"+ - "\1\47\2\132\1\47\2\132\3\47\2\151\6\0\4\152"+ - "\1\0\2\152\6\0\1\153\1\152\3\0\1\152\4\0"+ - "\1\152\4\0\5\152\1\0\1\152\7\0\1\152\1\0"+ - "\1\154\1\155\1\0\1\156\1\157\1\0\2\152\6\0"+ - "\5\160\4\161\1\160\2\161\6\160\2\161\3\160\1\161"+ - "\4\160\1\161\2\160\1\161\1\160\5\161\1\160\1\161"+ - "\2\160\1\162\1\160\1\0\2\160\1\161\1\163\2\161"+ - "\1\163\5\161\5\160\1\0\52\164\1\165\1\164\1\0"+ - "\1\166\14\164\1\166\3\164\1\0\52\167\1\170\1\167"+ - "\1\0\1\166\14\167\1\166\3\167\1\0\26\171\1\172"+ - "\23\171\1\173\1\171\1\0\21\171\1\0\5\174\4\175"+ - "\1\174\2\175\6\174\2\175\3\174\1\175\4\174\1\175"+ - "\2\174\1\176\1\177\5\175\1\174\1\175\2\174\1\200"+ - "\1\174\1\0\2\174\1\175\1\176\2\175\1\176\2\175"+ - "\1\176\2\175\5\174\1\0\25\201\1\202\2\201\1\202"+ - "\21\201\1\203\1\201\1\0\21\201\1\0\5\174\2\175"+ - "\1\204\1\175\1\174\2\175\6\174\2\175\3\174\1\175"+ - "\4\174\1\175\2\174\1\176\1\177\5\175\1\174\1\175"+ - "\2\174\1\200\1\174\1\0\2\174\1\175\1\176\2\175"+ - "\1\176\2\175\1\176\1\175\1\204\5\174\1\0\5\174"+ - "\4\175\1\174\2\175\6\174\2\175\1\205\2\174\1\175"+ - "\4\174\1\175\2\174\1\176\1\177\5\175\1\174\1\175"+ - "\2\174\1\200\1\174\1\0\2\174\1\175\1\176\2\175"+ - "\1\176\2\175\1\176\2\175\5\174\1\0\3\206\1\207"+ - "\1\210\1\211\1\212\1\213\1\214\1\215\1\216\1\217"+ - "\1\220\1\221\1\222\1\223\1\224\1\225\1\226\1\227"+ - "\1\230\1\231\1\232\1\233\1\234\1\206\1\235\1\236"+ - "\1\237\1\240\2\206\1\212\1\241\1\242\3\212\3\206"+ - "\1\243\1\244\2\116\1\206\1\120\2\206\1\212\2\206"+ - "\1\212\2\206\1\212\4\206\1\245\1\246\1\0\52\167"+ - "\1\170\2\247\21\167\1\0\51\250\1\251\1\252\1\250"+ - "\1\0\21\250\1\0\45\253\1\254\3\253\1\255\1\256"+ - "\1\253\1\0\7\253\1\257\11\253\1\0\2\47\1\260"+ - "\4\47\1\261\2\47\2\261\23\47\1\261\1\47\2\261"+ - "\4\47\1\261\1\47\2\0\1\47\1\0\3\47\4\261"+ - "\2\47\1\261\1\47\1\261\5\47\1\0\2\262\1\263"+ - "\1\262\1\263\10\262\1\263\10\262\1\264\4\262\1\263"+ - "\16\262\1\265\1\262\1\0\1\262\1\266\12\262\1\263"+ - "\1\262\3\263\75\0\1\267\1\270\1\0\26\262\1\271"+ - "\22\262\1\272\1\273\1\262\1\0\1\262\1\266\17\262"+ - "\52\0\1\274\1\275\24\0\52\276\1\277\2\300\17\276"+ - "\1\301\1\302\1\0\51\47\1\303\1\304\1\47\1\0"+ - "\17\47\1\305\1\306\1\0\1\174\1\307\5\174\1\310"+ - "\2\174\2\310\23\174\1\310\1\174\2\310\4\174\1\310"+ - "\2\174\1\200\1\174\1\0\3\174\4\310\2\174\1\310"+ - "\1\174\1\310\5\174\1\0\5\311\2\312\1\313\1\312"+ - "\1\311\2\313\6\311\2\312\3\311\1\312\4\311\1\312"+ - "\2\311\1\313\1\311\2\313\3\312\1\311\1\313\2\311"+ - "\1\314\1\311\1\0\2\311\1\312\4\313\2\312\1\313"+ - "\1\312\1\313\5\311\1\0\1\47\1\50\1\315\1\52"+ - "\1\53\1\54\1\55\1\56\1\57\1\60\1\61\1\62"+ - "\1\63\1\64\1\65\1\66\1\67\1\70\1\71\1\72"+ - "\1\73\1\74\1\75\1\76\1\77\1\100\1\101\1\102"+ - "\1\103\1\104\1\105\1\106\1\55\1\107\1\110\3\55"+ - "\1\111\1\112\1\113\1\114\1\115\2\116\1\117\1\120"+ - "\1\112\1\121\1\55\1\112\1\106\1\55\1\112\1\106"+ - "\1\55\1\112\1\122\1\123\1\124\1\125\1\126\1\0"+ - "\31\316\1\317\20\316\1\320\1\316\1\0\21\316\1\0"+ - "\1\47\1\321\1\47\1\321\11\47\1\321\15\47\1\321"+ - "\16\47\1\150\1\47\1\0\1\321\14\47\1\321\1\47"+ - "\1\322\1\323\1\0\5\324\4\325\1\324\2\325\6\324"+ - "\2\325\3\324\1\325\4\324\1\325\2\324\1\325\1\324"+ - "\5\325\1\324\1\325\2\324\1\326\1\324\1\0\2\324"+ - "\1\325\1\327\2\325\1\327\2\325\1\327\2\325\5\324"+ - "\1\0\26\311\1\330\23\311\1\314\2\331\21\311\1\0"+ - "\31\332\1\333\20\332\1\334\1\332\1\0\21\332\1\0"+ - "\1\311\1\335\1\311\1\336\1\337\1\340\2\311\1\341"+ - "\1\342\1\343\1\311\1\344\1\345\1\346\1\347\1\350"+ - "\1\351\1\352\1\311\1\353\1\354\1\355\1\311\1\356"+ - "\1\357\2\360\1\361\1\360\14\311\1\314\2\331\21\311"+ - "\27\0\1\362\4\0\1\363\15\0\1\243\1\244\2\331"+ - "\22\0\5\47\4\364\1\47\2\364\6\47\2\364\3\47"+ - "\1\364\4\47\1\364\4\47\5\364\1\47\1\364\2\47"+ - "\1\150\1\47\1\0\2\47\1\364\1\47\2\364\1\47"+ - "\2\364\1\47\2\364\5\47\1\0\5\365\4\366\1\365"+ - "\2\366\6\365\2\366\3\365\1\366\4\365\1\366\4\365"+ - "\5\366\1\365\1\366\2\365\1\367\1\365\1\0\2\365"+ - "\1\366\1\365\2\366\1\365\2\366\1\365\2\366\5\365"+ - "\1\0\1\174\1\307\5\174\1\370\2\174\2\370\23\174"+ - "\1\370\1\174\2\370\4\174\1\370\2\174\1\200\1\174"+ - "\1\0\3\174\4\370\2\174\1\370\1\174\1\370\5\174"+ - "\1\0\5\371\4\372\1\371\2\372\6\371\2\372\3\371"+ - "\1\372\4\371\1\372\2\371\1\372\1\371\5\372\1\371"+ - "\1\372\2\371\1\373\1\371\1\0\2\371\12\372\5\371"+ - "\2\0\1\374\1\0\1\375\1\376\1\377\2\0\1\u0100"+ - "\1\u0101\1\u0102\1\0\1\u0103\1\u0104\1\u0105\1\u0106\1\u0107"+ - "\1\u0108\1\u0109\1\0\1\u010a\1\u010b\1\u010c\1\0\1\u010d"+ - "\1\u010e\2\u010f\1\u0110\1\u010f\74\0\1\u0111\144\0\1\u0112"+ - "\77\0\1\u0113\1\u0114\7\0\1\u0115\1\u0116\1\0\1\u0117"+ - "\5\0\1\u0118\5\0\1\u0119\15\0\1\u011a\1\u011b\2\u011a"+ - "\26\0\1\u011c\12\0\1\u0117\13\0\1\u0119\15\0\1\u011a"+ - "\1\u011b\2\u011a\27\0\1\55\1\u011d\2\55\1\0\2\55"+ - "\2\0\1\u011e\3\0\2\55\3\0\1\55\4\0\1\55"+ - "\1\0\1\u011e\7\55\1\0\1\55\7\0\12\55\13\0"+ - "\4\55\1\0\2\55\2\0\1\u011e\3\0\2\55\3\0"+ - "\1\55\4\0\1\55\1\0\1\u011e\7\55\1\0\1\55"+ - "\7\0\12\55\13\0\3\55\1\u011f\1\0\2\55\2\0"+ - "\1\u011e\3\0\2\55\3\0\1\55\4\0\1\55\1\0"+ - "\1\u011e\4\55\1\u0120\2\55\1\0\1\55\7\0\12\55"+ - "\13\0\4\55\1\0\2\55\2\0\1\u011e\3\0\1\u0121"+ - "\1\55\3\0\1\55\4\0\1\u0122\1\0\1\u011e\7\55"+ - "\1\0\1\55\7\0\12\55\17\0\1\u0123\21\0\1\u0119"+ - "\15\0\1\u011a\1\u011b\2\u011a\27\0\3\55\1\u0124\1\0"+ - "\2\55\2\0\1\u011e\3\0\2\55\3\0\1\55\4\0"+ - "\1\55\1\0\1\u011e\2\55\1\u0125\4\55\1\0\1\55"+ - "\7\0\12\55\13\0\4\55\1\0\2\55\2\0\1\u011e"+ - "\3\0\1\u0126\1\55\3\0\1\55\4\0\1\55\1\0"+ - "\1\u011e\7\55\1\0\1\55\7\0\12\55\12\0\1\u0115"+ - "\7\0\1\u0127\66\0\1\u0128\10\0\1\u0129\15\0\1\u0119"+ - "\15\0\1\u011a\1\u011b\2\u011a\41\0\1\u012a\13\0\1\u0119"+ - "\15\0\1\u011a\1\u011b\2\u011a\26\0\1\u012b\7\0\1\u012c"+ - "\2\0\1\u012a\13\0\1\u0119\15\0\1\u011a\1\u011b\2\u011a"+ - "\23\0\1\u012d\116\0\1\u012e\11\0\1\u0119\15\0\1\u011a"+ - "\1\u011b\2\u011a\27\0\4\55\1\0\2\55\2\0\1\u011e"+ - "\3\0\2\55\3\0\1\u012f\4\0\1\55\1\0\1\u011e"+ - "\7\55\1\0\1\55\7\0\12\55\13\0\4\55\1\0"+ - "\2\55\2\0\1\u011e\3\0\2\55\3\0\1\u0130\4\0"+ - "\1\55\1\0\1\u011e\7\55\1\0\1\55\7\0\12\55"+ - "\32\0\1\u0131\56\0\1\u0132\20\0\1\u0114\5\0\1\u0119"+ - "\15\0\1\u011a\1\u011b\2\u011a\50\0\1\u0118\22\0\1\u0133"+ - "\1\u0134\31\0\2\55\1\u0135\1\55\1\0\2\55\2\0"+ - "\1\u011e\3\0\2\55\3\0\1\55\4\0\1\55\1\0"+ - "\1\u011e\7\55\1\0\1\55\7\0\12\55\36\0\1\u0114"+ - "\2\0\1\u0119\15\0\1\u011a\1\u011b\2\u011a\53\0\1\u0136"+ - "\17\0\3\u0137\56\0\1\u0119\15\0\1\u011a\1\u011b\2\u011a"+ - "\27\0\3\55\1\u0138\1\0\2\55\2\0\1\u011e\3\0"+ - "\2\55\3\0\1\55\4\0\1\55\1\0\1\u011e\7\55"+ - "\1\0\1\55\7\0\12\55\45\0\1\106\20\0\1\106"+ - "\2\0\1\106\2\0\1\106\15\0\3\55\1\u0139\1\0"+ - "\1\u013a\1\55\2\0\1\u011e\3\0\2\55\3\0\1\55"+ - "\4\0\1\55\1\0\1\u011e\7\55\1\0\1\55\7\0"+ - "\12\55\13\0\4\55\1\0\1\u013b\1\55\2\0\1\u011e"+ - "\3\0\2\55\3\0\1\55\4\0\1\55\1\0\1\u011e"+ - "\7\55\1\0\1\55\7\0\12\55\13\0\4\112\1\0"+ - "\2\112\2\0\1\u013c\3\0\2\112\3\0\1\112\4\0"+ - "\1\112\1\0\1\u013c\7\112\1\0\1\112\7\0\12\112"+ - "\57\0\1\114\52\0\1\u013d\2\0\1\u013d\22\0\2\116"+ - "\22\0\51\120\2\0\24\120\5\0\4\u013e\1\0\2\u013e"+ - "\6\0\2\u013e\3\0\1\u013e\4\0\1\u013e\2\0\1\106"+ - "\1\0\5\u013e\1\0\1\u013e\7\0\1\u013e\1\106\2\u013e"+ - "\1\106\2\u013e\1\106\2\u013e\102\0\1\u013f\77\0\1\u0140"+ - "\3\0\1\147\77\0\1\u0141\1\147\7\0\1\u0142\1\u0143"+ - "\1\0\1\147\5\0\1\147\55\0\1\u0143\12\0\1\147"+ - "\64\0\4\132\1\0\2\132\2\0\1\147\3\0\2\132"+ - "\3\0\1\132\2\0\1\132\1\0\1\132\1\0\1\147"+ - "\7\132\1\0\1\132\7\0\12\132\17\0\1\u0144\71\0"+ - "\1\u0142\7\0\1\u0145\66\0\1\147\10\0\1\u0146\100\0"+ - "\1\u0147\63\0\1\147\7\0\1\147\2\0\1\u0147\60\0"+ - "\1\u0148\116\0\1\u0149\101\0\1\u014a\56\0\1\147\20\0"+ - "\1\147\77\0\1\147\100\0\1\147\77\0\1\147\116\0"+ - "\1\47\32\0\4\161\1\0\2\161\6\0\2\161\3\0"+ - "\1\161\4\0\1\161\2\0\1\161\1\0\5\161\1\0"+ - "\1\161\7\0\1\161\1\0\2\161\1\0\5\161\57\0"+ - "\1\160\105\0\1\163\2\0\1\163\64\0\1\164\76\0"+ - "\1\167\76\0\1\171\32\0\4\175\1\0\2\175\6\0"+ - "\2\175\3\0\1\175\4\0\1\175\4\0\5\175\1\0"+ - "\1\175\7\0\1\175\1\0\2\175\1\0\2\175\1\0"+ - "\2\175\45\0\1\176\20\0\1\176\2\0\1\176\2\0"+ - "\1\176\61\0\1\174\76\0\1\201\64\0\1\u014b\20\0"+ - "\1\u014b\2\0\1\u014b\2\0\1\u014b\13\0\1\u014c\1\u014d"+ - "\7\0\1\u014e\1\u014f\1\0\1\u0150\5\0\1\u0151\55\0"+ - "\1\u014f\12\0\1\u0150\64\0\1\212\1\u0152\2\212\1\0"+ - "\2\212\2\0\1\u0153\3\0\2\212\3\0\1\212\4\0"+ - "\1\212\1\0\1\u0153\7\212\1\0\1\212\7\0\12\212"+ - "\13\0\4\212\1\0\2\212\2\0\1\u0153\3\0\2\212"+ - "\3\0\1\212\4\0\1\212\1\0\1\u0153\7\212\1\0"+ - "\1\212\7\0\12\212\13\0\3\212\1\u0154\1\0\2\212"+ - "\2\0\1\u0153\3\0\2\212\3\0\1\212\4\0\1\212"+ - "\1\0\1\u0153\4\212\1\u0155\2\212\1\0\1\212\7\0"+ - "\12\212\13\0\4\212\1\0\2\212\2\0\1\u0153\3\0"+ - "\2\212\3\0\1\212\4\0\1\u0156\1\0\1\u0153\7\212"+ - "\1\0\1\212\7\0\12\212\17\0\1\u0157\72\0\3\212"+ - "\1\u0158\1\0\2\212\2\0\1\u0153\3\0\2\212\3\0"+ - "\1\212\4\0\1\212\1\0\1\u0153\2\212\1\u0159\4\212"+ - "\1\0\1\212\7\0\12\212\13\0\4\212\1\0\2\212"+ - "\2\0\1\u0153\3\0\1\u015a\1\212\3\0\1\212\4\0"+ - "\1\212\1\0\1\u0153\7\212\1\0\1\212\7\0\12\212"+ - "\12\0\1\u014e\7\0\1\u015b\66\0\1\u015c\10\0\1\u015d"+ - "\100\0\1\u015e\73\0\1\u015f\2\0\1\u015e\100\0\1\u0160"+ - "\62\0\4\212\1\0\2\212\2\0\1\u0153\3\0\2\212"+ - "\3\0\1\u0161\4\0\1\212\1\0\1\u0153\7\212\1\0"+ - "\1\212\7\0\12\212\13\0\4\212\1\0\2\212\2\0"+ - "\1\u0153\3\0\2\212\3\0\1\u0162\4\0\1\212\1\0"+ - "\1\u0153\7\212\1\0\1\212\7\0\12\212\32\0\1\u0163"+ - "\56\0\1\u0164\20\0\1\u014d\77\0\1\u0151\22\0\1\u0133"+ - "\1\u0134\31\0\2\212\1\u0165\1\212\1\0\2\212\2\0"+ - "\1\u0153\3\0\2\212\3\0\1\212\4\0\1\212\1\0"+ - "\1\u0153\7\212\1\0\1\212\7\0\12\212\36\0\1\u014d"+ - "\53\0\3\212\1\u0166\1\0\2\212\2\0\1\u0153\3\0"+ - "\2\212\3\0\1\212\4\0\1\212\1\0\1\u0153\7\212"+ - "\1\0\1\212\7\0\12\212\13\0\4\212\1\0\1\u0167"+ - "\1\212\2\0\1\u0153\3\0\2\212\3\0\1\212\4\0"+ - "\1\212\1\0\1\u0153\7\212\1\0\1\212\7\0\12\212"+ - "\13\0\4\212\1\0\1\u0168\1\212\2\0\1\u0153\3\0"+ - "\2\212\3\0\1\212\4\0\1\212\1\0\1\u0153\7\212"+ - "\1\0\1\212\7\0\12\212\57\0\1\243\121\0\1\u0169"+ - "\77\0\1\u016a\54\0\2\247\73\0\1\251\76\0\1\255"+ - "\34\0\1\u016b\2\0\2\u016b\23\0\1\u016b\1\0\2\u016b"+ - "\4\0\1\u016b\10\0\4\u016b\2\0\1\u016b\1\0\1\u016b"+ - "\10\0\1\u016c\1\0\1\u016c\10\0\1\u016c\15\0\1\u016c"+ - "\15\0\1\u016d\1\u016e\16\0\1\u016c\1\0\3\u016c\52\0"+ - "\1\262\26\0\1\u016f\171\0\1\u0170\77\0\1\u0171\52\0"+ - "\1\u0172\1\u0173\75\0\1\272\76\0\1\274\76\0\1\276"+ - "\100\0\2\300\17\0\1\u0174\1\u0175\75\0\1\u0176\77\0"+ - "\1\u0177\52\0\1\303\121\0\1\u0178\77\0\1\u0179\10\0"+ - "\1\u017a\2\0\2\u017a\23\0\1\u017a\1\0\2\u017a\4\0"+ - "\1\u017a\10\0\4\u017a\2\0\1\u017a\1\0\1\u017a\13\0"+ - "\2\312\1\0\1\312\11\0\2\312\3\0\1\312\4\0"+ - "\1\312\6\0\3\312\11\0\1\312\4\0\2\312\1\0"+ - "\1\312\16\0\1\313\2\0\2\313\23\0\1\313\1\0"+ - "\2\313\4\0\1\313\10\0\4\313\2\0\1\313\1\0"+ - "\1\313\57\0\1\311\76\0\3\u017b\74\0\1\316\121\0"+ - "\1\u017c\77\0\1\u017d\6\0\4\325\1\0\2\325\6\0"+ - "\2\325\3\0\1\325\4\0\1\325\2\0\1\325\1\0"+ - "\5\325\1\0\1\325\7\0\1\325\1\0\2\325\1\0"+ - "\2\325\1\0\2\325\57\0\1\324\105\0\1\327\2\0"+ - "\1\327\2\0\1\327\61\0\1\u017e\1\u017f\77\0\2\331"+ - "\73\0\1\332\27\0\1\u0180\77\0\1\u0181\1\u0180\7\0"+ - "\1\u0182\1\u0183\1\0\1\u0180\5\0\1\u0180\5\0\1\u0184"+ - "\15\0\1\u0180\1\u0185\2\u0180\26\0\1\u0183\12\0\1\u0180"+ - "\13\0\1\u0184\15\0\1\u0180\1\u0185\2\u0180\30\0\1\u0186"+ - "\112\0\1\u0187\65\0\1\u0188\21\0\1\u0184\15\0\1\u0180"+ - "\1\u0185\2\u0180\32\0\1\u0189\72\0\1\u0182\7\0\1\u018a"+ - "\66\0\1\u0180\10\0\1\u018b\15\0\1\u0184\15\0\1\u0180"+ - "\1\u0185\2\u0180\41\0\1\u018c\13\0\1\u0184\15\0\1\u0180"+ - "\1\u0185\2\u0180\26\0\1\u0180\7\0\1\u0180\2\0\1\u018c"+ - "\13\0\1\u0184\15\0\1\u0180\1\u0185\2\u0180\23\0\1\u018d"+ - "\116\0\1\u018e\11\0\1\u0184\15\0\1\u0180\1\u0185\2\u0180"+ - "\51\0\1\u0180\73\0\1\u018f\56\0\1\360\20\0\1\u0180"+ - "\5\0\1\u0184\15\0\1\u0180\1\u0185\2\u0180\50\0\1\u0180"+ - "\22\0\1\u017e\1\u017f\54\0\1\u0180\2\0\1\u0184\15\0"+ - "\1\u0180\1\u0185\2\u0180\53\0\1\u0180\100\0\1\u0184\15\0"+ - "\1\u0180\1\u0185\2\u0180\32\0\1\u0180\137\0\1\365\34\0"+ - "\1\u0190\2\0\2\u0190\23\0\1\u0190\1\0\2\u0190\4\0"+ - "\1\u0190\10\0\4\u0190\2\0\1\u0190\1\0\1\u0190\13\0"+ - "\4\372\1\0\2\372\6\0\2\372\3\0\1\372\4\0"+ - "\1\372\2\0\1\372\1\0\5\372\1\0\1\372\7\0"+ - "\12\372\57\0\1\371\27\0\1\u010f\77\0\1\u0191\1\u010f"+ - "\7\0\1\u0192\1\u0193\1\0\1\u010f\5\0\1\u010f\55\0"+ - "\1\u0193\12\0\1\u010f\65\0\1\u0194\112\0\1\u0195\65\0"+ - "\1\u0196\75\0\1\u0197\72\0\1\u0192\7\0\1\u0198\66\0"+ - "\1\u010f\10\0\1\u0199\100\0\1\u019a\63\0\1\u010f\7\0"+ - "\1\u010f\2\0\1\u019a\60\0\1\374\116\0\1\u019b\104\0"+ - "\1\u010f\73\0\1\u019c\56\0\1\u010f\20\0\1\u010f\77\0"+ - "\1\u010f\100\0\1\u010f\77\0\1\u010f\55\0\1\u010f\137\0"+ - "\1\u019d\1\0\2\u0111\53\0\1\u019e\1\0\1\u0119\15\0"+ - "\1\u011a\1\u011b\2\u011a\25\0\1\u0128\1\u019f\7\0\1\u0128"+ - "\66\0\1\u0128\26\0\1\u0119\15\0\1\u011a\1\u011b\2\u011a"+ - "\26\0\1\u0128\143\0\1\u011a\32\0\2\55\1\u01a0\1\55"+ - "\1\0\2\55\2\0\1\u011e\3\0\2\55\3\0\1\55"+ - "\4\0\1\55\1\0\1\u011e\7\55\1\0\1\55\7\0"+ - "\12\55\13\0\4\55\1\0\1\55\1\u01a1\2\0\1\u011e"+ - "\3\0\2\55\3\0\1\55\4\0\1\55\1\0\1\u011e"+ - "\7\55\1\0\1\55\7\0\12\55\13\0\4\55\1\0"+ - "\2\55\2\0\1\u011e\3\0\2\55\3\0\1\55\4\0"+ - "\1\55\1\0\1\u011e\5\55\1\u01a2\1\55\1\0\1\55"+ - "\7\0\12\55\13\0\4\55\1\0\2\55\2\0\1\u011e"+ - "\3\0\1\55\1\u01a3\3\0\1\55\4\0\1\55\1\0"+ - "\1\u011e\7\55\1\0\1\55\7\0\12\55\13\0\4\55"+ - "\1\0\2\55\2\0\1\u011e\3\0\2\55\3\0\1\55"+ - "\4\0\1\55\1\0\1\u011e\4\55\1\u01a4\2\55\1\0"+ - "\1\55\7\0\12\55\17\0\1\u01a5\21\0\1\u0119\15\0"+ - "\1\u011a\1\u011b\2\u011a\27\0\4\55\1\0\1\55\1\u01a6"+ - "\2\0\1\u011e\3\0\2\55\3\0\1\55\4\0\1\55"+ - "\1\0\1\u011e\7\55\1\0\1\55\7\0\12\55\13\0"+ - "\4\55\1\0\2\55\2\0\1\u011e\3\0\1\55\1\u01a7"+ - "\3\0\1\55\4\0\1\55\1\0\1\u011e\7\55\1\0"+ - "\1\55\7\0\12\55\22\0\1\u01a8\77\0\1\u01a9\15\0"+ - "\1\u0119\15\0\1\u011a\1\u011b\2\u011a\41\0\1\u012c\13\0"+ - "\1\u0119\15\0\1\u011a\1\u011b\2\u011a\24\0\1\u01aa\115\0"+ - "\1\u01ab\62\0\4\55\1\0\2\55\2\0\1\u011e\3\0"+ - "\2\55\3\0\1\55\3\0\1\u0119\1\55\1\0\1\u011e"+ - "\7\55\1\0\1\55\1\0\1\u011a\1\u011b\2\u011a\2\0"+ - "\12\55\13\0\4\55\1\0\2\55\2\0\1\u011e\3\0"+ - "\2\55\3\0\1\55\4\0\1\55\1\0\1\u011e\6\55"+ - "\1\u01ac\1\0\1\55\7\0\12\55\32\0\1\u01ad\6\0"+ - "\1\u0119\15\0\1\u011a\1\u011b\2\u011a\47\0\1\u013d\2\0"+ - "\1\u013d\117\0\1\u0133\32\0\4\55\1\0\2\55\2\0"+ - "\1\u011e\3\0\2\55\3\0\1\55\4\0\1\55\1\0"+ - "\1\u011e\5\55\1\u01ae\1\55\1\0\1\55\7\0\12\55"+ - "\37\0\1\u01af\1\0\1\u0119\15\0\1\u011a\1\u011b\2\u011a"+ - "\27\0\4\55\1\0\2\55\2\0\1\u011e\3\0\2\55"+ - "\3\0\1\55\4\0\1\55\1\0\1\u011e\4\55\1\u01b0"+ - "\2\55\1\0\1\55\7\0\12\55\13\0\4\55\1\0"+ - "\2\55\2\0\1\u011e\3\0\1\55\1\u01b1\3\0\1\55"+ - "\4\0\1\55\1\0\1\u011e\7\55\1\0\1\55\7\0"+ - "\12\55\6\0\1\u01b2\1\0\1\u01b2\2\0\13\u01b2\1\0"+ - "\3\u01b2\2\0\2\u01b2\2\0\1\u01b2\1\0\12\u01b2\1\0"+ - "\6\u01b2\1\0\14\u01b2\1\0\4\u01b2\74\0\1\u01b3\77\0"+ - "\1\u01b3\4\0\1\147\1\u0143\7\0\1\147\66\0\1\147"+ - "\103\0\1\147\101\0\1\147\77\0\1\147\100\0\1\147"+ - "\100\0\1\147\101\0\1\147\55\0\1\u015c\10\0\1\u015c"+ - "\66\0\1\u015c\77\0\2\212\1\u01b4\1\212\1\0\2\212"+ - "\2\0\1\u0153\3\0\2\212\3\0\1\212\4\0\1\212"+ - "\1\0\1\u0153\7\212\1\0\1\212\7\0\12\212\13\0"+ - "\4\212\1\0\1\212\1\u01b5\2\0\1\u0153\3\0\2\212"+ - "\3\0\1\212\4\0\1\212\1\0\1\u0153\7\212\1\0"+ + "\1\56\1\57\1\60\1\61\1\62\1\63\1\64\1\65"+ + "\1\66\1\67\1\70\1\71\1\72\1\73\1\74\1\75"+ + "\1\76\1\77\1\100\1\101\1\102\1\103\1\104\1\105"+ + "\1\106\1\107\1\110\1\111\1\112\1\113\1\114\1\115"+ + "\1\64\1\116\1\117\3\64\1\120\1\121\1\122\1\123"+ + "\1\124\2\125\1\126\1\127\1\121\1\130\1\64\1\121"+ + "\1\115\1\64\1\121\1\115\1\64\1\121\1\131\1\132"+ + "\1\133\1\134\1\135\1\0\1\56\1\136\1\56\1\137"+ + "\1\140\4\141\1\142\2\141\1\143\1\144\1\145\1\146"+ + "\1\147\1\150\2\141\1\151\1\152\1\153\1\141\1\154"+ + "\1\155\2\156\1\141\1\156\2\56\6\141\1\56\1\141"+ + "\7\56\1\141\1\56\2\141\1\56\2\141\1\56\2\141"+ + "\3\56\2\157\1\56\5\0\4\160\1\0\2\160\6\0"+ + "\1\161\1\160\3\0\1\160\4\0\1\160\4\0\5\160"+ + "\1\0\1\160\7\0\1\160\1\0\1\162\1\163\1\0"+ + "\1\164\1\165\1\0\2\160\6\0\5\166\4\167\1\166"+ + "\2\167\6\166\2\167\3\166\1\167\4\166\1\167\2\166"+ + "\1\167\1\166\5\167\1\166\1\167\7\166\1\167\1\170"+ + "\2\167\1\170\5\167\6\166\55\171\1\172\14\171\1\172"+ + "\4\171\55\173\1\172\14\173\1\172\4\173\26\174\1\175"+ + "\50\174\5\176\4\177\1\176\2\177\6\176\2\177\3\176"+ + "\1\177\4\176\1\177\2\176\1\200\1\201\5\177\1\176"+ + "\1\177\7\176\1\177\1\200\2\177\1\200\2\177\1\200"+ + "\2\177\6\176\25\202\1\203\2\202\1\203\46\202\5\176"+ + "\2\177\1\204\1\177\1\176\2\177\6\176\2\177\3\176"+ + "\1\177\4\176\1\177\2\176\1\200\1\201\5\177\1\176"+ + "\1\177\7\176\1\177\1\200\2\177\1\200\2\177\1\200"+ + "\1\177\1\204\13\176\4\177\1\176\2\177\6\176\2\177"+ + "\1\205\2\176\1\177\4\176\1\177\2\176\1\200\1\201"+ + "\5\177\1\176\1\177\7\176\1\177\1\200\2\177\1\200"+ + "\2\177\1\200\2\177\6\176\3\206\1\207\1\210\1\211"+ + "\1\212\1\213\1\214\1\215\1\216\1\217\1\220\1\221"+ + "\1\222\1\223\1\224\1\225\1\226\1\227\1\230\1\231"+ + "\1\232\1\233\1\234\1\206\1\235\1\236\1\237\1\240"+ + "\2\206\1\212\1\241\1\242\3\212\3\206\1\243\1\244"+ + "\2\245\1\206\1\127\2\206\1\212\2\206\1\212\2\206"+ + "\1\212\4\206\1\246\1\247\1\0\53\173\2\250\22\173"+ + "\51\251\1\252\1\253\1\251\1\0\21\251\1\0\45\254"+ + "\1\255\3\254\1\256\1\257\1\254\1\0\7\254\1\260"+ + "\11\254\1\0\2\56\1\261\4\56\1\262\2\56\2\262"+ + "\23\56\1\262\1\56\2\262\4\56\1\262\1\56\2\0"+ + "\1\56\1\0\3\56\4\262\2\56\1\262\1\56\1\262"+ + "\5\56\1\0\2\263\1\264\1\263\1\264\10\263\1\264"+ + "\10\263\1\265\4\263\1\264\22\263\1\266\12\263\1\264"+ + "\1\263\3\264\1\263\74\0\1\267\1\270\1\0\26\263"+ + "\1\271\22\263\1\272\1\273\1\263\1\0\1\263\1\266"+ + "\17\263\52\0\1\274\1\275\24\0\53\276\2\277\17\276"+ + "\1\300\1\301\1\276\51\56\1\302\1\303\1\56\1\0"+ + "\17\56\1\304\1\305\1\0\1\176\1\306\5\176\1\307"+ + "\2\176\2\307\23\176\1\307\1\176\2\307\4\176\1\307"+ + "\10\176\4\307\2\176\1\307\1\176\1\307\6\176\5\310"+ + "\2\311\1\312\1\311\1\310\2\312\6\310\2\311\3\310"+ + "\1\311\4\310\1\311\2\310\1\312\1\310\2\312\3\311"+ + "\1\310\1\312\7\310\1\311\4\312\2\311\1\312\1\311"+ + "\1\312\6\310\1\56\1\57\1\313\1\61\1\62\1\63"+ + "\1\64\1\65\1\66\1\67\1\70\1\71\1\72\1\73"+ + "\1\74\1\75\1\76\1\77\1\100\1\101\1\102\1\103"+ + "\1\104\1\105\1\106\1\107\1\110\1\111\1\112\1\113"+ + "\1\114\1\115\1\64\1\116\1\117\3\64\1\120\1\121"+ + "\1\122\1\123\1\124\2\125\1\126\1\127\1\121\1\130"+ + "\1\64\1\121\1\115\1\64\1\121\1\115\1\64\1\121"+ + "\1\131\1\132\1\133\1\134\1\135\1\0\31\171\1\314"+ + "\73\171\1\315\2\171\1\314\17\171\1\316\1\317\2\316"+ + "\22\171\51\0\1\320\1\321\24\0\26\171\1\315\22\171"+ + "\1\316\1\317\2\316\22\171\1\56\1\322\1\56\1\322"+ + "\11\56\1\322\15\56\1\322\16\56\1\323\1\56\1\0"+ + "\1\322\14\56\1\322\1\56\1\324\1\325\1\0\5\326"+ + "\4\327\1\326\2\327\6\326\2\327\3\326\1\327\4\326"+ + "\1\327\2\326\1\327\1\326\5\327\1\326\1\327\7\326"+ + "\1\327\1\330\2\327\1\330\2\327\1\330\2\327\6\326"+ + "\26\310\1\331\24\310\2\332\22\310\31\333\1\334\45\333"+ + "\1\310\1\335\1\310\1\336\1\337\1\340\2\310\1\341"+ + "\1\342\1\343\1\310\1\344\1\345\1\346\1\347\1\350"+ + "\1\351\1\352\1\310\1\353\1\354\1\355\1\310\1\356"+ + "\1\357\2\360\1\361\1\360\14\310\1\362\2\332\21\310"+ + "\27\0\1\363\4\0\1\364\15\0\1\243\1\244\2\332"+ + "\22\0\5\56\4\365\1\56\2\365\6\56\2\365\3\56"+ + "\1\365\4\56\1\365\4\56\5\365\1\56\1\365\2\56"+ + "\1\323\1\56\1\0\2\56\1\365\1\56\2\365\1\56"+ + "\2\365\1\56\2\365\5\56\1\0\5\366\4\367\1\366"+ + "\2\367\6\366\2\367\3\366\1\367\4\366\1\367\4\366"+ + "\5\367\1\366\1\367\7\366\1\367\1\366\2\367\1\366"+ + "\2\367\1\366\2\367\6\366\1\176\1\306\5\176\1\370"+ + "\2\176\2\370\23\176\1\370\1\176\2\370\4\176\1\370"+ + "\10\176\4\370\2\176\1\370\1\176\1\370\6\176\5\371"+ + "\4\372\1\371\2\372\6\371\2\372\3\371\1\372\4\371"+ + "\1\372\2\371\1\372\1\371\5\372\1\371\1\372\7\371"+ + "\12\372\6\371\1\0\1\373\1\0\1\374\1\375\1\376"+ + "\2\0\1\377\1\u0100\1\u0101\1\0\1\u0102\1\u0103\1\u0104"+ + "\1\u0105\1\u0106\1\u0107\1\u0108\1\0\1\u0109\1\u010a\1\u010b"+ + "\1\0\1\u010c\1\u010d\2\u010e\1\u010f\1\u010e\74\0\1\u0110"+ + "\71\0\1\u0111\22\0\1\u0112\1\u0113\2\u0112\22\0\51\53"+ + "\2\0\3\53\1\u0114\20\53\26\0\1\u0115\22\0\1\u0112"+ + "\1\u0113\2\54\27\0\4\u0116\1\0\2\u0116\2\0\1\u0117"+ + "\3\0\2\u0116\1\u0118\2\0\1\u0116\4\0\1\u0116\1\0"+ + "\2\u0117\6\u0116\1\0\1\u0117\7\0\2\u0117\1\u0116\2\u0117"+ + "\1\u0116\2\u0117\1\u0116\1\u0117\107\0\1\u0119\77\0\1\u011a"+ + "\1\u011b\7\0\1\u011c\1\u011d\1\0\1\u011e\5\0\1\u011f"+ + "\5\0\1\u0120\15\0\1\u0121\1\u0122\2\u0121\26\0\1\u0123"+ + "\12\0\1\u011e\13\0\1\u0120\15\0\1\u0121\1\u0122\2\u0121"+ + "\27\0\1\64\1\u0124\2\64\1\0\2\64\2\0\1\u0125"+ + "\3\0\2\64\3\0\1\64\4\0\1\64\1\0\1\u0125"+ + "\7\64\1\0\1\64\7\0\12\64\13\0\4\64\1\0"+ + "\2\64\2\0\1\u0125\3\0\2\64\3\0\1\64\4\0"+ + "\1\64\1\0\1\u0125\7\64\1\0\1\64\7\0\12\64"+ + "\13\0\3\64\1\u0126\1\0\2\64\2\0\1\u0125\3\0"+ + "\2\64\3\0\1\64\4\0\1\64\1\0\1\u0125\4\64"+ + "\1\u0127\2\64\1\0\1\64\7\0\12\64\13\0\4\64"+ + "\1\0\2\64\2\0\1\u0125\3\0\1\u0128\1\64\3\0"+ + "\1\64\4\0\1\u0129\1\0\1\u0125\7\64\1\0\1\64"+ + "\7\0\12\64\17\0\1\u012a\21\0\1\u0120\15\0\1\u0121"+ + "\1\u0122\2\u0121\27\0\3\64\1\u012b\1\0\2\64\2\0"+ + "\1\u0125\3\0\2\64\3\0\1\64\4\0\1\64\1\0"+ + "\1\u0125\2\64\1\u012c\4\64\1\0\1\64\7\0\12\64"+ + "\13\0\4\64\1\0\2\64\2\0\1\u0125\3\0\1\u012d"+ + "\1\64\3\0\1\64\4\0\1\64\1\0\1\u0125\7\64"+ + "\1\0\1\64\7\0\12\64\12\0\1\u011c\7\0\1\u012e"+ + "\66\0\1\u012f\10\0\1\u0130\15\0\1\u0120\15\0\1\u0121"+ + "\1\u0122\2\u0121\41\0\1\u0131\13\0\1\u0120\15\0\1\u0121"+ + "\1\u0122\2\u0121\26\0\1\u0132\7\0\1\u0133\2\0\1\u0131"+ + "\13\0\1\u0120\15\0\1\u0121\1\u0122\2\u0121\23\0\1\u0134"+ + "\116\0\1\u0135\11\0\1\u0120\15\0\1\u0121\1\u0122\2\u0121"+ + "\27\0\4\64\1\0\2\64\2\0\1\u0125\3\0\2\64"+ + "\3\0\1\u0136\4\0\1\64\1\0\1\u0125\7\64\1\0"+ + "\1\64\7\0\12\64\13\0\4\64\1\0\2\64\2\0"+ + "\1\u0125\3\0\2\64\3\0\1\u0137\4\0\1\64\1\0"+ + "\1\u0125\7\64\1\0\1\64\7\0\12\64\32\0\1\u0138"+ + "\56\0\1\u0139\20\0\1\u011b\5\0\1\u0120\15\0\1\u0121"+ + "\1\u0122\2\u0121\50\0\1\u011f\22\0\1\u013a\1\u013b\31\0"+ + "\2\64\1\u013c\1\64\1\0\2\64\2\0\1\u0125\3\0"+ + "\2\64\3\0\1\64\4\0\1\64\1\0\1\u0125\7\64"+ + "\1\0\1\64\7\0\12\64\36\0\1\u011b\2\0\1\u0120"+ + "\15\0\1\u0121\1\u0122\2\u0121\53\0\1\u013d\17\0\3\u013e"+ + "\56\0\1\u0120\15\0\1\u0121\1\u0122\2\u0121\27\0\3\64"+ + "\1\u013f\1\0\2\64\2\0\1\u0125\3\0\2\64\3\0"+ + "\1\64\4\0\1\64\1\0\1\u0125\7\64\1\0\1\64"+ + "\7\0\12\64\45\0\1\115\20\0\1\115\2\0\1\115"+ + "\2\0\1\115\15\0\3\64\1\u0140\1\0\1\u0141\1\64"+ + "\2\0\1\u0125\3\0\2\64\3\0\1\64\4\0\1\64"+ + "\1\0\1\u0125\7\64\1\0\1\64\7\0\12\64\13\0"+ + "\4\64\1\0\1\u0142\1\64\2\0\1\u0125\3\0\2\64"+ + "\3\0\1\64\4\0\1\64\1\0\1\u0125\7\64\1\0"+ + "\1\64\7\0\12\64\13\0\4\121\1\0\2\121\2\0"+ + "\1\u0143\3\0\2\121\3\0\1\121\4\0\1\121\1\0"+ + "\1\u0143\7\121\1\0\1\121\7\0\12\121\13\0\2\u0144"+ + "\1\u0145\1\u0144\1\0\2\u0144\6\0\2\u0144\1\u0146\1\0"+ + "\1\u0147\1\u0144\4\0\1\u0144\3\0\6\u0144\3\0\1\u0148"+ + "\1\u0149\2\u0148\1\0\1\u014a\2\0\1\u0144\2\0\1\u0144"+ + "\2\0\1\u0144\60\0\1\123\34\0\1\u014b\15\0\1\u014c"+ + "\1\u014d\1\0\1\u014c\20\0\1\u0148\1\u0149\2\125\1\0"+ + "\1\u014a\20\0\51\127\2\0\24\127\5\0\4\u014e\1\0"+ + "\2\u014e\6\0\2\u014e\3\0\1\u014e\4\0\1\u014e\2\0"+ + "\1\115\1\0\5\u014e\1\0\1\u014e\7\0\1\u014e\1\115"+ + "\2\u014e\1\115\2\u014e\1\115\2\u014e\102\0\1\u014f\77\0"+ + "\1\u0150\3\0\1\156\77\0\1\u0151\1\156\7\0\1\u0152"+ + "\1\u0153\1\0\1\156\5\0\1\156\55\0\1\u0153\12\0"+ + "\1\156\64\0\4\141\1\0\2\141\2\0\1\156\3\0"+ + "\2\141\3\0\1\141\2\0\1\141\1\0\1\141\1\0"+ + "\1\156\7\141\1\0\1\141\7\0\12\141\17\0\1\u0154"+ + "\71\0\1\u0152\7\0\1\u0155\66\0\1\156\10\0\1\u0156"+ + "\100\0\1\u0157\63\0\1\156\7\0\1\156\2\0\1\u0157"+ + "\60\0\1\u0158\116\0\1\u0159\101\0\1\u015a\56\0\1\156"+ + "\20\0\1\156\77\0\1\156\100\0\1\156\77\0\1\156"+ + "\52\0\4\167\1\0\2\167\6\0\2\167\3\0\1\167"+ + "\4\0\1\167\2\0\1\167\1\0\5\167\1\0\1\167"+ + "\7\0\1\167\1\0\2\167\1\0\5\167\66\0\1\170"+ + "\2\0\1\170\20\0\4\177\1\0\2\177\6\0\2\177"+ + "\3\0\1\177\4\0\1\177\4\0\5\177\1\0\1\177"+ + "\7\0\1\177\1\0\2\177\1\0\2\177\1\0\2\177"+ + "\45\0\1\200\20\0\1\200\2\0\1\200\2\0\1\200"+ + "\47\0\1\u015b\20\0\1\u015b\2\0\1\u015b\2\0\1\u015b"+ + "\13\0\1\u015c\1\u015d\7\0\1\u015e\1\u015f\1\0\1\u0160"+ + "\5\0\1\u0161\55\0\1\u015f\12\0\1\u0160\64\0\1\212"+ + "\1\u0162\2\212\1\0\2\212\2\0\1\u0163\3\0\2\212"+ + "\3\0\1\212\4\0\1\212\1\0\1\u0163\7\212\1\0"+ "\1\212\7\0\12\212\13\0\4\212\1\0\2\212\2\0"+ - "\1\u0153\3\0\2\212\3\0\1\212\4\0\1\212\1\0"+ - "\1\u0153\5\212\1\u01b6\1\212\1\0\1\212\7\0\12\212"+ - "\13\0\4\212\1\0\2\212\2\0\1\u0153\3\0\2\212"+ - "\3\0\1\212\4\0\1\212\1\0\1\u0153\4\212\1\u01b7"+ - "\2\212\1\0\1\212\7\0\12\212\17\0\1\u01b8\72\0"+ - "\4\212\1\0\1\212\1\u01b9\2\0\1\u0153\3\0\2\212"+ - "\3\0\1\212\4\0\1\212\1\0\1\u0153\7\212\1\0"+ - "\1\212\7\0\12\212\13\0\4\212\1\0\2\212\2\0"+ - "\1\u0153\3\0\1\212\1\u01ba\3\0\1\212\4\0\1\212"+ - "\1\0\1\u0153\7\212\1\0\1\212\7\0\12\212\22\0"+ - "\1\u01bb\77\0\1\u01bc\100\0\1\u015f\100\0\1\u01bd\62\0"+ - "\4\212\1\0\2\212\2\0\1\u0153\3\0\2\212\3\0"+ - "\1\212\4\0\1\212\1\0\1\u0153\6\212\1\u01be\1\0"+ - "\1\212\7\0\12\212\32\0\1\u0153\57\0\4\212\1\0"+ - "\2\212\2\0\1\u0153\3\0\2\212\3\0\1\212\4\0"+ - "\1\212\1\0\1\u0153\5\212\1\u01bf\1\212\1\0\1\212"+ - "\7\0\12\212\13\0\4\212\1\0\2\212\2\0\1\u0153"+ - "\3\0\2\212\3\0\1\212\4\0\1\212\1\0\1\u0153"+ - "\4\212\1\u01c0\2\212\1\0\1\212\7\0\12\212\13\0"+ - "\4\212\1\0\2\212\2\0\1\u0153\3\0\1\212\1\u01c1"+ - "\3\0\1\212\4\0\1\212\1\0\1\u0153\7\212\1\0"+ - "\1\212\7\0\12\212\102\0\1\u01c2\77\0\1\u01c2\10\0"+ - "\1\u01c3\2\0\2\u01c3\23\0\1\u01c3\1\0\2\u01c3\4\0"+ - "\1\u01c3\10\0\4\u01c3\2\0\1\u01c3\1\0\1\u01c3\57\0"+ - "\1\u016d\121\0\1\u01c4\77\0\1\u01c4\52\0\1\u0172\121\0"+ - "\1\u01c5\77\0\1\u01c6\75\0\1\u01c7\77\0\1\u01c7\75\0"+ - "\1\u01c8\77\0\1\u01c8\75\0\1\u01c9\77\0\1\u01c9\52\0"+ - "\1\u017e\30\0\1\u0180\1\u0183\7\0\1\u0180\66\0\1\u0180"+ - "\26\0\1\u0184\15\0\1\u0180\1\u0185\2\u0180\26\0\1\u0180"+ - "\143\0\1\u0180\34\0\1\u01ca\112\0\1\u0180\64\0\1\u0180"+ - "\21\0\1\u0184\15\0\1\u0180\1\u0185\2\u0180\35\0\1\u0180"+ - "\77\0\1\u0180\77\0\1\u0180\15\0\1\u0184\15\0\1\u0180"+ - "\1\u0185\2\u0180\41\0\1\u0180\13\0\1\u0184\15\0\1\u0180"+ - "\1\u0185\2\u0180\43\0\1\u0180\101\0\1\u0180\6\0\1\u0184"+ - "\15\0\1\u0180\1\u0185\2\u0180\31\0\1\310\2\0\2\310"+ - "\23\0\1\310\1\0\2\310\4\0\1\310\10\0\4\310"+ - "\2\0\1\310\1\0\1\310\11\0\1\u010f\1\u0193\7\0"+ - "\1\u010f\66\0\1\u010f\101\0\1\u0110\112\0\1\u010f\64\0"+ - "\1\u010f\100\0\1\u010f\77\0\1\u010f\77\0\1\u010f\100\0"+ - "\1\u010f\100\0\1\u010f\101\0\1\u010f\123\0\1\u019d\3\u0111"+ - "\73\0\3\u01cb\27\0\1\u01cc\77\0\3\55\1\u01cd\1\0"+ - "\2\55\2\0\1\u011e\3\0\2\55\3\0\1\55\4\0"+ - "\1\55\1\0\1\u011e\7\55\1\0\1\55\7\0\12\55"+ - "\13\0\2\55\1\u01ce\1\55\1\0\2\55\2\0\1\u011e"+ - "\3\0\2\55\3\0\1\55\4\0\1\55\1\0\1\u011e"+ - "\7\55\1\0\1\55\7\0\12\55\13\0\2\55\1\u01cf"+ - "\1\55\1\0\2\55\2\0\1\u011e\3\0\2\55\3\0"+ - "\1\55\4\0\1\55\1\0\1\u011e\7\55\1\0\1\55"+ - "\7\0\12\55\37\0\1\u01d0\1\0\1\u0119\15\0\1\u011a"+ - "\1\u011b\2\u011a\27\0\2\55\1\u01d1\1\55\1\0\2\55"+ - "\2\0\1\u011e\3\0\2\55\3\0\1\55\4\0\1\55"+ - "\1\0\1\u011e\7\55\1\0\1\55\7\0\12\55\13\0"+ - "\4\55\1\0\2\55\2\0\1\u011e\3\0\2\55\3\0"+ - "\1\55\4\0\1\55\1\0\1\u011e\3\55\1\u01d2\3\55"+ - "\1\0\1\55\7\0\12\55\13\0\4\55\1\0\2\55"+ - "\2\0\1\u011e\3\0\2\55\3\0\1\55\4\0\1\55"+ - "\1\0\1\u011e\5\55\1\u01d3\1\55\1\0\1\55\7\0"+ - "\12\55\13\0\4\55\1\0\2\55\2\0\1\u011e\3\0"+ - "\2\55\3\0\1\55\4\0\1\55\1\0\1\u011e\3\55"+ - "\1\u01d4\3\55\1\0\1\55\7\0\12\55\13\0\3\212"+ - "\1\u01d5\1\0\2\212\2\0\1\u0153\3\0\2\212\3\0"+ - "\1\212\4\0\1\212\1\0\1\u0153\7\212\1\0\1\212"+ - "\7\0\12\212\13\0\2\212\1\u01d6\1\212\1\0\2\212"+ - "\2\0\1\u0153\3\0\2\212\3\0\1\212\4\0\1\212"+ - "\1\0\1\u0153\7\212\1\0\1\212\7\0\12\212\13\0"+ - "\2\212\1\u01d7\1\212\1\0\2\212\2\0\1\u0153\3\0"+ - "\2\212\3\0\1\212\4\0\1\212\1\0\1\u0153\7\212"+ - "\1\0\1\212\7\0\12\212\13\0\2\212\1\u01d8\1\212"+ - "\1\0\2\212\2\0\1\u0153\3\0\2\212\3\0\1\212"+ - "\4\0\1\212\1\0\1\u0153\7\212\1\0\1\212\7\0"+ - "\12\212\13\0\4\212\1\0\2\212\2\0\1\u0153\3\0"+ - "\2\212\3\0\1\212\4\0\1\212\1\0\1\u0153\3\212"+ - "\1\u01d9\3\212\1\0\1\212\7\0\12\212\13\0\4\212"+ - "\1\0\2\212\2\0\1\u0153\3\0\2\212\3\0\1\212"+ - "\4\0\1\212\1\0\1\u0153\5\212\1\u01da\1\212\1\0"+ - "\1\212\7\0\12\212\13\0\4\212\1\0\2\212\2\0"+ - "\1\u0153\3\0\2\212\3\0\1\212\4\0\1\212\1\0"+ - "\1\u0153\3\212\1\u01db\3\212\1\0\1\212\7\0\12\212"+ - "\15\0\1\u01dc\2\0\2\u01dc\23\0\1\u01dc\1\0\2\u01dc"+ - "\4\0\1\u01dc\10\0\4\u01dc\2\0\1\u01dc\1\0\1\u01dc"+ - "\102\0\1\u01dd\77\0\1\u01dd\32\0\1\u01de\1\0\1\u0119"+ - "\15\0\1\u011a\1\u011b\2\u011a\27\0\4\55\1\0\2\55"+ - "\2\0\1\u011e\3\0\2\55\3\0\1\u01df\4\0\1\55"+ - "\1\0\1\u011e\7\55\1\0\1\55\7\0\12\55\57\0"+ - "\3\u01e0\30\0\4\55\1\0\2\55\2\0\1\u011e\3\0"+ - "\2\55\3\0\1\55\4\0\1\55\1\0\1\u011e\6\55"+ - "\1\u01e1\1\0\1\55\7\0\12\55\13\0\2\55\1\u01e2"+ - "\1\55\1\0\2\55\2\0\1\u011e\3\0\2\55\3\0"+ - "\1\55\4\0\1\55\1\0\1\u011e\7\55\1\0\1\55"+ - "\7\0\12\55\13\0\1\55\1\u01e3\2\55\1\0\2\55"+ - "\2\0\1\u011e\3\0\2\55\3\0\1\55\4\0\1\55"+ - "\1\0\1\u011e\7\55\1\0\1\55\7\0\12\55\13\0"+ - "\4\212\1\0\2\212\2\0\1\u0153\3\0\2\212\3\0"+ - "\1\u01e4\4\0\1\212\1\0\1\u0153\7\212\1\0\1\212"+ - "\7\0\12\212\13\0\4\212\1\0\2\212\2\0\1\u0153"+ - "\3\0\2\212\3\0\1\212\4\0\1\212\1\0\1\u0153"+ - "\6\212\1\u01e5\1\0\1\212\7\0\12\212\13\0\2\212"+ - "\1\u01e6\1\212\1\0\2\212\2\0\1\u0153\3\0\2\212"+ - "\3\0\1\212\4\0\1\212\1\0\1\u0153\7\212\1\0"+ - "\1\212\7\0\12\212\13\0\1\212\1\u01e7\2\212\1\0"+ - "\2\212\2\0\1\u0153\3\0\2\212\3\0\1\212\4\0"+ - "\1\212\1\0\1\u0153\7\212\1\0\1\212\7\0\12\212"+ - "\15\0\1\u01e8\2\0\2\u01e8\23\0\1\u01e8\1\0\2\u01e8"+ - "\4\0\1\u01e8\10\0\4\u01e8\2\0\1\u01e8\1\0\1\u01e8"+ - "\57\0\3\u01e9\30\0\2\55\1\u01ea\1\55\1\0\2\55"+ - "\2\0\1\u011e\3\0\2\55\3\0\1\55\4\0\1\55"+ - "\1\0\1\u011e\7\55\1\0\1\55\7\0\12\55\13\0"+ - "\2\212\1\u01eb\1\212\1\0\2\212\2\0\1\u0153\3\0"+ - "\2\212\3\0\1\212\4\0\1\212\1\0\1\u0153\7\212"+ - "\1\0\1\212\7\0\12\212\15\0\1\u01ec\2\0\2\u01ec"+ - "\23\0\1\u01ec\1\0\2\u01ec\4\0\1\u01ec\10\0\4\u01ec"+ - "\2\0\1\u01ec\1\0\1\u01ec\6\0"; + "\1\u0163\3\0\2\212\3\0\1\212\4\0\1\212\1\0"+ + "\1\u0163\7\212\1\0\1\212\7\0\12\212\13\0\3\212"+ + "\1\u0164\1\0\2\212\2\0\1\u0163\3\0\2\212\3\0"+ + "\1\212\4\0\1\212\1\0\1\u0163\4\212\1\u0165\2\212"+ + "\1\0\1\212\7\0\12\212\13\0\4\212\1\0\2\212"+ + "\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0\1\u0166"+ + "\1\0\1\u0163\7\212\1\0\1\212\7\0\12\212\17\0"+ + "\1\u0167\72\0\3\212\1\u0168\1\0\2\212\2\0\1\u0163"+ + "\3\0\2\212\3\0\1\212\4\0\1\212\1\0\1\u0163"+ + "\2\212\1\u0169\4\212\1\0\1\212\7\0\12\212\13\0"+ + "\4\212\1\0\2\212\2\0\1\u0163\3\0\1\u016a\1\212"+ + "\3\0\1\212\4\0\1\212\1\0\1\u0163\7\212\1\0"+ + "\1\212\7\0\12\212\12\0\1\u015e\7\0\1\u016b\66\0"+ + "\1\u016c\10\0\1\u016d\100\0\1\u016e\73\0\1\u016f\2\0"+ + "\1\u016e\100\0\1\u0170\62\0\4\212\1\0\2\212\2\0"+ + "\1\u0163\3\0\2\212\3\0\1\u0171\4\0\1\212\1\0"+ + "\1\u0163\7\212\1\0\1\212\7\0\12\212\13\0\4\212"+ + "\1\0\2\212\2\0\1\u0163\3\0\2\212\3\0\1\u0172"+ + "\4\0\1\212\1\0\1\u0163\7\212\1\0\1\212\7\0"+ + "\12\212\32\0\1\u0173\56\0\1\u0174\20\0\1\u015d\77\0"+ + "\1\u0161\22\0\1\u0175\1\u0176\31\0\2\212\1\u0177\1\212"+ + "\1\0\2\212\2\0\1\u0163\3\0\2\212\3\0\1\212"+ + "\4\0\1\212\1\0\1\u0163\7\212\1\0\1\212\7\0"+ + "\12\212\36\0\1\u015d\53\0\3\212\1\u0178\1\0\2\212"+ + "\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0\1\212"+ + "\1\0\1\u0163\7\212\1\0\1\212\7\0\12\212\13\0"+ + "\4\212\1\0\1\u0179\1\212\2\0\1\u0163\3\0\2\212"+ + "\3\0\1\212\4\0\1\212\1\0\1\u0163\7\212\1\0"+ + "\1\212\7\0\12\212\13\0\4\212\1\0\1\u017a\1\212"+ + "\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0\1\212"+ + "\1\0\1\u0163\7\212\1\0\1\212\7\0\12\212\57\0"+ + "\1\243\52\0\1\u014c\2\0\1\u014c\22\0\2\245\116\0"+ + "\1\u017b\77\0\1\u017c\54\0\2\250\73\0\1\252\76\0"+ + "\1\256\34\0\1\u017d\2\0\2\u017d\23\0\1\u017d\1\0"+ + "\2\u017d\4\0\1\u017d\10\0\4\u017d\2\0\1\u017d\1\0"+ + "\1\u017d\10\0\1\u017e\1\0\1\u017e\10\0\1\u017e\15\0"+ + "\1\u017e\15\0\1\u017f\1\u0180\16\0\1\u017e\1\0\3\u017e"+ + "\2\0\1\u0181\171\0\1\u0182\77\0\1\u0183\52\0\1\u0184"+ + "\1\u0185\75\0\1\272\76\0\1\274\100\0\2\277\17\0"+ + "\1\u0186\1\u0187\75\0\1\u0188\77\0\1\u0189\52\0\1\302"+ + "\121\0\1\u018a\77\0\1\u018b\10\0\1\u018c\2\0\2\u018c"+ + "\23\0\1\u018c\1\0\2\u018c\4\0\1\u018c\10\0\4\u018c"+ + "\2\0\1\u018c\1\0\1\u018c\13\0\2\311\1\0\1\311"+ + "\11\0\2\311\3\0\1\311\4\0\1\311\6\0\3\311"+ + "\11\0\1\311\4\0\2\311\1\0\1\311\16\0\1\312"+ + "\2\0\2\312\23\0\1\312\1\0\2\312\4\0\1\312"+ + "\10\0\4\312\2\0\1\312\1\0\1\312\57\0\3\u018d"+ + "\74\0\1\316\1\u018e\52\0\1\u018f\22\0\1\316\1\u018e"+ + "\2\316\73\0\1\316\76\0\1\320\76\0\1\56\121\0"+ + "\1\u0190\77\0\1\u0191\6\0\4\327\1\0\2\327\6\0"+ + "\2\327\3\0\1\327\4\0\1\327\2\0\1\327\1\0"+ + "\5\327\1\0\1\327\7\0\1\327\1\0\2\327\1\0"+ + "\2\327\1\0\2\327\66\0\1\330\2\0\1\330\2\0"+ + "\1\330\61\0\1\u0192\1\u0193\77\0\2\332\73\0\3\u0194"+ + "\25\0\1\u0195\77\0\1\u0196\1\u0195\7\0\1\u0197\1\u0198"+ + "\1\0\1\u0195\5\0\1\u0195\5\0\1\u0199\15\0\1\u0195"+ + "\1\u019a\2\u0195\26\0\1\u0198\12\0\1\u0195\13\0\1\u0199"+ + "\15\0\1\u0195\1\u019a\2\u0195\30\0\1\u019b\112\0\1\u019c"+ + "\65\0\1\u019d\21\0\1\u0199\15\0\1\u0195\1\u019a\2\u0195"+ + "\32\0\1\u019e\72\0\1\u0197\7\0\1\u019f\66\0\1\u0195"+ + "\10\0\1\u01a0\15\0\1\u0199\15\0\1\u0195\1\u019a\2\u0195"+ + "\41\0\1\u01a1\13\0\1\u0199\15\0\1\u0195\1\u019a\2\u0195"+ + "\26\0\1\u0195\7\0\1\u0195\2\0\1\u01a1\13\0\1\u0199"+ + "\15\0\1\u0195\1\u019a\2\u0195\23\0\1\u01a2\116\0\1\u01a3"+ + "\11\0\1\u0199\15\0\1\u0195\1\u019a\2\u0195\51\0\1\u0195"+ + "\73\0\1\u01a4\56\0\1\360\20\0\1\u0195\5\0\1\u0199"+ + "\15\0\1\u0195\1\u019a\2\u0195\50\0\1\u0195\22\0\1\u0192"+ + "\1\u0193\54\0\1\u0195\2\0\1\u0199\15\0\1\u0195\1\u019a"+ + "\2\u0195\53\0\1\u0195\100\0\1\u0199\15\0\1\u0195\1\u019a"+ + "\2\u0195\32\0\1\u0195\137\0\1\310\34\0\1\u01a5\2\0"+ + "\2\u01a5\23\0\1\u01a5\1\0\2\u01a5\4\0\1\u01a5\10\0"+ + "\4\u01a5\2\0\1\u01a5\1\0\1\u01a5\13\0\4\372\1\0"+ + "\2\372\6\0\2\372\3\0\1\372\4\0\1\372\2\0"+ + "\1\372\1\0\5\372\1\0\1\372\7\0\12\372\10\0"+ + "\1\u010e\77\0\1\u01a6\1\u010e\7\0\1\u01a7\1\u01a8\1\0"+ + "\1\u010e\5\0\1\u010e\55\0\1\u01a8\12\0\1\u010e\65\0"+ + "\1\u01a9\112\0\1\u01aa\65\0\1\u01ab\75\0\1\u01ac\72\0"+ + "\1\u01a7\7\0\1\u01ad\66\0\1\u010e\10\0\1\u01ae\100\0"+ + "\1\u01af\63\0\1\u010e\7\0\1\u010e\2\0\1\u01af\60\0"+ + "\1\373\116\0\1\u01b0\104\0\1\u010e\73\0\1\u01b1\56\0"+ + "\1\u010e\20\0\1\u010e\77\0\1\u010e\100\0\1\u010e\77\0"+ + "\1\u010e\55\0\1\u010e\137\0\1\u01b2\1\0\2\u0110\73\0"+ + "\1\u0112\1\u0113\75\0\1\u0112\76\0\1\54\1\u01b3\31\0"+ + "\4\u0116\1\0\2\u0116\6\0\2\u0116\3\0\1\u0116\4\0"+ + "\1\u0116\2\0\1\u0117\6\u0116\1\0\1\u0117\7\0\2\u0117"+ + "\1\u0116\2\u0117\1\u0116\2\u0117\1\u0116\1\u0117\32\0\1\u01b4"+ + "\103\0\1\u01b5\1\0\1\u0120\15\0\1\u0121\1\u0122\2\u0121"+ + "\25\0\1\u012f\1\u01b6\7\0\1\u012f\66\0\1\u012f\26\0"+ + "\1\u0120\15\0\1\u0121\1\u0122\2\u0121\26\0\1\u012f\143\0"+ + "\1\u0121\32\0\2\64\1\u01b7\1\64\1\0\2\64\2\0"+ + "\1\u0125\3\0\2\64\3\0\1\64\4\0\1\64\1\0"+ + "\1\u0125\7\64\1\0\1\64\7\0\12\64\13\0\4\64"+ + "\1\0\1\64\1\u01b8\2\0\1\u0125\3\0\2\64\3\0"+ + "\1\64\4\0\1\64\1\0\1\u0125\7\64\1\0\1\64"+ + "\7\0\12\64\13\0\4\64\1\0\2\64\2\0\1\u0125"+ + "\3\0\2\64\3\0\1\64\4\0\1\64\1\0\1\u0125"+ + "\5\64\1\u01b9\1\64\1\0\1\64\7\0\12\64\13\0"+ + "\4\64\1\0\2\64\2\0\1\u0125\3\0\1\64\1\u01ba"+ + "\3\0\1\64\4\0\1\64\1\0\1\u0125\7\64\1\0"+ + "\1\64\7\0\12\64\13\0\4\64\1\0\2\64\2\0"+ + "\1\u0125\3\0\2\64\3\0\1\64\4\0\1\64\1\0"+ + "\1\u0125\4\64\1\u01bb\2\64\1\0\1\64\7\0\12\64"+ + "\17\0\1\u01bc\21\0\1\u0120\15\0\1\u0121\1\u0122\2\u0121"+ + "\27\0\4\64\1\0\1\64\1\u01bd\2\0\1\u0125\3\0"+ + "\2\64\3\0\1\64\4\0\1\64\1\0\1\u0125\7\64"+ + "\1\0\1\64\7\0\12\64\13\0\4\64\1\0\2\64"+ + "\2\0\1\u0125\3\0\1\64\1\u01be\3\0\1\64\4\0"+ + "\1\64\1\0\1\u0125\7\64\1\0\1\64\7\0\12\64"+ + "\22\0\1\u01bf\77\0\1\u01c0\15\0\1\u0120\15\0\1\u0121"+ + "\1\u0122\2\u0121\41\0\1\u0133\13\0\1\u0120\15\0\1\u0121"+ + "\1\u0122\2\u0121\24\0\1\u01c1\115\0\1\u01c2\62\0\4\64"+ + "\1\0\2\64\2\0\1\u0125\3\0\2\64\3\0\1\64"+ + "\3\0\1\u0120\1\64\1\0\1\u0125\7\64\1\0\1\64"+ + "\1\0\1\u0121\1\u0122\2\u0121\2\0\12\64\13\0\4\64"+ + "\1\0\2\64\2\0\1\u0125\3\0\2\64\3\0\1\64"+ + "\4\0\1\64\1\0\1\u0125\6\64\1\u01c3\1\0\1\64"+ + "\7\0\12\64\32\0\1\u01c4\6\0\1\u0120\15\0\1\u0121"+ + "\1\u0122\2\u0121\31\0\1\u014b\15\0\1\u014c\1\u014d\1\0"+ + "\1\u014c\20\0\1\u0148\1\u0149\2\u01c5\1\0\1\u014a\71\0"+ + "\1\u013a\32\0\4\64\1\0\2\64\2\0\1\u0125\3\0"+ + "\2\64\3\0\1\64\4\0\1\64\1\0\1\u0125\5\64"+ + "\1\u01c6\1\64\1\0\1\64\7\0\12\64\37\0\1\u01c7"+ + "\1\0\1\u0120\15\0\1\u0121\1\u0122\2\u0121\27\0\4\64"+ + "\1\0\2\64\2\0\1\u0125\3\0\2\64\3\0\1\64"+ + "\4\0\1\64\1\0\1\u0125\4\64\1\u01c8\2\64\1\0"+ + "\1\64\7\0\12\64\13\0\4\64\1\0\2\64\2\0"+ + "\1\u0125\3\0\1\64\1\u01c9\3\0\1\64\4\0\1\64"+ + "\1\0\1\u0125\7\64\1\0\1\64\7\0\12\64\13\0"+ + "\4\u0144\1\0\2\u0144\2\0\1\u01ca\3\0\2\u0144\3\0"+ + "\1\u0144\4\0\1\u0144\1\0\1\u01ca\7\u0144\1\0\1\u0144"+ + "\7\0\12\u0144\13\0\3\u0144\1\u01cb\1\0\2\u0144\2\0"+ + "\1\u01ca\3\0\2\u0144\3\0\1\u0144\4\0\1\u0144\1\0"+ + "\1\u01ca\7\u0144\1\0\1\u0144\7\0\12\u0144\32\0\1\u01cc"+ + "\123\0\1\u0148\1\u0149\75\0\1\u0148\25\0\51\u014a\2\0"+ + "\24\u014a\10\0\1\u01cd\66\0\1\u01ce\1\0\1\u01ce\2\0"+ + "\13\u01ce\1\0\3\u01ce\2\0\2\u01ce\2\0\1\u01ce\1\0"+ + "\12\u01ce\1\0\6\u01ce\1\0\14\u01ce\1\0\4\u01ce\51\0"+ + "\1\u01c5\1\u01cf\120\0\1\u01d0\77\0\1\u01d0\4\0\1\156"+ + "\1\u0153\7\0\1\156\66\0\1\156\103\0\1\156\101\0"+ + "\1\156\77\0\1\156\100\0\1\156\100\0\1\156\101\0"+ + "\1\156\55\0\1\u016c\10\0\1\u016c\66\0\1\u016c\77\0"+ + "\2\212\1\u01d1\1\212\1\0\2\212\2\0\1\u0163\3\0"+ + "\2\212\3\0\1\212\4\0\1\212\1\0\1\u0163\7\212"+ + "\1\0\1\212\7\0\12\212\13\0\4\212\1\0\1\212"+ + "\1\u01d2\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0"+ + "\1\212\1\0\1\u0163\7\212\1\0\1\212\7\0\12\212"+ + "\13\0\4\212\1\0\2\212\2\0\1\u0163\3\0\2\212"+ + "\3\0\1\212\4\0\1\212\1\0\1\u0163\5\212\1\u01d3"+ + "\1\212\1\0\1\212\7\0\12\212\13\0\4\212\1\0"+ + "\2\212\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0"+ + "\1\212\1\0\1\u0163\4\212\1\u01d4\2\212\1\0\1\212"+ + "\7\0\12\212\17\0\1\u01d5\72\0\4\212\1\0\1\212"+ + "\1\u01d6\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0"+ + "\1\212\1\0\1\u0163\7\212\1\0\1\212\7\0\12\212"+ + "\13\0\4\212\1\0\2\212\2\0\1\u0163\3\0\1\212"+ + "\1\u01d7\3\0\1\212\4\0\1\212\1\0\1\u0163\7\212"+ + "\1\0\1\212\7\0\12\212\22\0\1\u01d8\77\0\1\u01d9"+ + "\100\0\1\u016f\100\0\1\u01da\62\0\4\212\1\0\2\212"+ + "\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0\1\212"+ + "\1\0\1\u0163\6\212\1\u01db\1\0\1\212\7\0\12\212"+ + "\32\0\1\u0163\77\0\1\u014c\2\0\1\u014c\117\0\1\u0175"+ + "\32\0\4\212\1\0\2\212\2\0\1\u0163\3\0\2\212"+ + "\3\0\1\212\4\0\1\212\1\0\1\u0163\5\212\1\u01dc"+ + "\1\212\1\0\1\212\7\0\12\212\13\0\4\212\1\0"+ + "\2\212\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0"+ + "\1\212\1\0\1\u0163\4\212\1\u01dd\2\212\1\0\1\212"+ + "\7\0\12\212\13\0\4\212\1\0\2\212\2\0\1\u0163"+ + "\3\0\1\212\1\u01de\3\0\1\212\4\0\1\212\1\0"+ + "\1\u0163\7\212\1\0\1\212\7\0\12\212\102\0\1\u01df"+ + "\77\0\1\u01df\10\0\1\u01e0\2\0\2\u01e0\23\0\1\u01e0"+ + "\1\0\2\u01e0\4\0\1\u01e0\10\0\4\u01e0\2\0\1\u01e0"+ + "\1\0\1\u01e0\57\0\1\u017f\121\0\1\u01e1\77\0\1\u01e1"+ + "\52\0\1\u0184\121\0\1\u01e2\77\0\1\u01e3\75\0\1\u01e4"+ + "\77\0\1\u01e4\75\0\1\u01e5\77\0\1\u01e5\75\0\1\u01e6"+ + "\77\0\1\u01e6\52\0\1\u0192\30\0\1\u0195\1\u0198\7\0"+ + "\1\u0195\66\0\1\u0195\26\0\1\u0199\15\0\1\u0195\1\u019a"+ + "\2\u0195\26\0\1\u0195\143\0\1\u0195\34\0\1\u01e7\112\0"+ + "\1\u0195\64\0\1\u0195\21\0\1\u0199\15\0\1\u0195\1\u019a"+ + "\2\u0195\35\0\1\u0195\77\0\1\u0195\77\0\1\u0195\15\0"+ + "\1\u0199\15\0\1\u0195\1\u019a\2\u0195\41\0\1\u0195\13\0"+ + "\1\u0199\15\0\1\u0195\1\u019a\2\u0195\43\0\1\u0195\101\0"+ + "\1\u0195\6\0\1\u0199\15\0\1\u0195\1\u019a\2\u0195\31\0"+ + "\1\307\2\0\2\307\23\0\1\307\1\0\2\307\4\0"+ + "\1\307\10\0\4\307\2\0\1\307\1\0\1\307\11\0"+ + "\1\u010e\1\u01a8\7\0\1\u010e\66\0\1\u010e\101\0\1\u010f"+ + "\112\0\1\u010e\64\0\1\u010e\100\0\1\u010e\77\0\1\u010e"+ + "\77\0\1\u010e\100\0\1\u010e\100\0\1\u010e\101\0\1\u010e"+ + "\123\0\1\u01b2\3\u0110\73\0\1\54\51\0\1\u01e8\123\0"+ + "\3\u01e9\27\0\1\u01ea\77\0\3\64\1\u01eb\1\0\2\64"+ + "\2\0\1\u0125\3\0\2\64\3\0\1\64\4\0\1\64"+ + "\1\0\1\u0125\7\64\1\0\1\64\7\0\12\64\13\0"+ + "\2\64\1\u01ec\1\64\1\0\2\64\2\0\1\u0125\3\0"+ + "\2\64\3\0\1\64\4\0\1\64\1\0\1\u0125\7\64"+ + "\1\0\1\64\7\0\12\64\13\0\2\64\1\u01ed\1\64"+ + "\1\0\2\64\2\0\1\u0125\3\0\2\64\3\0\1\64"+ + "\4\0\1\64\1\0\1\u0125\7\64\1\0\1\64\7\0"+ + "\12\64\37\0\1\u01ee\1\0\1\u0120\15\0\1\u0121\1\u0122"+ + "\2\u0121\27\0\2\64\1\u01ef\1\64\1\0\2\64\2\0"+ + "\1\u0125\3\0\2\64\3\0\1\64\4\0\1\64\1\0"+ + "\1\u0125\7\64\1\0\1\64\7\0\12\64\15\0\1\u014b"+ + "\16\0\1\u014d\22\0\1\u0148\1\u0149\2\u01c5\1\0\1\u014a"+ + "\25\0\4\64\1\0\2\64\2\0\1\u0125\3\0\2\64"+ + "\3\0\1\64\4\0\1\64\1\0\1\u0125\3\64\1\u01f0"+ + "\3\64\1\0\1\64\7\0\12\64\13\0\4\64\1\0"+ + "\2\64\2\0\1\u0125\3\0\2\64\3\0\1\64\4\0"+ + "\1\64\1\0\1\u0125\5\64\1\u01f1\1\64\1\0\1\64"+ + "\7\0\12\64\13\0\4\64\1\0\2\64\2\0\1\u0125"+ + "\3\0\2\64\3\0\1\64\4\0\1\64\1\0\1\u0125"+ + "\3\64\1\u01f2\3\64\1\0\1\64\7\0\12\64\13\0"+ + "\4\u0144\1\0\1\u0144\1\u01f3\2\0\1\u01ca\3\0\2\u0144"+ + "\3\0\1\u0144\4\0\1\u0144\1\0\1\u01ca\7\u0144\1\0"+ + "\1\u0144\7\0\12\u0144\32\0\1\u01ca\65\0\1\u01f4\134\0"+ + "\1\u01c5\32\0\3\212\1\u01f5\1\0\2\212\2\0\1\u0163"+ + "\3\0\2\212\3\0\1\212\4\0\1\212\1\0\1\u0163"+ + "\7\212\1\0\1\212\7\0\12\212\13\0\2\212\1\u01f6"+ + "\1\212\1\0\2\212\2\0\1\u0163\3\0\2\212\3\0"+ + "\1\212\4\0\1\212\1\0\1\u0163\7\212\1\0\1\212"+ + "\7\0\12\212\13\0\2\212\1\u01f7\1\212\1\0\2\212"+ + "\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0\1\212"+ + "\1\0\1\u0163\7\212\1\0\1\212\7\0\12\212\13\0"+ + "\2\212\1\u01f8\1\212\1\0\2\212\2\0\1\u0163\3\0"+ + "\2\212\3\0\1\212\4\0\1\212\1\0\1\u0163\7\212"+ + "\1\0\1\212\7\0\12\212\13\0\4\212\1\0\2\212"+ + "\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0\1\212"+ + "\1\0\1\u0163\3\212\1\u01f9\3\212\1\0\1\212\7\0"+ + "\12\212\13\0\4\212\1\0\2\212\2\0\1\u0163\3\0"+ + "\2\212\3\0\1\212\4\0\1\212\1\0\1\u0163\5\212"+ + "\1\u01fa\1\212\1\0\1\212\7\0\12\212\13\0\4\212"+ + "\1\0\2\212\2\0\1\u0163\3\0\2\212\3\0\1\212"+ + "\4\0\1\212\1\0\1\u0163\3\212\1\u01fb\3\212\1\0"+ + "\1\212\7\0\12\212\15\0\1\u01fc\2\0\2\u01fc\23\0"+ + "\1\u01fc\1\0\2\u01fc\4\0\1\u01fc\10\0\4\u01fc\2\0"+ + "\1\u01fc\1\0\1\u01fc\102\0\1\u01fd\77\0\1\u01fd\32\0"+ + "\1\u01fe\1\0\1\u0120\15\0\1\u0121\1\u0122\2\u0121\27\0"+ + "\4\64\1\0\2\64\2\0\1\u0125\3\0\2\64\3\0"+ + "\1\u01ff\4\0\1\64\1\0\1\u0125\7\64\1\0\1\64"+ + "\7\0\12\64\57\0\3\u0200\30\0\4\64\1\0\2\64"+ + "\2\0\1\u0125\3\0\2\64\3\0\1\64\4\0\1\64"+ + "\1\0\1\u0125\6\64\1\u0201\1\0\1\64\7\0\12\64"+ + "\13\0\2\64\1\u0202\1\64\1\0\2\64\2\0\1\u0125"+ + "\3\0\2\64\3\0\1\64\4\0\1\64\1\0\1\u0125"+ + "\7\64\1\0\1\64\7\0\12\64\13\0\1\64\1\u0203"+ + "\2\64\1\0\2\64\2\0\1\u0125\3\0\2\64\3\0"+ + "\1\64\4\0\1\64\1\0\1\u0125\7\64\1\0\1\64"+ + "\7\0\12\64\13\0\4\212\1\0\2\212\2\0\1\u0163"+ + "\3\0\2\212\3\0\1\u0204\4\0\1\212\1\0\1\u0163"+ + "\7\212\1\0\1\212\7\0\12\212\13\0\4\212\1\0"+ + "\2\212\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0"+ + "\1\212\1\0\1\u0163\6\212\1\u0205\1\0\1\212\7\0"+ + "\12\212\13\0\2\212\1\u0206\1\212\1\0\2\212\2\0"+ + "\1\u0163\3\0\2\212\3\0\1\212\4\0\1\212\1\0"+ + "\1\u0163\7\212\1\0\1\212\7\0\12\212\13\0\1\212"+ + "\1\u0207\2\212\1\0\2\212\2\0\1\u0163\3\0\2\212"+ + "\3\0\1\212\4\0\1\212\1\0\1\u0163\7\212\1\0"+ + "\1\212\7\0\12\212\15\0\1\u0208\2\0\2\u0208\23\0"+ + "\1\u0208\1\0\2\u0208\4\0\1\u0208\10\0\4\u0208\2\0"+ + "\1\u0208\1\0\1\u0208\57\0\3\u0209\30\0\2\64\1\u020a"+ + "\1\64\1\0\2\64\2\0\1\u0125\3\0\2\64\3\0"+ + "\1\64\4\0\1\64\1\0\1\u0125\7\64\1\0\1\64"+ + "\7\0\12\64\13\0\2\212\1\u020b\1\212\1\0\2\212"+ + "\2\0\1\u0163\3\0\2\212\3\0\1\212\4\0\1\212"+ + "\1\0\1\u0163\7\212\1\0\1\212\7\0\12\212\15\0"+ + "\1\u020c\2\0\2\u020c\23\0\1\u020c\1\0\2\u020c\4\0"+ + "\1\u020c\10\0\4\u020c\2\0\1\u020c\1\0\1\u020c\6\0"; private static int [] zzUnpackTrans() { - int [] result = new int[21546]; + int [] result = new int[22995]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -722,35 +748,36 @@ private static int zzUnpackTrans(String packed, int offset, int [] result) { private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\46\0\1\11\1\1\1\11\33\1\1\11\3\1\1\11"+ - "\1\1\2\11\1\0\1\1\1\11\2\1\3\11\22\1"+ - "\1\11\1\0\10\11\1\1\1\0\1\1\1\11\1\0"+ - "\2\11\1\0\2\11\1\0\1\11\2\1\1\11\1\0"+ - "\2\11\1\0\2\1\1\11\15\1\1\11\10\1\2\11"+ - "\1\1\1\11\2\1\1\11\1\0\3\1\2\11\1\0"+ - "\3\11\1\0\2\11\1\1\2\11\1\1\1\0\1\1"+ - "\2\0\1\1\1\11\1\0\1\11\1\0\1\11\1\0"+ - "\3\1\1\11\1\0\2\1\1\11\1\1\1\11\2\1"+ - "\1\0\2\11\1\1\1\0\1\11\2\1\1\11\1\1"+ - "\1\0\3\1\1\11\1\1\1\0\25\1\1\0\4\11"+ - "\1\0\1\1\1\11\1\1\2\0\2\1\2\0\1\1"+ - "\2\0\3\1\1\0\1\1\2\0\1\1\1\0\1\1"+ - "\1\0\1\11\1\0\1\1\1\0\3\1\1\0\2\1"+ - "\1\11\2\0\2\1\1\11\10\1\1\0\5\1\2\0"+ - "\5\1\1\0\2\1\1\11\4\1\1\11\1\0\1\11"+ - "\3\0\1\1\1\0\1\1\1\0\2\1\2\0\2\1"+ - "\1\0\1\11\1\1\1\0\2\11\1\1\1\11\7\1"+ - "\1\0\1\11\2\1\1\11\1\0\3\1\1\11\4\1"+ + "\55\0\1\11\1\1\1\11\33\1\1\11\3\1\1\11"+ + "\1\1\1\11\1\1\1\0\1\1\1\11\2\1\3\11"+ + "\22\1\11\11\2\1\6\11\2\1\3\11\2\1\1\11"+ + "\15\1\1\11\10\1\2\11\1\1\1\11\2\1\1\11"+ + "\1\0\4\1\2\11\1\0\3\11\1\0\2\11\1\1"+ + "\2\11\2\1\2\0\1\1\1\11\1\0\1\11\1\0"+ + "\1\11\3\1\1\11\1\0\2\1\1\11\1\1\1\11"+ + "\2\1\1\11\4\1\1\11\1\0\1\11\1\0\2\1"+ + "\1\11\4\1\1\11\26\1\2\0\4\11\1\1\1\11"+ + "\1\1\1\0\2\1\2\0\1\1\2\0\3\1\1\0"+ + "\1\1\2\0\1\1\1\0\1\1\1\0\1\11\1\0"+ + "\1\1\1\0\1\1\1\0\1\1\1\0\1\1\3\0"+ + "\3\1\1\0\2\1\1\11\2\0\2\1\1\11\10\1"+ + "\1\0\5\1\2\0\5\1\1\0\2\1\1\11\4\1"+ + "\1\11\2\1\4\0\1\1\3\0\1\11\3\0\1\1"+ + "\1\0\1\1\1\0\2\1\2\0\2\1\1\0\1\11"+ + "\1\1\1\0\2\11\1\1\1\11\7\1\1\0\1\11"+ + "\2\1\1\11\1\0\3\1\1\11\1\1\1\0\4\1"+ "\2\0\1\1\2\11\1\0\1\11\2\0\1\11\7\0"+ - "\2\11\2\0\1\11\5\0\1\11\13\0\1\1\1\0"+ - "\1\1\3\0\1\1\2\0\2\1\1\0\2\1\2\0"+ - "\12\1\1\0\4\1\1\11\2\1\2\11\4\1\1\11"+ - "\2\1\3\11\4\1\1\11\1\1\1\11\2\0\3\11"+ - "\1\0\1\11\1\0\3\1\1\0\14\1\1\11\1\0"+ - "\1\1\1\11\10\1\1\11\2\1\1\11"; + "\2\11\4\0\1\11\1\0\1\11\4\0\1\11\13\0"+ + "\1\1\1\0\1\1\3\0\1\1\2\0\2\1\1\0"+ + "\2\1\4\0\12\1\1\0\3\1\1\0\1\1\1\11"+ + "\2\1\1\11\1\1\2\0\1\11\1\0\1\11\4\1"+ + "\1\11\2\1\3\11\4\1\1\11\1\1\1\11\2\0"+ + "\3\11\1\0\2\11\1\0\3\1\1\0\5\1\1\11"+ + "\10\1\1\11\1\0\1\1\1\11\10\1\1\11\2\1"+ + "\1\11"; private static int [] zzUnpackAttribute() { - int [] result = new int[492]; + int [] result = new int[524]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -1154,13 +1181,13 @@ else if (zzAtEOF) { case 1: { return TokenType.BAD_CHARACTER; } - case 176: break; + case 181: break; case 2: { // use stack to match up nested OPENING_CURLY and CLOSING_CURLY pushAndBegin(YYINITIAL); return ElixirTypes.OPENING_CURLY; } - case 177: break; + case 182: break; case 3: { // protect from too many "}" if (!stack.empty()) { @@ -1170,130 +1197,131 @@ else if (zzAtEOF) { return ElixirTypes.CLOSING_CURLY; } - case 178: break; + case 183: break; case 4: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.RELATIONAL_OPERATOR; } - case 179: break; + case 184: break; case 5: { pushAndBegin(CALL_OR_KEYWORD_PAIR_MAYBE); return ElixirTypes.IDENTIFIER_TOKEN; } - case 180: break; + case 185: break; case 6: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.CAPTURE_OPERATOR; } - case 181: break; + case 186: break; case 7: { pushAndBegin(SIGIL); return ElixirTypes.TILDE; } - case 182: break; + case 187: break; case 8: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.PIPE_OPERATOR; } - case 183: break; + case 188: break; case 9: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.UNARY_OPERATOR; } - case 184: break; + case 189: break; case 10: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.MATCH_OPERATOR; } - case 185: break; + case 190: break; case 11: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.STRUCT_OPERATOR; } - case 186: break; + case 191: break; case 12: { pushAndBegin(DOT_OPERATION); return ElixirTypes.DOT_OPERATOR; } - case 187: break; + case 192: break; case 13: { pushAndBegin(DUAL_OPERATION); return ElixirTypes.DUAL_OPERATOR; } - case 188: break; + case 193: break; case 14: { pushAndBegin(ATOM_START); return ElixirTypes.COLON; } - case 189: break; + case 194: break; case 15: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.AT_OPERATOR; } - case 190: break; + case 195: break; case 16: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.DIVISION_OPERATOR; } - case 191: break; + case 196: break; case 17: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.MULTIPLICATION_OPERATOR; } - case 192: break; + case 197: break; case 18: { pushAndBegin(CHAR_TOKENIZATION); return ElixirTypes.CHAR_TOKENIZER; } - case 193: break; + case 198: break; case 19: { pushAndBegin(DECIMAL_WHOLE_NUMBER); return ElixirTypes.VALID_DECIMAL_DIGITS; } - case 194: break; + case 199: break; case 20: { pushAndBegin(SIGN_OPERATION_MAYBE); return ElixirTypes.COMMA; } - case 195: break; + case 200: break; case 21: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.ALIAS_TOKEN; } - case 196: break; + case 201: break; case 22: { return ElixirTypes.SEMICOLON; } - case 197: break; + case 202: break; case 23: { pushAndBegin(SIGN_OPERATION_MAYBE); return ElixirTypes.EOL; } - case 198: break; + case 203: break; case 24: { return TokenType.WHITE_SPACE; } - case 199: break; + case 204: break; case 25: - { return ElixirTypes.OPENING_PARENTHESIS; + { pushAndBegin(MULTILINE_WHITE_SPACE_MAYBE); + return ElixirTypes.OPENING_PARENTHESIS; } - case 200: break; + case 205: break; case 26: { return ElixirTypes.COMMENT; } - case 201: break; + case 206: break; case 27: { return ElixirTypes.CLOSING_BRACKET; } - case 202: break; + case 207: break; case 28: { return ElixirTypes.OPENING_BRACKET; } - case 203: break; + case 208: break; case 29: { return ElixirTypes.CLOSING_PARENTHESIS; } - case 204: break; + case 209: break; case 30: { /* return to KEYWORD_PAIR_MAYBE so that COLON after quote can be parsed as KEYWORD_PAIR_COLON to differentiate between valid `` @@ -1302,13 +1330,13 @@ else if (zzAtEOF) { startQuote(yytext()); return promoterType(); } - case 205: break; + case 210: break; case 31: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.ATOM_FRAGMENT; } - case 206: break; + case 211: break; case 32: { /* At the end of the quote, return the state (YYINITIAL or INTERPOLATION) before ATOM_START as anything after the closing quote should be handle by the state prior to ATOM_START. Without @@ -1318,172 +1346,172 @@ else if (zzAtEOF) { startQuote(yytext()); return promoterType(); } - case 207: break; + case 212: break; case 33: { yybegin(UNKNOWN_BASE_WHOLE_NUMBER); return ElixirTypes.UNKNOWN_WHOLE_NUMBER_BASE; } - case 208: break; + case 213: break; case 34: { yybegin(OCTAL_WHOLE_NUMBER); return ElixirTypes.OCTAL_WHOLE_NUMBER_BASE; } - case 209: break; + case 214: break; case 35: { yybegin(BINARY_WHOLE_NUMBER); return ElixirTypes.BINARY_WHOLE_NUMBER_BASE; } - case 210: break; + case 215: break; case 36: { yybegin(BINARY_WHOLE_NUMBER); return ElixirTypes.OBSOLETE_BINARY_WHOLE_NUMBER_BASE; } - case 211: break; + case 216: break; case 37: { yybegin(HEXADECIMAL_WHOLE_NUMBER); return ElixirTypes.HEXADECIMAL_WHOLE_NUMBER_BASE; } - case 212: break; + case 217: break; case 38: { yybegin(HEXADECIMAL_WHOLE_NUMBER); return ElixirTypes.OBSOLETE_HEXADECIMAL_WHOLE_NUMBER_BASE; } - case 213: break; + case 218: break; case 39: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } - case 214: break; + case 219: break; case 40: { return ElixirTypes.INVALID_BINARY_DIGITS; } - case 215: break; + case 220: break; case 41: { return ElixirTypes.VALID_BINARY_DIGITS; } - case 216: break; + case 221: break; case 42: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); - handleInState(stackFrame.getLastLexicalState()); + handleInState(stackFrame.getLastLexicalState()); } - case 217: break; + case 222: break; case 43: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); // zero-width token return ElixirTypes.CALL; } - case 218: break; + case 223: break; case 44: { handleInState(KEYWORD_PAIR_MAYBE); } - case 219: break; + case 224: break; case 45: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.CHAR_LIST_FRAGMENT; } - case 220: break; + case 225: break; case 46: { yybegin(ESCAPE_SEQUENCE); return ElixirTypes.ESCAPE; } - case 221: break; + case 226: break; case 47: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } - case 222: break; + case 227: break; case 48: { return ElixirTypes.INVALID_DECIMAL_DIGITS; } - case 223: break; + case 228: break; case 49: { return ElixirTypes.VALID_DECIMAL_DIGITS; } - case 224: break; + case 229: break; case 50: { return ElixirTypes.DECIMAL_SEPARATOR; } - case 225: break; + case 230: break; case 51: { handleInState(DECIMAL_EXPONENT); } - case 226: break; + case 231: break; case 52: { yybegin(DECIMAL_EXPONENT); return ElixirTypes.DUAL_OPERATOR; } - case 227: break; + case 232: break; case 53: { yybegin(DECIMAL_EXPONENT_SIGN); return ElixirTypes.EXPONENT_MARK; } - case 228: break; + case 233: break; case 54: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } - case 229: break; + case 234: break; case 55: { yybegin(CALL_MAYBE); return ElixirTypes.RELATIONAL_OPERATOR; } - case 230: break; + case 235: break; case 56: { yybegin(CALL_OR_KEYWORD_PAIR_MAYBE); return ElixirTypes.IDENTIFIER_TOKEN; } - case 231: break; + case 236: break; case 57: { yybegin(CALL_MAYBE); return ElixirTypes.CAPTURE_OPERATOR; } - case 232: break; + case 237: break; case 58: { yybegin(CALL_MAYBE); return ElixirTypes.PIPE_OPERATOR; } - case 233: break; + case 238: break; case 59: { yybegin(CALL_MAYBE); return ElixirTypes.UNARY_OPERATOR; } - case 234: break; + case 239: break; case 60: { yybegin(CALL_MAYBE); return ElixirTypes.MATCH_OPERATOR; } - case 235: break; + case 240: break; case 61: { yybegin(CALL_MAYBE); return ElixirTypes.STRUCT_OPERATOR; } - case 236: break; + case 241: break; case 62: { yybegin(CALL_MAYBE); return ElixirTypes.DUAL_OPERATOR; } - case 237: break; + case 242: break; case 63: { yybegin(CALL_MAYBE); return ElixirTypes.AT_OPERATOR; } - case 238: break; + case 243: break; case 64: { yybegin(CALL_MAYBE); return ElixirTypes.DIVISION_OPERATOR; } - case 239: break; + case 244: break; case 65: { yybegin(CALL_MAYBE); return ElixirTypes.MULTIPLICATION_OPERATOR; } - case 240: break; + case 245: break; case 66: { return ElixirTypes.EOL; } - case 241: break; + case 246: break; case 67: { /* return to CALL_MAYBE so that OPENING_BRACKET or OPENING_PARENTHESES after quote can be parsed @@ -1493,59 +1521,59 @@ else if (zzAtEOF) { startQuote(yytext()); return promoterType(); } - case 242: break; + case 247: break; case 68: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.SIGNIFICANT_WHITE_SPACE; } - case 243: break; + case 248: break; case 69: { yybegin(GROUP); return fragmentType(); } - case 244: break; + case 249: break; case 70: { yybegin(GROUP); return ElixirTypes.EOL; } - case 245: break; + case 250: break; case 71: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.ESCAPED_CHARACTER_TOKEN; } - case 246: break; + case 251: break; case 72: { yybegin(UNICODE_ESCAPE_SEQUENCE); return ElixirTypes.UNICODE_ESCAPE_CHARACTER; } - case 247: break; + case 252: break; case 73: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.EOL; } - case 248: break; + case 253: break; case 74: { yybegin(HEXADECIMAL_ESCAPE_SEQUENCE); return ElixirTypes.HEXADECIMAL_WHOLE_NUMBER_BASE; } - case 249: break; + case 254: break; case 75: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.CLOSING_CURLY; } - case 250: break; + case 255: break; case 76: { return ElixirTypes.VALID_HEXADECIMAL_DIGITS; } - case 251: break; + case 256: break; case 77: { return fragmentType(); } - case 252: break; + case 257: break; case 78: { if (isTerminator(yytext())) { if (isSigil()) { @@ -1560,7 +1588,7 @@ else if (zzAtEOF) { return fragmentType(); } } - case 253: break; + case 258: break; case 79: { if (isInterpolating()) { pushAndBegin(ESCAPE_SEQUENCE); @@ -1570,7 +1598,7 @@ else if (zzAtEOF) { return fragmentType(); } } - case 254: break; + case 259: break; case 80: { if (isInterpolating()) { pushAndBegin(ESCAPE_SEQUENCE); @@ -1579,12 +1607,12 @@ else if (zzAtEOF) { return fragmentType(); } } - case 255: break; + case 260: break; case 81: { yybegin(GROUP_HEREDOC_LINE_START); return ElixirTypes.EOL; } - case 256: break; + case 261: break; case 82: { /* The EOL after the escape is also needed to end the Heredoc line. It functions as both, so arbitarily I'm choosing the escaped version to be a zero-width token. */ @@ -1592,132 +1620,139 @@ else if (zzAtEOF) { yybegin(GROUP_HEREDOC_LINE_BODY); return ElixirTypes.EOL; } - case 257: break; + case 262: break; case 83: { handleInState(GROUP_HEREDOC_LINE_BODY); } - case 258: break; + case 263: break; case 84: { yybegin(GROUP_HEREDOC_LINE_BODY); - return ElixirTypes.HEREDOC_LINE_WHITE_SPACE_TOKEN; + return ElixirTypes.HEREDOC_LINE_WHITE_SPACE_TOKEN; } - case 259: break; + case 264: break; case 85: { yybegin(GROUP_HEREDOC_LINE_START); return ElixirTypes.EOL; } - case 260: break; + case 265: break; case 86: { yybegin(EXTENDED_HEXADECIMAL_ESCAPE_SEQUENCE); return ElixirTypes.OPENING_CURLY; } - case 261: break; + case 266: break; case 87: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.VALID_HEXADECIMAL_DIGITS; } - case 262: break; + case 267: break; case 88: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } - case 263: break; + case 268: break; case 89: { return ElixirTypes.INVALID_HEXADECIMAL_DIGITS; } - case 264: break; + case 269: break; case 90: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.INTERPOLATION_END; } - case 265: break; + case 270: break; case 91: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); - handleInState(stackFrame.getLastLexicalState()); + yybegin(stackFrame.getLastLexicalState()); + return TokenType.WHITE_SPACE; } - case 266: break; + case 271: break; case 92: + { org.elixir_lang.lexer.StackFrame stackFrame = pop(); + yybegin(stackFrame.getLastLexicalState()); + return ElixirTypes.EOL; + } + case 272: break; + case 93: { setPromoter(yytext()); yybegin(GROUP); return promoterType(); } - case 267: break; - case 93: + case 273: break; + case 94: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } - case 268: break; - case 94: + case 274: break; + case 95: { return ElixirTypes.INVALID_OCTAL_DIGITS; } - case 269: break; - case 95: + case 275: break; + case 96: { return ElixirTypes.VALID_OCTAL_DIGITS; } - case 270: break; - case 96: + case 276: break; + case 97: { handleInState(SIGN_OPERATION); } - case 271: break; - case 97: + case 277: break; + case 98: { yybegin(SIGN_OPERATION_KEYWORD_PAIR_MAYBE); return ElixirTypes.SIGN_OPERATOR; } - case 272: break; - case 98: + case 278: break; + case 99: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); yybegin(stackFrame.getLastLexicalState()); return ElixirTypes.DIVISION_OPERATOR; } - case 273: break; - case 99: + case 279: break; + case 100: { nameSigil(yytext()); yybegin(NAMED_SIGIL); return sigilNameType(); } - case 274: break; - case 100: + case 280: break; + case 101: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } - case 275: break; - case 101: + case 281: break; + case 102: { return ElixirTypes.SIGIL_MODIFIER; } - case 276: break; - case 102: + case 282: break; + case 103: { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } - case 277: break; - case 103: + case 283: break; + case 104: { return ElixirTypes.INVALID_UNKNOWN_BASE_DIGITS; } - case 278: break; - case 104: + case 284: break; + case 105: { return ElixirTypes.OPENING_BIT; } - case 279: break; - case 105: + case 285: break; + case 106: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.TWO_OPERATOR; } - case 280: break; - case 106: + case 286: break; + case 107: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.ARROW_OPERATOR; } - case 281: break; - case 107: + case 287: break; + case 108: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.IN_MATCH_OPERATOR; } - case 282: break; - case 108: + case 288: break; + case 109: // general lookahead, find correct zzMarkedPos - { int zzFState = 36; + { int zzFState = 39; int zzFPos = zzStartRead; if (zzFin.length <= zzBufferL.length()) { zzFin = new boolean[zzBufferL.length()+1]; } boolean zzFinL[] = zzFin; @@ -1732,7 +1767,7 @@ else if (zzAtEOF) { zzFinL[zzFPos++] = false; } - zzFState = 37; + zzFState = 40; zzFPos = zzMarkedPos; while (!zzFinL[zzFPos] || (zzAttrL[zzFState] & 1) != 1) { zzInput = Character.codePointBefore(zzBufferL, zzFPos/*, zzStartRead*/); @@ -1744,144 +1779,216 @@ else if (zzAtEOF) { { pushAndBegin(REFERENCE_OPERATION); return ElixirTypes.IDENTIFIER_TOKEN; } - case 283: break; - case 109: + case 289: break; + case 110: { return ElixirTypes.CLOSING_BIT; } - case 284: break; - case 110: + case 290: break; + case 111: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.AND_SYMBOL_OPERATOR; } - case 285: break; - case 111: - { pushAndBegin(KEYWORD_PAIR_MAYBE); + case 291: break; + case 112: + { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.DO; } - case 286: break; - case 112: + case 292: break; + case 113: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.OR_SYMBOL_OPERATOR; } - case 287: break; - case 113: + case 293: break; + case 114: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.COMPARISON_OPERATOR; } - case 288: break; - case 114: + case 294: break; + case 115: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.ASSOCIATION_OPERATOR; } - case 289: break; - case 115: + case 295: break; + case 116: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.OR_WORD_OPERATOR; } - case 290: break; - case 116: + case 296: break; + case 117: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.RANGE_OPERATOR; } - case 291: break; - case 117: - { pushAndBegin(KEYWORD_PAIR_MAYBE); + case 297: break; + case 118: + { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.STAB_OPERATOR; } - case 292: break; - case 118: + case 298: break; + case 119: { return ElixirTypes.TYPE_OPERATOR; } - case 293: break; - case 119: + case 299: break; + case 120: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { return ElixirTypes.COLON; } - case 294: break; - case 120: + case 300: break; + case 121: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.IN_OPERATOR; } - case 295: break; - case 121: - { pushAndBegin(KEYWORD_PAIR_MAYBE); + case 301: break; + case 122: + { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.FN; } - case 296: break; - case 122: + case 302: break; + case 123: + // general lookahead, find correct zzMarkedPos + { int zzFState = 43; + int zzFPos = zzStartRead; + if (zzFin.length <= zzBufferL.length()) { zzFin = new boolean[zzBufferL.length()+1]; } + boolean zzFinL[] = zzFin; + while (zzFState != -1 && zzFPos < zzMarkedPos) { + zzFinL[zzFPos] = ((zzAttrL[zzFState] & 1) == 1); + zzInput = Character.codePointAt(zzBufferL, zzFPos/*, zzMarkedPos*/); + zzFPos += Character.charCount(zzInput); + zzFState = zzTransL[ zzRowMapL[zzFState] + ZZ_CMAP(zzInput) ]; + } + if (zzFState != -1) { zzFinL[zzFPos++] = ((zzAttrL[zzFState] & 1) == 1); } + while (zzFPos <= zzMarkedPos) { + zzFinL[zzFPos++] = false; + } + + zzFState = 44; + zzFPos = zzMarkedPos; + while (!zzFinL[zzFPos] || (zzAttrL[zzFState] & 1) != 1) { + zzInput = Character.codePointBefore(zzBufferL, zzFPos/*, zzStartRead*/); + zzFPos -= Character.charCount(zzInput); + zzFState = zzTransL[ zzRowMapL[zzFState] + ZZ_CMAP(zzInput) ]; + }; + zzMarkedPos = zzFPos; + } + { CharSequence text = yytext(); + int length = text.length(); + + for (int i = length - 1; i >= 0; i--) { + if (text.charAt(i) == '\n') { + if (i == 0 || text.charAt(i - 1) != '\\') { + yypushback(length - i); + break; + } + } + } + + pushAndBegin(LAST_EOL); + + return TokenType.WHITE_SPACE; + } + case 303: break; + case 124: + // general lookahead, find correct zzMarkedPos + { int zzFState = 41; + int zzFPos = zzStartRead; + if (zzFin.length <= zzBufferL.length()) { zzFin = new boolean[zzBufferL.length()+1]; } + boolean zzFinL[] = zzFin; + while (zzFState != -1 && zzFPos < zzMarkedPos) { + zzFinL[zzFPos] = ((zzAttrL[zzFState] & 1) == 1); + zzInput = Character.codePointAt(zzBufferL, zzFPos/*, zzMarkedPos*/); + zzFPos += Character.charCount(zzInput); + zzFState = zzTransL[ zzRowMapL[zzFState] + ZZ_CMAP(zzInput) ]; + } + if (zzFState != -1) { zzFinL[zzFPos++] = ((zzAttrL[zzFState] & 1) == 1); } + while (zzFPos <= zzMarkedPos) { + zzFinL[zzFPos++] = false; + } + + zzFState = 42; + zzFPos = zzMarkedPos; + while (!zzFinL[zzFPos] || (zzAttrL[zzFState] & 1) != 1) { + zzInput = Character.codePointBefore(zzBufferL, zzFPos/*, zzStartRead*/); + zzFPos -= Character.charCount(zzInput); + zzFState = zzTransL[ zzRowMapL[zzFState] + ZZ_CMAP(zzInput) ]; + }; + zzMarkedPos = zzFPos; + } + { return TokenType.WHITE_SPACE; + } + case 304: break; + case 125: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { pushAndBegin(BASE_WHOLE_NUMBER_BASE); return ElixirTypes.BASE_WHOLE_NUMBER_PREFIX; } - case 297: break; - case 123: + case 305: break; + case 126: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { yybegin(DECIMAL_FRACTION); return ElixirTypes.DECIMAL_MARK; } - case 298: break; - case 124: + case 306: break; + case 127: { yybegin(CALL_MAYBE); return ElixirTypes.TWO_OPERATOR; } - case 299: break; - case 125: + case 307: break; + case 128: { yybegin(CALL_MAYBE); return ElixirTypes.ARROW_OPERATOR; } - case 300: break; - case 126: + case 308: break; + case 129: { yybegin(CALL_MAYBE); return ElixirTypes.IN_MATCH_OPERATOR; } - case 301: break; - case 127: + case 309: break; + case 130: { yybegin(CALL_MAYBE); return ElixirTypes.AND_SYMBOL_OPERATOR; } - case 302: break; - case 128: + case 310: break; + case 131: { yybegin(CALL_MAYBE); return ElixirTypes.DO; } - case 303: break; - case 129: + case 311: break; + case 132: { yybegin(CALL_MAYBE); return ElixirTypes.OR_SYMBOL_OPERATOR; } - case 304: break; - case 130: + case 312: break; + case 133: { yybegin(CALL_MAYBE); return ElixirTypes.COMPARISON_OPERATOR; } - case 305: break; - case 131: + case 313: break; + case 134: { yybegin(CALL_MAYBE); return ElixirTypes.OR_WORD_OPERATOR; } - case 306: break; - case 132: + case 314: break; + case 135: { yybegin(CALL_MAYBE); return ElixirTypes.RANGE_OPERATOR; } - case 307: break; - case 133: + case 315: break; + case 136: { yybegin(CALL_MAYBE); return ElixirTypes.STAB_OPERATOR; } - case 308: break; - case 134: + case 316: break; + case 137: { yybegin(CALL_MAYBE); return ElixirTypes.IN_OPERATOR; } - case 309: break; - case 135: + case 317: break; + case 138: { CharSequence groupTerminator = yytext().subSequence(1, yytext().length()); // manual lookahread pushes terminator back @@ -1899,8 +2006,8 @@ else if (zzAtEOF) { return fragmentType(); } } - case 310: break; - case 136: + case 318: break; + case 139: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); @@ -1912,8 +2019,8 @@ else if (zzAtEOF) { return ElixirTypes.ESCAPE; } - case 311: break; - case 137: + case 319: break; + case 140: { if (isInterpolating()) { pushAndBegin(INTERPOLATION); return ElixirTypes.INTERPOLATION_START; @@ -1921,8 +2028,8 @@ else if (zzAtEOF) { return fragmentType(); } } - case 312: break; - case 138: + case 320: break; + case 141: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); @@ -1934,19 +2041,27 @@ else if (zzAtEOF) { return ElixirTypes.ESCAPE; } } - case 313: break; - case 139: + case 321: break; + case 142: + // lookahead expression with fixed base length + zzMarkedPos = Character.offsetByCodePoints + (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); + { yybegin(MULTILINE_WHITE_SPACE_MAYBE); + return ElixirTypes.KEYWORD_PAIR_COLON; + } + case 322: break; + case 143: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { org.elixir_lang.lexer.StackFrame stackFrame = pop(); - yybegin(stackFrame.getLastLexicalState()); - return ElixirTypes.KEYWORD_PAIR_COLON; + yybegin(stackFrame.getLastLexicalState()); + return ElixirTypes.KEYWORD_PAIR_COLON; } - case 314: break; - case 140: + case 323: break; + case 144: // general lookahead, find correct zzMarkedPos - { int zzFState = 36; + { int zzFState = 39; int zzFPos = zzStartRead; if (zzFin.length <= zzBufferL.length()) { zzFin = new boolean[zzBufferL.length()+1]; } boolean zzFinL[] = zzFin; @@ -1961,7 +2076,7 @@ else if (zzAtEOF) { zzFinL[zzFPos++] = false; } - zzFState = 37; + zzFState = 40; zzFPos = zzMarkedPos; while (!zzFinL[zzFPos] || (zzAttrL[zzFState] & 1) != 1) { zzInput = Character.codePointBefore(zzBufferL, zzFPos/*, zzStartRead*/); @@ -1973,81 +2088,81 @@ else if (zzAtEOF) { { org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } - case 315: break; - case 141: + case 324: break; + case 145: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.END; } - case 316: break; - case 142: + case 325: break; + case 146: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.NOT_OPERATOR; } - case 317: break; - case 143: + case 326: break; + case 147: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.NIL; } - case 318: break; - case 144: + case 327: break; + case 148: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.AND_WORD_OPERATOR; } - case 319: break; - case 145: + case 328: break; + case 149: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.THREE_OPERATOR; } - case 320: break; - case 146: + case 329: break; + case 150: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { pushAndBegin(ATOM_START); return ElixirTypes.COLON; } - case 321: break; - case 147: + case 330: break; + case 151: // lookahead expression with fixed lookahead length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzMarkedPos, -2); { return ElixirTypes.SIGNIFICANT_WHITE_SPACE; } - case 322: break; - case 148: + case 331: break; + case 152: { startQuote(yytext()); return promoterType(); } - case 323: break; - case 149: + case 332: break; + case 153: { yybegin(CALL_MAYBE); return ElixirTypes.END; } - case 324: break; - case 150: + case 333: break; + case 154: { yybegin(CALL_MAYBE); return ElixirTypes.NIL; } - case 325: break; - case 151: + case 334: break; + case 155: { yybegin(CALL_MAYBE); return ElixirTypes.AND_WORD_OPERATOR; } - case 326: break; - case 152: + case 335: break; + case 156: { yybegin(CALL_MAYBE); return ElixirTypes.THREE_OPERATOR; } - case 327: break; - case 153: + case 336: break; + case 157: { /* Does NOT return to CALL_MAYBE because heredocs aren't valid relative identifiers. This clauses is only here to prevent a prefix match on {QUOTE_PROMOTER}. */ org.elixir_lang.lexer.StackFrame stackFrame = pop(); handleInState(stackFrame.getLastLexicalState()); } - case 328: break; - case 154: + case 337: break; + case 158: { if (isTerminator(yytext())) { if (isSigil()) { yybegin(SIGIL_MODIFIERS); @@ -2061,12 +2176,12 @@ else if (zzAtEOF) { handleInState(GROUP_HEREDOC_LINE_BODY); } } - case 329: break; - case 155: + case 338: break; + case 159: { handleInState(GROUP_HEREDOC_END); } - case 330: break; - case 156: + case 339: break; + case 160: { // Similar to GROUP_HEREDOC_END's GROUP_HEREDOC_TERMINATOR rule, but... if (isTerminator(yytext())) { if (isSigil()) { @@ -2083,14 +2198,14 @@ else if (zzAtEOF) { return TokenType.BAD_CHARACTER; } } - case 331: break; - case 157: + case 340: break; + case 161: { setPromoter(yytext()); yybegin(GROUP_HEREDOC_START); return promoterType(); } - case 332: break; - case 158: + case 341: break; + case 162: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2); @@ -2098,58 +2213,65 @@ else if (zzAtEOF) { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.TUPLE_OPERATOR; } - case 333: break; - case 159: + case 342: break; + case 163: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.WHEN_OPERATOR; } - case 334: break; - case 160: - { pushAndBegin(KEYWORD_PAIR_MAYBE); + case 343: break; + case 164: + { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.ELSE; } - case 335: break; - case 161: + case 344: break; + case 165: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.TRUE; } - case 336: break; - case 162: + case 345: break; + case 166: + // lookahead expression with fixed lookahead length + zzMarkedPos = Character.offsetByCodePoints + (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzMarkedPos, -3); + { return TokenType.WHITE_SPACE; + } + case 346: break; + case 167: { yybegin(CALL_MAYBE); return ElixirTypes.WHEN_OPERATOR; } - case 337: break; - case 163: + case 347: break; + case 168: { yybegin(CALL_MAYBE); return ElixirTypes.ELSE; } - case 338: break; - case 164: + case 348: break; + case 169: { yybegin(CALL_MAYBE); return ElixirTypes.TRUE; } - case 339: break; - case 165: + case 349: break; + case 170: { String groupHeredocTerminator = yytext().toString().trim(); - // manual lookahead pushes terminator back - yypushback(3); + // manual lookahead pushes terminator back + yypushback(3); - if (isTerminator(groupHeredocTerminator)) { - yybegin(GROUP_HEREDOC_END); - return ElixirTypes.HEREDOC_PREFIX_WHITE_SPACE; - } else { - yybegin(GROUP_HEREDOC_LINE_BODY); - return ElixirTypes.HEREDOC_LINE_WHITE_SPACE_TOKEN; - } + if (isTerminator(groupHeredocTerminator)) { + yybegin(GROUP_HEREDOC_END); + return ElixirTypes.HEREDOC_PREFIX_WHITE_SPACE; + } else { + yybegin(GROUP_HEREDOC_LINE_BODY); + return ElixirTypes.HEREDOC_LINE_WHITE_SPACE_TOKEN; + } } - case 340: break; - case 166: - { pushAndBegin(KEYWORD_PAIR_MAYBE); + case 350: break; + case 171: + { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.AFTER; } - case 341: break; - case 167: + case 351: break; + case 172: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 3); @@ -2157,33 +2279,33 @@ else if (zzAtEOF) { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.MAP_OPERATOR; } - case 342: break; - case 168: + case 352: break; + case 173: { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.FALSE; } - case 343: break; - case 169: - { pushAndBegin(KEYWORD_PAIR_MAYBE); + case 353: break; + case 174: + { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.CATCH; } - case 344: break; - case 170: + case 354: break; + case 175: { yybegin(CALL_MAYBE); return ElixirTypes.AFTER; } - case 345: break; - case 171: + case 355: break; + case 176: { yybegin(CALL_MAYBE); return ElixirTypes.FALSE; } - case 346: break; - case 172: + case 356: break; + case 177: { yybegin(CALL_MAYBE); return ElixirTypes.CATCH; } - case 347: break; - case 173: + case 357: break; + case 178: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 4); @@ -2191,17 +2313,17 @@ else if (zzAtEOF) { pushAndBegin(KEYWORD_PAIR_MAYBE); return ElixirTypes.BIT_STRING_OPERATOR; } - case 348: break; - case 174: - { pushAndBegin(KEYWORD_PAIR_MAYBE); + case 358: break; + case 179: + { pushAndBegin(KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE); return ElixirTypes.RESCUE; } - case 349: break; - case 175: + case 359: break; + case 180: { yybegin(CALL_MAYBE); return ElixirTypes.RESCUE; } - case 350: break; + case 360: break; default: zzScanError(ZZ_NO_MATCH); } diff --git a/testData/org/elixir_lang/action/create_elixir_module_action_test/camel_case_one/camel_case_two.ex b/testData/org/elixir_lang/action/create_elixir_module_action_test/camel_case_one/camel_case_two.ex index 3c309f2db..bb32ee5a2 100644 --- a/testData/org/elixir_lang/action/create_elixir_module_action_test/camel_case_one/camel_case_two.ex +++ b/testData/org/elixir_lang/action/create_elixir_module_action_test/camel_case_one/camel_case_two.ex @@ -1,6 +1,4 @@ defmodule CamelCaseOne.CamelCaseTwo do @moduledoc false - - end diff --git a/testData/org/elixir_lang/action/create_elixir_module_action_test/foo/bar.ex b/testData/org/elixir_lang/action/create_elixir_module_action_test/foo/bar.ex index 46096172d..afb1e1621 100644 --- a/testData/org/elixir_lang/action/create_elixir_module_action_test/foo/bar.ex +++ b/testData/org/elixir_lang/action/create_elixir_module_action_test/foo/bar.ex @@ -1,6 +1,4 @@ defmodule Foo.Bar do @moduledoc false - - end diff --git a/testData/org/elixir_lang/action/create_elixir_module_action_test/foo_bar.ex b/testData/org/elixir_lang/action/create_elixir_module_action_test/foo_bar.ex index ccd15a09a..3729faa08 100644 --- a/testData/org/elixir_lang/action/create_elixir_module_action_test/foo_bar.ex +++ b/testData/org/elixir_lang/action/create_elixir_module_action_test/foo_bar.ex @@ -1,6 +1,4 @@ defmodule FooBar do @moduledoc false - - end diff --git a/testData/org/elixir_lang/formatting/comment_in_pipeline.ex b/testData/org/elixir_lang/formatting/comment_in_pipeline.ex index 27c13e847..0fdf8a2b0 100644 --- a/testData/org/elixir_lang/formatting/comment_in_pipeline.ex +++ b/testData/org/elixir_lang/formatting/comment_in_pipeline.ex @@ -2,5 +2,5 @@ one # Above `two` |> two() -# Above `three` + # Above `three` |> three() diff --git a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/Block.txt b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/Block.txt index 280fbcbdc..415ef8396 100644 --- a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/Block.txt +++ b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/Block.txt @@ -21,9 +21,7 @@ Elixir File(0,34) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(16,34) ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(16,34) PsiElement(fn)('fn')(16,18) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(18,19) - PsiElement(\\n, \\r\\n)('\n')(18,19) - PsiWhiteSpace(' ')(19,21) + PsiWhiteSpace('\n ')(18,21) ElixirStabImpl(STAB)(21,30) ElixirStabBodyImpl(STAB_BODY)(21,30) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,24) @@ -35,6 +33,5 @@ Elixir File(0,34) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(27,30) ElixirIdentifierImpl(IDENTIFIER)(27,30) PsiElement(identifier)('two')(27,30) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(30,31) - PsiElement(\\n, \\r\\n)('\n')(30,31) - PsiElement(end)('end')(31,34) \ No newline at end of file + PsiWhiteSpace('\n')(30,31) + PsiElement(end)('end')(31,34) diff --git a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnEndOfExpressionStabEnd.txt b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnEndOfExpressionStabEnd.txt index 909f7773e..5a47d6ccf 100644 --- a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnEndOfExpressionStabEnd.txt +++ b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnEndOfExpressionStabEnd.txt @@ -16,12 +16,10 @@ Elixir File(0,21) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(11,21) ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(11,21) PsiElement(fn)('fn')(11,13) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(13,14) - PsiElement(\\n, \\r\\n)('\n')(13,14) - PsiWhiteSpace(' ')(14,15) + PsiWhiteSpace('\n ')(13,15) ElixirStabImpl(STAB)(15,17) ElixirStabOperationImpl(STAB_OPERATION)(15,17) ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(15,17) PsiElement(->)('->')(15,17) PsiWhiteSpace(' ')(17,18) - PsiElement(end)('end')(18,21) \ No newline at end of file + PsiElement(end)('end')(18,21) diff --git a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnMultiNewlineStab.txt b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnMultiNewlineStab.txt index ac310ca52..3372e32b6 100644 --- a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnMultiNewlineStab.txt +++ b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnMultiNewlineStab.txt @@ -2,10 +2,7 @@ Elixir File(0,20) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(0,20) ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(0,20) PsiElement(fn)('fn')(0,2) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(2,4) - PsiElement(\\n, \\r\\n)('\n')(2,3) - PsiElement(\\n, \\r\\n)('\n')(3,4) - PsiWhiteSpace(' ')(4,6) + PsiWhiteSpace('\n\n ')(2,6) ElixirStabImpl(STAB)(6,16) ElixirStabOperationImpl(STAB_OPERATION)(6,16) ElixirStabNoParenthesesSignatureImpl(STAB_NO_PARENTHESES_SIGNATURE)(6,9) @@ -22,6 +19,5 @@ Elixir File(0,20) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(13,16) ElixirIdentifierImpl(IDENTIFIER)(13,16) PsiElement(identifier)('one')(13,16) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(16,17) - PsiElement(\\n, \\r\\n)('\n')(16,17) - PsiElement(end)('end')(17,20) \ No newline at end of file + PsiWhiteSpace('\n')(16,17) + PsiElement(end)('end')(17,20) diff --git a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnMultiStabEnd.txt b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnMultiStabEnd.txt index a4ae6ba42..0566ebda0 100644 --- a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnMultiStabEnd.txt +++ b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnMultiStabEnd.txt @@ -2,9 +2,7 @@ Elixir File(0,72) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(0,72) ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(0,72) PsiElement(fn)('fn')(0,2) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(2,3) - PsiElement(\\n, \\r\\n)('\n')(2,3) - PsiWhiteSpace(' ')(3,5) + PsiWhiteSpace('\n ')(2,5) ElixirStabImpl(STAB)(5,68) ElixirStabOperationImpl(STAB_OPERATION)(5,35) ElixirStabNoParenthesesSignatureImpl(STAB_NO_PARENTHESES_SIGNATURE)(5,23) @@ -55,6 +53,5 @@ Elixir File(0,72) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(60,68) ElixirIdentifierImpl(IDENTIFIER)(60,68) PsiElement(identifier)('body_two')(60,68) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(68,69) - PsiElement(\\n, \\r\\n)('\n')(68,69) - PsiElement(end)('end')(69,72) \ No newline at end of file + PsiWhiteSpace('\n')(68,69) + PsiElement(end)('end')(69,72) diff --git a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnStabEndOfExpressionExpressionListEndOfExpressionEnd.txt b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnStabEndOfExpressionExpressionListEndOfExpressionEnd.txt index c0aabc269..74c741a69 100644 --- a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnStabEndOfExpressionExpressionListEndOfExpressionEnd.txt +++ b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnStabEndOfExpressionExpressionListEndOfExpressionEnd.txt @@ -5,10 +5,9 @@ Elixir File(0,77) PsiWhiteSpace(' ')(2,3) ElixirStabImpl(STAB)(3,33) ElixirStabOperationImpl(STAB_OPERATION)(3,33) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(3,6) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(3,5) PsiElement(->)('->')(3,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) ElixirStabBodyImpl(STAB_BODY)(8,33) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(8,19) ElixirIdentifierImpl(IDENTIFIER)(8,19) @@ -23,8 +22,8 @@ Elixir File(0,77) PsiElement(;)(';')(33,34) PsiWhiteSpace(' ')(34,35) PsiElement(end)('end')(35,38) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(38,40) - PsiElement(\\n, \\r\\n)('\n')(38,39) + PsiWhiteSpace('\n')(38,39) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(39,40) PsiElement(\\n, \\r\\n)('\n')(39,40) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(40,77) ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(40,77) @@ -32,10 +31,9 @@ Elixir File(0,77) PsiWhiteSpace(' ')(42,43) ElixirStabImpl(STAB)(43,73) ElixirStabOperationImpl(STAB_OPERATION)(43,73) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(43,46) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(43,45) PsiElement(->)('->')(43,45) - PsiElement(\\n, \\r\\n)('\n')(45,46) - PsiWhiteSpace(' ')(46,48) + PsiWhiteSpace('\n ')(45,48) ElixirStabBodyImpl(STAB_BODY)(48,73) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(48,59) ElixirIdentifierImpl(IDENTIFIER)(48,59) @@ -46,6 +44,5 @@ Elixir File(0,77) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(62,73) ElixirIdentifierImpl(IDENTIFIER)(62,73) PsiElement(identifier)('expression2')(62,73) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(73,74) - PsiElement(\\n, \\r\\n)('\n')(73,74) - PsiElement(end)('end')(74,77) \ No newline at end of file + PsiWhiteSpace('\n')(73,74) + PsiElement(end)('end')(74,77) diff --git a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnStabMultiNewlineStab.txt b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnStabMultiNewlineStab.txt index e8bc9a8cb..b50639dcc 100644 --- a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnStabMultiNewlineStab.txt +++ b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/FnStabMultiNewlineStab.txt @@ -2,9 +2,7 @@ Elixir File(0,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(0,33) ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(0,33) PsiElement(fn)('fn')(0,2) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(2,3) - PsiElement(\\n, \\r\\n)('\n')(2,3) - PsiWhiteSpace(' ')(3,5) + PsiWhiteSpace('\n ')(2,5) ElixirStabImpl(STAB)(5,29) ElixirStabOperationImpl(STAB_OPERATION)(5,15) ElixirStabNoParenthesesSignatureImpl(STAB_NO_PARENTHESES_SIGNATURE)(5,8) @@ -21,8 +19,8 @@ Elixir File(0,33) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(12,15) ElixirIdentifierImpl(IDENTIFIER)(12,15) PsiElement(identifier)('one')(12,15) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(15,17) - PsiElement(\\n, \\r\\n)('\n')(15,16) + PsiWhiteSpace('\n')(15,16) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(16,17) PsiElement(\\n, \\r\\n)('\n')(16,17) PsiWhiteSpace(' ')(17,19) ElixirStabOperationImpl(STAB_OPERATION)(19,29) @@ -40,6 +38,5 @@ Elixir File(0,33) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(26,29) ElixirIdentifierImpl(IDENTIFIER)(26,29) PsiElement(identifier)('two')(26,29) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(29,30) - PsiElement(\\n, \\r\\n)('\n')(29,30) - PsiElement(end)('end')(30,33) \ No newline at end of file + PsiWhiteSpace('\n')(29,30) + PsiElement(end)('end')(30,33) diff --git a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/KernelTypespecRegression.txt b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/KernelTypespecRegression.txt index 899a0f243..395d69ab7 100644 --- a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/KernelTypespecRegression.txt +++ b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/KernelTypespecRegression.txt @@ -2,10 +2,9 @@ Elixir File(0,200) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(0,200) ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(0,200) PsiElement(fn)('fn')(0,2) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(2,14) - PsiElement(\\n, \\r\\n)('\n')(2,3) - PsiWhiteSpace(' ')(3,5) - PsiComment(#)('# OTP 18')(5,13) + PsiWhiteSpace('\n ')(2,5) + PsiComment(#)('# OTP 18')(5,13) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(13,14) PsiElement(\\n, \\r\\n)('\n')(13,14) PsiWhiteSpace(' ')(14,16) ElixirStabImpl(STAB)(16,196) @@ -47,10 +46,9 @@ Elixir File(0,200) PsiElement(])(']')(50,51) PsiElement(})('}')(51,52) PsiWhiteSpace(' ')(52,53) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(53,56) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(53,55) PsiElement(->)('->')(53,55) - PsiElement(\\n, \\r\\n)('\n')(55,56) - PsiWhiteSpace(' ')(56,60) + PsiWhiteSpace('\n ')(55,60) ElixirStabBodyImpl(STAB_BODY)(60,100) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(60,100) ElixirTupleImpl(TUPLE)(60,100) @@ -78,10 +76,9 @@ Elixir File(0,200) PsiElement(identifier)('v')(97,98) PsiElement())(')')(98,99) PsiElement(})('}')(99,100) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(100,112) - PsiElement(\\n, \\r\\n)('\n')(100,101) - PsiWhiteSpace(' ')(101,103) - PsiComment(#)('# OTP 17')(103,111) + PsiWhiteSpace('\n ')(100,103) + PsiComment(#)('# OTP 17')(103,111) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(111,112) PsiElement(\\n, \\r\\n)('\n')(111,112) PsiWhiteSpace(' ')(112,114) ElixirStabOperationImpl(STAB_OPERATION)(114,196) @@ -118,10 +115,9 @@ Elixir File(0,200) PsiElement(identifier)('v')(146,147) PsiElement(})('}')(147,148) PsiWhiteSpace(' ')(148,149) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(149,152) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(149,151) PsiElement(->)('->')(149,151) - PsiElement(\\n, \\r\\n)('\n')(151,152) - PsiWhiteSpace(' ')(152,156) + PsiWhiteSpace('\n ')(151,156) ElixirStabBodyImpl(STAB_BODY)(156,196) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(156,196) ElixirTupleImpl(TUPLE)(156,196) @@ -149,6 +145,5 @@ Elixir File(0,200) PsiElement(identifier)('v')(193,194) PsiElement())(')')(194,195) PsiElement(})('}')(195,196) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(196,197) - PsiElement(\\n, \\r\\n)('\n')(196,197) - PsiElement(end)('end')(197,200) \ No newline at end of file + PsiWhiteSpace('\n')(196,197) + PsiElement(end)('end')(197,200) diff --git a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/SpliceOnStab.txt b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/SpliceOnStab.txt index baf1e1fda..f7d940eb2 100644 --- a/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/SpliceOnStab.txt +++ b/testData/org/elixir_lang/parser_definition/anonymous_function_parsing_test_case/SpliceOnStab.txt @@ -49,9 +49,9 @@ Elixir File(0,482) PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('ok')(171,173) PsiWhiteSpace(' ')(173,174) PsiElement(end)('end')(174,177) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(177,314) - PsiElement(\\n, \\r\\n)('\n')(177,178) - PsiComment(#)('# https://github.com/elixir-lang/elixir/blob/e49a806e8abe43c62c9c1b21ea7eb2217bef1966/lib/elixir/test/elixir/kernel/quote_test.exs#L101')(178,313) + PsiWhiteSpace('\n')(177,178) + PsiComment(#)('# https://github.com/elixir-lang/elixir/blob/e49a806e8abe43c62c9c1b21ea7eb2217bef1966/lib/elixir/test/elixir/kernel/quote_test.exs#L101')(178,313) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(313,314) PsiElement(\\n, \\r\\n)('\n')(313,314) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(314,356) ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(314,356) @@ -100,10 +100,9 @@ Elixir File(0,482) PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('ok')(350,352) PsiWhiteSpace(' ')(352,353) PsiElement(end)('end')(353,356) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(356,399) - PsiElement(\\n, \\r\\n)('\n')(356,357) - PsiElement(\\n, \\r\\n)('\n')(357,358) - PsiComment(#)('# same as above, just for no parentheses')(358,398) + PsiWhiteSpace('\n\n')(356,358) + PsiComment(#)('# same as above, just for no parentheses')(358,398) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(398,399) PsiElement(\\n, \\r\\n)('\n')(398,399) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(399,440) ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(399,440) @@ -200,4 +199,4 @@ Elixir File(0,482) PsiElement(:)(':')(475,476) PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('ok')(476,478) PsiWhiteSpace(' ')(478,479) - PsiElement(end)('end')(479,482) \ No newline at end of file + PsiElement(end)('end')(479,482) diff --git a/testData/org/elixir_lang/parser_definition/atom_parsing_test_case/Operator.txt b/testData/org/elixir_lang/parser_definition/atom_parsing_test_case/Operator.txt index 996329d8c..8261059d7 100644 --- a/testData/org/elixir_lang/parser_definition/atom_parsing_test_case/Operator.txt +++ b/testData/org/elixir_lang/parser_definition/atom_parsing_test_case/Operator.txt @@ -6,10 +6,9 @@ Elixir File(0,292) ElixirAtomImpl(ATOM)(25,30) PsiElement(:)(':')(25,26) PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('<<>>')(26,30) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(30,57) - PsiElement(\\n, \\r\\n)('\n')(30,31) - PsiElement(\\n, \\r\\n)('\n')(31,32) - PsiComment(#)('# 3 token operator atoms')(32,56) + PsiWhiteSpace('\n\n')(30,32) + PsiComment(#)('# 3 token operator atoms')(32,56) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(56,57) PsiElement(\\n, \\r\\n)('\n')(56,57) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(57,61) ElixirAtomImpl(ATOM)(57,61) @@ -93,10 +92,9 @@ Elixir File(0,292) ElixirAtomImpl(ATOM)(122,126) PsiElement(:)(':')(122,123) PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('~~~')(123,126) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(126,153) - PsiElement(\\n, \\r\\n)('\n')(126,127) - PsiElement(\\n, \\r\\n)('\n')(127,128) - PsiComment(#)('# 2 token operator atoms')(128,152) + PsiWhiteSpace('\n\n')(126,128) + PsiComment(#)('# 2 token operator atoms')(128,152) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(152,153) PsiElement(\\n, \\r\\n)('\n')(152,153) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(153,156) ElixirAtomImpl(ATOM)(153,156) @@ -204,10 +202,9 @@ Elixir File(0,292) ElixirAtomImpl(ATOM)(221,224) PsiElement(:)(':')(221,222) PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('~>')(222,224) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(224,251) - PsiElement(\\n, \\r\\n)('\n')(224,225) - PsiElement(\\n, \\r\\n)('\n')(225,226) - PsiComment(#)('# 2 token operator atoms')(226,250) + PsiWhiteSpace('\n\n')(224,226) + PsiComment(#)('# 2 token operator atoms')(226,250) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(250,251) PsiElement(\\n, \\r\\n)('\n')(250,251) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(251,253) ElixirAtomImpl(ATOM)(251,253) @@ -290,4 +287,4 @@ Elixir File(0,292) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(290,292) ElixirAtomImpl(ATOM)(290,292) PsiElement(:)(':')(290,291) - PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('|')(291,292) \ No newline at end of file + PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('|')(291,292) diff --git a/testData/org/elixir_lang/parser_definition/binary_whole_number_parsing_test_case/NoDigits.txt b/testData/org/elixir_lang/parser_definition/binary_whole_number_parsing_test_case/NoDigits.txt index 7d087cbe4..cf23927d9 100644 --- a/testData/org/elixir_lang/parser_definition/binary_whole_number_parsing_test_case/NoDigits.txt +++ b/testData/org/elixir_lang/parser_definition/binary_whole_number_parsing_test_case/NoDigits.txt @@ -9,10 +9,9 @@ Elixir File(0,78) PsiErrorElement: expected, got ' '(36,36) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(36,70) - PsiElement(\\n, \\r\\n)('\n')(36,37) - PsiElement(\\n, \\r\\n)('\n')(37,38) - PsiComment(#)('# No digits should recover at ;')(38,69) + PsiWhiteSpace('\n\n')(36,38) + PsiComment(#)('# No digits should recover at ;')(38,69) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(69,70) PsiElement(\\n, \\r\\n)('\n')(69,70) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(70,72) ElixirBinaryWholeNumberImpl(BINARY_WHOLE_NUMBER)(70,72) @@ -28,4 +27,4 @@ Elixir File(0,78) PsiElement(0)('0')(74,75) PsiElement(b)('b')(75,76) ElixirBinaryDigitsImpl(BINARY_DIGITS)(76,78) - PsiElement(0-1)('01')(76,78) \ No newline at end of file + PsiElement(0-1)('01')(76,78) diff --git a/testData/org/elixir_lang/parser_definition/binary_whole_number_parsing_test_case/ObsoleteNoDigits.txt b/testData/org/elixir_lang/parser_definition/binary_whole_number_parsing_test_case/ObsoleteNoDigits.txt index e254fbac9..e7a30a544 100644 --- a/testData/org/elixir_lang/parser_definition/binary_whole_number_parsing_test_case/ObsoleteNoDigits.txt +++ b/testData/org/elixir_lang/parser_definition/binary_whole_number_parsing_test_case/ObsoleteNoDigits.txt @@ -9,10 +9,9 @@ Elixir File(0,78) PsiErrorElement: expected, got ' '(36,36) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(36,70) - PsiElement(\\n, \\r\\n)('\n')(36,37) - PsiElement(\\n, \\r\\n)('\n')(37,38) - PsiComment(#)('# No digits should recover at ;')(38,69) + PsiWhiteSpace('\n\n')(36,38) + PsiComment(#)('# No digits should recover at ;')(38,69) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(69,70) PsiElement(\\n, \\r\\n)('\n')(69,70) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(70,72) ElixirBinaryWholeNumberImpl(BINARY_WHOLE_NUMBER)(70,72) @@ -28,4 +27,4 @@ Elixir File(0,78) PsiElement(0)('0')(74,75) PsiElement(B)('B')(75,76) ElixirBinaryDigitsImpl(BINARY_DIGITS)(76,78) - PsiElement(0-1)('01')(76,78) \ No newline at end of file + PsiElement(0-1)('01')(76,78) diff --git a/testData/org/elixir_lang/parser_definition/bracket_operation_parsing_test_case/MatchedQualifiedCallOperation.txt b/testData/org/elixir_lang/parser_definition/bracket_operation_parsing_test_case/MatchedQualifiedCallOperation.txt index ca64a935d..24e4e162e 100644 --- a/testData/org/elixir_lang/parser_definition/bracket_operation_parsing_test_case/MatchedQualifiedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/bracket_operation_parsing_test_case/MatchedQualifiedCallOperation.txt @@ -11,11 +11,11 @@ Elixir File(0,289) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(15,21) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(15,18) PsiElement(()('(')(15,16) - PsiElement(\\n, \\r\\n)('\n')(16,17) + PsiWhiteSpace('\n')(16,17) PsiElement())(')')(17,18) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(18,21) PsiElement(()('(')(18,19) - PsiElement(\\n, \\r\\n)('\n')(19,20) + PsiWhiteSpace('\n')(19,20) PsiElement())(')')(20,21) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(21,33) PsiElement([)('[')(21,22) @@ -43,11 +43,11 @@ Elixir File(0,289) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(49,55) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(49,52) PsiElement(()('(')(49,50) - PsiElement(\\n, \\r\\n)('\n')(50,51) + PsiWhiteSpace('\n')(50,51) PsiElement())(')')(51,52) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(52,55) PsiElement(()('(')(52,53) - PsiElement(\\n, \\r\\n)('\n')(53,54) + PsiWhiteSpace('\n')(53,54) PsiElement())(')')(54,55) PsiWhiteSpace(' ')(55,56) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(56,68) @@ -76,11 +76,11 @@ Elixir File(0,289) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(84,90) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(84,87) PsiElement(()('(')(84,85) - PsiElement(\\n, \\r\\n)('\n')(85,86) + PsiWhiteSpace('\n')(85,86) PsiElement())(')')(86,87) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(87,90) PsiElement(()('(')(87,88) - PsiElement(\\n, \\r\\n)('\n')(88,89) + PsiWhiteSpace('\n')(88,89) PsiElement())(')')(89,90) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(90,94) PsiElement([)('[')(90,91) @@ -102,11 +102,11 @@ Elixir File(0,289) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(110,116) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(110,113) PsiElement(()('(')(110,111) - PsiElement(\\n, \\r\\n)('\n')(111,112) + PsiWhiteSpace('\n')(111,112) PsiElement())(')')(112,113) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(113,116) PsiElement(()('(')(113,114) - PsiElement(\\n, \\r\\n)('\n')(114,115) + PsiWhiteSpace('\n')(114,115) PsiElement())(')')(115,116) PsiWhiteSpace(' ')(116,117) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(117,121) @@ -129,11 +129,11 @@ Elixir File(0,289) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(137,143) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(137,140) PsiElement(()('(')(137,138) - PsiElement(\\n, \\r\\n)('\n')(138,139) + PsiWhiteSpace('\n')(138,139) PsiElement())(')')(139,140) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(140,143) PsiElement(()('(')(140,141) - PsiElement(\\n, \\r\\n)('\n')(141,142) + PsiWhiteSpace('\n')(141,142) PsiElement())(')')(142,143) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(143,163) PsiElement([)('[')(143,144) @@ -177,11 +177,11 @@ Elixir File(0,289) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(218,224) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(218,221) PsiElement(()('(')(218,219) - PsiElement(\\n, \\r\\n)('\n')(219,220) + PsiWhiteSpace('\n')(219,220) PsiElement())(')')(220,221) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(221,224) PsiElement(()('(')(221,222) - PsiElement(\\n, \\r\\n)('\n')(222,223) + PsiWhiteSpace('\n')(222,223) PsiElement())(')')(223,224) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(224,245) PsiElement([)('[')(224,225) @@ -204,11 +204,11 @@ Elixir File(0,289) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(261,267) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(261,264) PsiElement(()('(')(261,262) - PsiElement(\\n, \\r\\n)('\n')(262,263) + PsiWhiteSpace('\n')(262,263) PsiElement())(')')(263,264) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(264,267) PsiElement(()('(')(264,265) - PsiElement(\\n, \\r\\n)('\n')(265,266) + PsiWhiteSpace('\n')(265,266) PsiElement())(')')(266,267) PsiWhiteSpace(' ')(267,268) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(268,289) @@ -217,4 +217,4 @@ Elixir File(0,289) ElixirIdentifierImpl(IDENTIFIER)(269,287) PsiElement(identifier)('matched_expression')(269,287) PsiElement(,)(',')(287,288) - PsiElement(])(']')(288,289) \ No newline at end of file + PsiElement(])(']')(288,289) diff --git a/testData/org/elixir_lang/parser_definition/bracket_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt b/testData/org/elixir_lang/parser_definition/bracket_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt index 8d0c24659..851961549 100644 --- a/testData/org/elixir_lang/parser_definition/bracket_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/bracket_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt @@ -6,11 +6,11 @@ Elixir File(0,243) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(8,14) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(8,11) PsiElement(()('(')(8,9) - PsiElement(\\n, \\r\\n)('\n')(9,10) + PsiWhiteSpace('\n')(9,10) PsiElement())(')')(10,11) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(11,14) PsiElement(()('(')(11,12) - PsiElement(\\n, \\r\\n)('\n')(12,13) + PsiWhiteSpace('\n')(12,13) PsiElement())(')')(13,14) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(14,26) PsiElement([)('[')(14,15) @@ -24,8 +24,8 @@ Elixir File(0,243) ElixirIdentifierImpl(IDENTIFIER)(20,25) PsiElement(identifier)('value')(20,25) PsiElement(])(']')(25,26) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(26,28) - PsiElement(\\n, \\r\\n)('\n')(26,27) + PsiWhiteSpace('\n')(26,27) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(27,28) PsiElement(\\n, \\r\\n)('\n')(27,28) ElixirUnmatchedBracketOperationImpl(UNMATCHED_BRACKET_OPERATION)(28,55) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(28,42) @@ -34,11 +34,11 @@ Elixir File(0,243) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(36,42) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(36,39) PsiElement(()('(')(36,37) - PsiElement(\\n, \\r\\n)('\n')(37,38) + PsiWhiteSpace('\n')(37,38) PsiElement())(')')(38,39) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(39,42) PsiElement(()('(')(39,40) - PsiElement(\\n, \\r\\n)('\n')(40,41) + PsiWhiteSpace('\n')(40,41) PsiElement())(')')(41,42) PsiWhiteSpace(' ')(42,43) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(43,55) @@ -53,9 +53,8 @@ Elixir File(0,243) ElixirIdentifierImpl(IDENTIFIER)(49,54) PsiElement(identifier)('value')(49,54) PsiElement(])(']')(54,55) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(55,58) - PsiElement(\\n, \\r\\n)('\n')(55,56) - PsiElement(\\n, \\r\\n)('\n')(56,57) + PsiWhiteSpace('\n\n')(55,57) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(57,58) PsiElement(\\n, \\r\\n)('\n')(57,58) ElixirUnmatchedBracketOperationImpl(UNMATCHED_BRACKET_OPERATION)(58,76) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(58,72) @@ -64,11 +63,11 @@ Elixir File(0,243) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(66,72) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(66,69) PsiElement(()('(')(66,67) - PsiElement(\\n, \\r\\n)('\n')(67,68) + PsiWhiteSpace('\n')(67,68) PsiElement())(')')(68,69) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(69,72) PsiElement(()('(')(69,70) - PsiElement(\\n, \\r\\n)('\n')(70,71) + PsiWhiteSpace('\n')(70,71) PsiElement())(')')(71,72) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(72,76) PsiElement([)('[')(72,73) @@ -76,8 +75,8 @@ Elixir File(0,243) PsiElement(()('(')(73,74) PsiElement())(')')(74,75) PsiElement(])(']')(75,76) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(76,78) - PsiElement(\\n, \\r\\n)('\n')(76,77) + PsiWhiteSpace('\n')(76,77) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(77,78) PsiElement(\\n, \\r\\n)('\n')(77,78) ElixirUnmatchedBracketOperationImpl(UNMATCHED_BRACKET_OPERATION)(78,97) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(78,92) @@ -86,11 +85,11 @@ Elixir File(0,243) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(86,92) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(86,89) PsiElement(()('(')(86,87) - PsiElement(\\n, \\r\\n)('\n')(87,88) + PsiWhiteSpace('\n')(87,88) PsiElement())(')')(88,89) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(89,92) PsiElement(()('(')(89,90) - PsiElement(\\n, \\r\\n)('\n')(90,91) + PsiWhiteSpace('\n')(90,91) PsiElement())(')')(91,92) PsiWhiteSpace(' ')(92,93) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(93,97) @@ -99,9 +98,8 @@ Elixir File(0,243) PsiElement(()('(')(94,95) PsiElement())(')')(95,96) PsiElement(])(']')(96,97) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(97,100) - PsiElement(\\n, \\r\\n)('\n')(97,98) - PsiElement(\\n, \\r\\n)('\n')(98,99) + PsiWhiteSpace('\n\n')(97,99) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(99,100) PsiElement(\\n, \\r\\n)('\n')(99,100) ElixirUnmatchedBracketOperationImpl(UNMATCHED_BRACKET_OPERATION)(100,134) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(100,114) @@ -110,11 +108,11 @@ Elixir File(0,243) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(108,114) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(108,111) PsiElement(()('(')(108,109) - PsiElement(\\n, \\r\\n)('\n')(109,110) + PsiWhiteSpace('\n')(109,110) PsiElement())(')')(110,111) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(111,114) PsiElement(()('(')(111,112) - PsiElement(\\n, \\r\\n)('\n')(112,113) + PsiWhiteSpace('\n')(112,113) PsiElement())(')')(113,114) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(114,134) PsiElement([)('[')(114,115) @@ -122,8 +120,8 @@ Elixir File(0,243) ElixirIdentifierImpl(IDENTIFIER)(115,133) PsiElement(identifier)('matched_expression')(115,133) PsiElement(])(']')(133,134) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(134,136) - PsiElement(\\n, \\r\\n)('\n')(134,135) + PsiWhiteSpace('\n')(134,135) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(135,136) PsiElement(\\n, \\r\\n)('\n')(135,136) ElixirUnmatchedBracketOperationImpl(UNMATCHED_BRACKET_OPERATION)(136,167) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(136,146) @@ -140,9 +138,8 @@ Elixir File(0,243) ElixirIdentifierImpl(IDENTIFIER)(148,166) PsiElement(identifier)('matched_expression')(148,166) PsiElement(])(']')(166,167) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(167,170) - PsiElement(\\n, \\r\\n)('\n')(167,168) - PsiElement(\\n, \\r\\n)('\n')(168,169) + PsiWhiteSpace('\n\n')(167,169) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(169,170) PsiElement(\\n, \\r\\n)('\n')(169,170) ElixirUnmatchedBracketOperationImpl(UNMATCHED_BRACKET_OPERATION)(170,205) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(170,184) @@ -151,11 +148,11 @@ Elixir File(0,243) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(178,184) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(178,181) PsiElement(()('(')(178,179) - PsiElement(\\n, \\r\\n)('\n')(179,180) + PsiWhiteSpace('\n')(179,180) PsiElement())(')')(180,181) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(181,184) PsiElement(()('(')(181,182) - PsiElement(\\n, \\r\\n)('\n')(182,183) + PsiWhiteSpace('\n')(182,183) PsiElement())(')')(183,184) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(184,205) PsiElement([)('[')(184,185) @@ -164,8 +161,8 @@ Elixir File(0,243) PsiElement(identifier)('matched_expression')(185,203) PsiElement(,)(',')(203,204) PsiElement(])(']')(204,205) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(205,207) - PsiElement(\\n, \\r\\n)('\n')(205,206) + PsiWhiteSpace('\n')(205,206) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(206,207) PsiElement(\\n, \\r\\n)('\n')(206,207) ElixirUnmatchedBracketOperationImpl(UNMATCHED_BRACKET_OPERATION)(207,243) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(207,221) @@ -174,11 +171,11 @@ Elixir File(0,243) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(215,221) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(215,218) PsiElement(()('(')(215,216) - PsiElement(\\n, \\r\\n)('\n')(216,217) + PsiWhiteSpace('\n')(216,217) PsiElement())(')')(217,218) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(218,221) PsiElement(()('(')(218,219) - PsiElement(\\n, \\r\\n)('\n')(219,220) + PsiWhiteSpace('\n')(219,220) PsiElement())(')')(220,221) PsiWhiteSpace(' ')(221,222) ElixirBracketArgumentsImpl(BRACKET_ARGUMENTS)(222,243) @@ -187,4 +184,4 @@ Elixir File(0,243) ElixirIdentifierImpl(IDENTIFIER)(223,241) PsiElement(identifier)('matched_expression')(223,241) PsiElement(,)(',')(241,242) - PsiElement(])(']')(242,243) \ No newline at end of file + PsiElement(])(']')(242,243) diff --git a/testData/org/elixir_lang/parser_definition/char_token_parsing_test_case/EnclosedHexadecimalEscapeSequence.txt b/testData/org/elixir_lang/parser_definition/char_token_parsing_test_case/EnclosedHexadecimalEscapeSequence.txt index e70aa42f6..3ca2c97e6 100644 --- a/testData/org/elixir_lang/parser_definition/char_token_parsing_test_case/EnclosedHexadecimalEscapeSequence.txt +++ b/testData/org/elixir_lang/parser_definition/char_token_parsing_test_case/EnclosedHexadecimalEscapeSequence.txt @@ -78,10 +78,9 @@ Elixir File(0,579) PsiElement({)('{')(86,87) PsiElement(A-F, a-f, 0-9)('10abef')(87,93) PsiElement(})('}')(93,94) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(94,119) - PsiElement(\\n, \\r\\n)('\n')(94,95) - PsiElement(\\n, \\r\\n)('\n')(95,96) - PsiComment(#)('# 5 hexadecimal digits')(96,118) + PsiWhiteSpace('\n\n')(94,96) + PsiComment(#)('# 5 hexadecimal digits')(96,118) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(118,119) PsiElement(\\n, \\r\\n)('\n')(118,119) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(119,129) ElixirCharTokenImpl(CHAR_TOKEN)(119,129) @@ -159,10 +158,9 @@ Elixir File(0,579) PsiElement({)('{')(177,178) PsiElement(A-F, a-f, 0-9)('fabcd')(178,183) PsiElement(})('}')(183,184) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(184,209) - PsiElement(\\n, \\r\\n)('\n')(184,185) - PsiElement(\\n, \\r\\n)('\n')(185,186) - PsiComment(#)('# 4 hexadecimal digits')(186,208) + PsiWhiteSpace('\n\n')(184,186) + PsiComment(#)('# 4 hexadecimal digits')(186,208) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(208,209) PsiElement(\\n, \\r\\n)('\n')(208,209) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(209,218) ElixirCharTokenImpl(CHAR_TOKEN)(209,218) @@ -253,10 +251,9 @@ Elixir File(0,579) PsiElement({)('{')(272,273) PsiElement(A-F, a-f, 0-9)('efab')(273,277) PsiElement(})('}')(277,278) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(278,303) - PsiElement(\\n, \\r\\n)('\n')(278,279) - PsiElement(\\n, \\r\\n)('\n')(279,280) - PsiComment(#)('# 3 hexadecimal digits')(280,302) + PsiWhiteSpace('\n\n')(278,280) + PsiComment(#)('# 3 hexadecimal digits')(280,302) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(302,303) PsiElement(\\n, \\r\\n)('\n')(302,303) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(303,311) ElixirCharTokenImpl(CHAR_TOKEN)(303,311) @@ -360,10 +357,9 @@ Elixir File(0,579) PsiElement({)('{')(369,370) PsiElement(A-F, a-f, 0-9)('def')(370,373) PsiElement(})('}')(373,374) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(374,399) - PsiElement(\\n, \\r\\n)('\n')(374,375) - PsiElement(\\n, \\r\\n)('\n')(375,376) - PsiComment(#)('# 2 hexadecimal digits')(376,398) + PsiWhiteSpace('\n\n')(374,376) + PsiComment(#)('# 2 hexadecimal digits')(376,398) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(398,399) PsiElement(\\n, \\r\\n)('\n')(398,399) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(399,406) ElixirCharTokenImpl(CHAR_TOKEN)(399,406) @@ -506,10 +502,9 @@ Elixir File(0,579) PsiElement({)('{')(482,483) PsiElement(A-F, a-f, 0-9)('ef')(483,485) PsiElement(})('}')(485,486) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(486,510) - PsiElement(\\n, \\r\\n)('\n')(486,487) - PsiElement(\\n, \\r\\n)('\n')(487,488) - PsiComment(#)('# 1 hexadecimal digit')(488,509) + PsiWhiteSpace('\n\n')(486,488) + PsiComment(#)('# 1 hexadecimal digit')(488,509) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(509,510) PsiElement(\\n, \\r\\n)('\n')(509,510) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(510,516) ElixirCharTokenImpl(CHAR_TOKEN)(510,516) @@ -638,4 +633,4 @@ Elixir File(0,579) ElixirEnclosedHexadecimalEscapeSequenceImpl(ENCLOSED_HEXADECIMAL_ESCAPE_SEQUENCE)(576,579) PsiElement({)('{')(576,577) PsiElement(A-F, a-f, 0-9)('0')(577,578) - PsiElement(})('}')(578,579) \ No newline at end of file + PsiElement(})('}')(578,579) diff --git a/testData/org/elixir_lang/parser_definition/char_token_parsing_test_case/OpenHexadecimalEscapeSequence.txt b/testData/org/elixir_lang/parser_definition/char_token_parsing_test_case/OpenHexadecimalEscapeSequence.txt index a694a094c..18c01a7c0 100644 --- a/testData/org/elixir_lang/parser_definition/char_token_parsing_test_case/OpenHexadecimalEscapeSequence.txt +++ b/testData/org/elixir_lang/parser_definition/char_token_parsing_test_case/OpenHexadecimalEscapeSequence.txt @@ -121,10 +121,9 @@ Elixir File(0,161) PsiElement(x)('x')(85,86) ElixirOpenHexadecimalEscapeSequenceImpl(OPEN_HEXADECIMAL_ESCAPE_SEQUENCE)(86,88) PsiElement(A-F, a-f, 0-9)('ef')(86,88) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(88,112) - PsiElement(\\n, \\r\\n)('\n')(88,89) - PsiElement(\\n, \\r\\n)('\n')(89,90) - PsiComment(#)('# 1 hexadecimal digit')(90,111) + PsiWhiteSpace('\n\n')(88,90) + PsiComment(#)('# 1 hexadecimal digit')(90,111) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(111,112) PsiElement(\\n, \\r\\n)('\n')(111,112) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(112,116) ElixirCharTokenImpl(CHAR_TOKEN)(112,116) @@ -233,4 +232,4 @@ Elixir File(0,161) PsiElement(\\)('\')(158,159) PsiElement(x)('x')(159,160) ElixirOpenHexadecimalEscapeSequenceImpl(OPEN_HEXADECIMAL_ESCAPE_SEQUENCE)(160,161) - PsiElement(A-F, a-f, 0-9)('0')(160,161) \ No newline at end of file + PsiElement(A-F, a-f, 0-9)('0')(160,161) diff --git a/testData/org/elixir_lang/parser_definition/dual_operator_parsing_test_case/IdentifierSpaceOperatorContainer.txt b/testData/org/elixir_lang/parser_definition/dual_operator_parsing_test_case/IdentifierSpaceOperatorContainer.txt index c36e90ffb..f001c403e 100644 --- a/testData/org/elixir_lang/parser_definition/dual_operator_parsing_test_case/IdentifierSpaceOperatorContainer.txt +++ b/testData/org/elixir_lang/parser_definition/dual_operator_parsing_test_case/IdentifierSpaceOperatorContainer.txt @@ -33,8 +33,8 @@ Elixir File(0,94) ElixirIdentifierImpl(IDENTIFIER)(17,20) PsiElement(identifier)('two')(17,20) PsiElement())(')')(20,21) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(21,23) - PsiElement(\\n, \\r\\n)('\n')(21,22) + PsiWhiteSpace('\n')(21,22) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(22,23) PsiElement(\\n, \\r\\n)('\n')(22,23) ElixirUnmatchedAdditionOperationImpl(UNMATCHED_ADDITION_OPERATION)(23,33) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(23,26) @@ -66,8 +66,8 @@ Elixir File(0,94) ElixirIdentifierImpl(IDENTIFIER)(40,43) PsiElement(identifier)('two')(40,43) PsiElement(])(']')(43,44) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(44,46) - PsiElement(\\n, \\r\\n)('\n')(44,45) + PsiWhiteSpace('\n')(44,45) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(45,46) PsiElement(\\n, \\r\\n)('\n')(45,46) ElixirUnmatchedAdditionOperationImpl(UNMATCHED_ADDITION_OPERATION)(46,58) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(46,49) @@ -99,8 +99,8 @@ Elixir File(0,94) ElixirIdentifierImpl(IDENTIFIER)(66,69) PsiElement(identifier)('two')(66,69) PsiElement(>>)('>>')(69,71) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(71,73) - PsiElement(\\n, \\r\\n)('\n')(71,72) + PsiWhiteSpace('\n')(71,72) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(72,73) PsiElement(\\n, \\r\\n)('\n')(72,73) ElixirUnmatchedAdditionOperationImpl(UNMATCHED_ADDITION_OPERATION)(73,83) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(73,76) @@ -131,4 +131,4 @@ Elixir File(0,94) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(90,93) ElixirIdentifierImpl(IDENTIFIER)(90,93) PsiElement(identifier)('two')(90,93) - PsiElement(})('}')(93,94) \ No newline at end of file + PsiElement(})('}')(93,94) diff --git a/testData/org/elixir_lang/parser_definition/function_reference_parsing_test_case/Operator.txt b/testData/org/elixir_lang/parser_definition/function_reference_parsing_test_case/Operator.txt index 7e2d204a5..7ca73242c 100644 --- a/testData/org/elixir_lang/parser_definition/function_reference_parsing_test_case/Operator.txt +++ b/testData/org/elixir_lang/parser_definition/function_reference_parsing_test_case/Operator.txt @@ -153,31 +153,31 @@ Elixir File(0,321) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(68,69) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(68,69) PsiElement(0-9)('1')(68,69) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(69,207) - PsiElement(\\n, \\r\\n)('\n')(69,70) - PsiComment(#)('# See https://github.com/elixir-lang/elixir/issues/3486')(70,125) - PsiElement(\\n, \\r\\n)('\n')(125,126) - PsiComment(#)('#after/1')(126,134) - PsiElement(\\n, \\r\\n)('\n')(134,135) - PsiComment(#)('#and/2')(135,141) - PsiElement(\\n, \\r\\n)('\n')(141,142) - PsiComment(#)('#catch/1')(142,150) - PsiElement(\\n, \\r\\n)('\n')(150,151) - PsiComment(#)('#do/1')(151,156) - PsiElement(\\n, \\r\\n)('\n')(156,157) - PsiComment(#)('#else/1')(157,164) - PsiElement(\\n, \\r\\n)('\n')(164,165) - PsiComment(#)('#end/0')(165,171) - PsiElement(\\n, \\r\\n)('\n')(171,172) - PsiComment(#)('#fn/1')(172,177) - PsiElement(\\n, \\r\\n)('\n')(177,178) - PsiComment(#)('#in/2')(178,183) - PsiElement(\\n, \\r\\n)('\n')(183,184) - PsiComment(#)('#not/1')(184,190) - PsiElement(\\n, \\r\\n)('\n')(190,191) - PsiComment(#)('#or/2')(191,196) - PsiElement(\\n, \\r\\n)('\n')(196,197) - PsiComment(#)('#rescue/1')(197,206) + PsiWhiteSpace('\n')(69,70) + PsiComment(#)('# See https://github.com/elixir-lang/elixir/issues/3486')(70,125) + PsiWhiteSpace('\n')(125,126) + PsiComment(#)('#after/1')(126,134) + PsiWhiteSpace('\n')(134,135) + PsiComment(#)('#and/2')(135,141) + PsiWhiteSpace('\n')(141,142) + PsiComment(#)('#catch/1')(142,150) + PsiWhiteSpace('\n')(150,151) + PsiComment(#)('#do/1')(151,156) + PsiWhiteSpace('\n')(156,157) + PsiComment(#)('#else/1')(157,164) + PsiWhiteSpace('\n')(164,165) + PsiComment(#)('#end/0')(165,171) + PsiWhiteSpace('\n')(171,172) + PsiComment(#)('#fn/1')(172,177) + PsiWhiteSpace('\n')(177,178) + PsiComment(#)('#in/2')(178,183) + PsiWhiteSpace('\n')(183,184) + PsiComment(#)('#not/1')(184,190) + PsiWhiteSpace('\n')(190,191) + PsiComment(#)('#or/2')(191,196) + PsiWhiteSpace('\n')(196,197) + PsiComment(#)('#rescue/1')(197,206) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(206,207) PsiElement(\\n, \\r\\n)('\n')(206,207) ElixirUnmatchedMultiplicationOperationImpl(UNMATCHED_MULTIPLICATION_OPERATION)(207,212) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(207,210) @@ -464,4 +464,4 @@ Elixir File(0,321) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(320,321) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(320,321) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(320,321) - PsiElement(0-9)('2')(320,321) \ No newline at end of file + PsiElement(0-9)('2')(320,321) diff --git a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Comments.txt b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Comments.txt index e0d982bbb..e4c5426c0 100644 --- a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Comments.txt +++ b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Comments.txt @@ -1,9 +1,6 @@ Elixir File(0,72) PsiComment(#)('# Comment')(0,9) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(9,32) - PsiElement(\\n, \\r\\n)('\n')(9,10) - PsiWhiteSpace(' ')(10,12) - PsiComment(#)('# Indented Comment')(12,30) - PsiElement(\\n, \\r\\n)('\n')(30,31) - PsiElement(\\n, \\r\\n)('\n')(31,32) - PsiComment(#)('# Comment after blank line after comment')(32,72) \ No newline at end of file + PsiWhiteSpace('\n ')(9,12) + PsiComment(#)('# Indented Comment')(12,30) + PsiWhiteSpace('\n\n')(30,32) + PsiComment(#)('# Comment after blank line after comment')(32,72) diff --git a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/EOLPosix.txt b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/EOLPosix.txt index 6e40185e5..3d7312cf1 100644 --- a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/EOLPosix.txt +++ b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/EOLPosix.txt @@ -17,11 +17,7 @@ Elixir File(0,121) PsiElement(x)('x')(72,73) ElixirHexadecimalDigitsImpl(HEXADECIMAL_DIGITS)(73,74) PsiElement(A-F, a-f, 0-9)('2')(73,74) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(74,104) - PsiElement(\\n, \\r\\n)('\n')(74,75) - PsiElement(\\n, \\r\\n)('\n')(75,76) - PsiComment(#)('# Newline can be escaped')(76,100) - PsiElement(\\n, \\r\\n)('\n')(100,101) - PsiWhiteSpace('\\n')(101,103) - PsiElement(\\n, \\r\\n)('\n')(103,104) - PsiComment(#)('# Normal newlines')(104,121) \ No newline at end of file + PsiWhiteSpace('\n\n')(74,76) + PsiComment(#)('# Newline can be escaped')(76,100) + PsiWhiteSpace('\n\\n\n')(100,104) + PsiComment(#)('# Normal newlines')(104,121) diff --git a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/EOLWindows.txt b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/EOLWindows.txt index 6e40185e5..3d7312cf1 100644 --- a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/EOLWindows.txt +++ b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/EOLWindows.txt @@ -17,11 +17,7 @@ Elixir File(0,121) PsiElement(x)('x')(72,73) ElixirHexadecimalDigitsImpl(HEXADECIMAL_DIGITS)(73,74) PsiElement(A-F, a-f, 0-9)('2')(73,74) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(74,104) - PsiElement(\\n, \\r\\n)('\n')(74,75) - PsiElement(\\n, \\r\\n)('\n')(75,76) - PsiComment(#)('# Newline can be escaped')(76,100) - PsiElement(\\n, \\r\\n)('\n')(100,101) - PsiWhiteSpace('\\n')(101,103) - PsiElement(\\n, \\r\\n)('\n')(103,104) - PsiComment(#)('# Normal newlines')(104,121) \ No newline at end of file + PsiWhiteSpace('\n\n')(74,76) + PsiComment(#)('# Newline can be escaped')(76,100) + PsiWhiteSpace('\n\\n\n')(100,104) + PsiComment(#)('# Normal newlines')(104,121) diff --git a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Parentheses.txt b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Parentheses.txt index 4917378b8..0e32d8514 100644 --- a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Parentheses.txt +++ b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Parentheses.txt @@ -5,13 +5,11 @@ Elixir File(0,36) ElixirEmptyParenthesesImpl(EMPTY_PARENTHESES)(8,10) PsiElement(()('(')(8,9) PsiElement())(')')(9,10) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(10,32) - PsiElement(\\n, \\r\\n)('\n')(10,11) - PsiElement(\\n, \\r\\n)('\n')(11,12) - PsiComment(#)('# newline separated')(12,31) + PsiWhiteSpace('\n\n')(10,12) + PsiComment(#)('# newline separated')(12,31) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(31,32) PsiElement(\\n, \\r\\n)('\n')(31,32) ElixirEmptyParenthesesImpl(EMPTY_PARENTHESES)(32,36) PsiElement(()('(')(32,33) - PsiElement(\\n, \\r\\n)('\n')(33,34) - PsiElement(\\n, \\r\\n)('\n')(34,35) - PsiElement())(')')(35,36) \ No newline at end of file + PsiWhiteSpace('\n\n')(33,35) + PsiElement())(')')(35,36) diff --git a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Realistic.txt b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Realistic.txt index 024822702..5b3527795 100644 --- a/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Realistic.txt +++ b/testData/org/elixir_lang/parser_definition/general_parsing_test_case/Realistic.txt @@ -10,9 +10,7 @@ Elixir File(0,900) PsiWhiteSpace(' ')(14,15) ElixirDoBlockImpl(DO_BLOCK)(15,344) PsiElement(do)('do')(15,17) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(17,18) - PsiElement(\\n, \\r\\n)('\n')(17,18) - PsiWhiteSpace(' ')(18,20) + PsiWhiteSpace('\n ')(17,20) ElixirStabImpl(STAB)(20,340) ElixirStabBodyImpl(STAB_BODY)(20,340) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(20,35) @@ -23,14 +21,11 @@ Elixir File(0,900) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(24,35) ElixirAliasImpl(ALIAS)(24,35) PsiElement(Alias)('Application')(24,35) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(35,152) - PsiElement(\\n, \\r\\n)('\n')(35,36) - PsiElement(\\n, \\r\\n)('\n')(36,37) - PsiWhiteSpace(' ')(37,39) - PsiComment(#)('# See http://elixir-lang.org/docs/stable/Application.Behaviour.html')(39,106) - PsiElement(\\n, \\r\\n)('\n')(106,107) - PsiWhiteSpace(' ')(107,109) - PsiComment(#)('# for more information on OTP Applications')(109,151) + PsiWhiteSpace('\n\n ')(35,39) + PsiComment(#)('# See http://elixir-lang.org/docs/stable/Application.Behaviour.html')(39,106) + PsiWhiteSpace('\n ')(106,109) + PsiComment(#)('# for more information on OTP Applications')(109,151) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(151,152) PsiElement(\\n, \\r\\n)('\n')(151,152) PsiWhiteSpace(' ')(152,154) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(154,340) @@ -56,9 +51,7 @@ Elixir File(0,900) PsiWhiteSpace(' ')(177,178) ElixirDoBlockImpl(DO_BLOCK)(178,340) PsiElement(do)('do')(178,180) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(180,181) - PsiElement(\\n, \\r\\n)('\n')(180,181) - PsiWhiteSpace(' ')(181,185) + PsiWhiteSpace('\n ')(180,185) ElixirStabImpl(STAB)(185,334) ElixirStabBodyImpl(STAB_BODY)(185,334) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(185,207) @@ -168,15 +161,12 @@ Elixir File(0,900) ElixirIdentifierImpl(IDENTIFIER)(329,333) PsiElement(identifier)('opts')(329,333) PsiElement())(')')(333,334) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(334,335) - PsiElement(\\n, \\r\\n)('\n')(334,335) - PsiWhiteSpace(' ')(335,337) + PsiWhiteSpace('\n ')(334,337) PsiElement(end)('end')(337,340) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(340,341) - PsiElement(\\n, \\r\\n)('\n')(340,341) + PsiWhiteSpace('\n')(340,341) PsiElement(end)('end')(341,344) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(344,346) - PsiElement(\\n, \\r\\n)('\n')(344,345) + PsiWhiteSpace('\n')(344,345) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(345,346) PsiElement(\\n, \\r\\n)('\n')(345,346) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(346,553) ElixirIdentifierImpl(IDENTIFIER)(346,355) @@ -189,9 +179,7 @@ Elixir File(0,900) PsiWhiteSpace(' ')(360,361) ElixirDoBlockImpl(DO_BLOCK)(361,553) PsiElement(do)('do')(361,363) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(363,364) - PsiElement(\\n, \\r\\n)('\n')(363,364) - PsiWhiteSpace(' ')(364,366) + PsiWhiteSpace('\n ')(363,366) ElixirStabImpl(STAB)(366,549) ElixirStabBodyImpl(STAB_BODY)(366,549) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(366,412) @@ -228,8 +216,8 @@ Elixir File(0,900) PsiElement(.)('.')(403,404) ElixirAliasImpl(ALIAS)(404,412) PsiElement(Alias)('Postgres')(404,412) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(412,414) - PsiElement(\\n, \\r\\n)('\n')(412,413) + PsiWhiteSpace('\n')(412,413) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(413,414) PsiElement(\\n, \\r\\n)('\n')(413,414) PsiWhiteSpace(' ')(414,416) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(416,496) @@ -243,9 +231,7 @@ Elixir File(0,900) PsiWhiteSpace(' ')(424,425) ElixirDoBlockImpl(DO_BLOCK)(425,496) PsiElement(do)('do')(425,427) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(427,428) - PsiElement(\\n, \\r\\n)('\n')(427,428) - PsiWhiteSpace(' ')(428,432) + PsiWhiteSpace('\n ')(427,432) ElixirStabImpl(STAB)(432,490) ElixirStabBodyImpl(STAB_BODY)(432,490) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(432,490) @@ -259,12 +245,10 @@ Elixir File(0,900) ElixirQuoteStringBodyImpl(QUOTE_STRING_BODY)(443,489) PsiElement(String Fragment)('ecto://postgres:postgres@localhost/ecto_simple')(443,489) PsiElement(String Terminator ("))('"')(489,490) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(490,491) - PsiElement(\\n, \\r\\n)('\n')(490,491) - PsiWhiteSpace(' ')(491,493) + PsiWhiteSpace('\n ')(490,493) PsiElement(end)('end')(493,496) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(496,498) - PsiElement(\\n, \\r\\n)('\n')(496,497) + PsiWhiteSpace('\n')(496,497) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(497,498) PsiElement(\\n, \\r\\n)('\n')(497,498) PsiWhiteSpace(' ')(498,500) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(500,549) @@ -278,9 +262,7 @@ Elixir File(0,900) PsiWhiteSpace(' ')(508,509) ElixirDoBlockImpl(DO_BLOCK)(509,549) PsiElement(do)('do')(509,511) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(511,512) - PsiElement(\\n, \\r\\n)('\n')(511,512) - PsiWhiteSpace(' ')(512,516) + PsiWhiteSpace('\n ')(511,516) ElixirStabImpl(STAB)(516,543) ElixirStabBodyImpl(STAB_BODY)(516,543) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(516,543) @@ -302,15 +284,12 @@ Elixir File(0,900) PsiElement(String Fragment)('priv/repo')(532,541) PsiElement(String Terminator ("))('"')(541,542) PsiElement())(')')(542,543) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(543,544) - PsiElement(\\n, \\r\\n)('\n')(543,544) - PsiWhiteSpace(' ')(544,546) + PsiWhiteSpace('\n ')(543,546) PsiElement(end)('end')(546,549) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(549,550) - PsiElement(\\n, \\r\\n)('\n')(549,550) + PsiWhiteSpace('\n')(549,550) PsiElement(end)('end')(550,553) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(553,555) - PsiElement(\\n, \\r\\n)('\n')(553,554) + PsiWhiteSpace('\n')(553,554) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(554,555) PsiElement(\\n, \\r\\n)('\n')(554,555) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(555,900) ElixirIdentifierImpl(IDENTIFIER)(555,564) @@ -323,9 +302,7 @@ Elixir File(0,900) PsiWhiteSpace(' ')(569,570) ElixirDoBlockImpl(DO_BLOCK)(570,900) PsiElement(do)('do')(570,572) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(572,573) - PsiElement(\\n, \\r\\n)('\n')(572,573) - PsiWhiteSpace(' ')(573,575) + PsiWhiteSpace('\n ')(572,575) ElixirStabImpl(STAB)(575,896) ElixirStabBodyImpl(STAB_BODY)(575,896) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(575,589) @@ -341,8 +318,8 @@ Elixir File(0,900) PsiElement(.)('.')(583,584) ElixirAliasImpl(ALIAS)(584,589) PsiElement(Alias)('Model')(584,589) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(589,591) - PsiElement(\\n, \\r\\n)('\n')(589,590) + PsiWhiteSpace('\n')(589,590) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(590,591) PsiElement(\\n, \\r\\n)('\n')(590,591) PsiWhiteSpace(' ')(591,593) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(593,669) @@ -359,9 +336,7 @@ Elixir File(0,900) PsiWhiteSpace(' ')(606,607) ElixirDoBlockImpl(DO_BLOCK)(607,669) PsiElement(do)('do')(607,609) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(609,610) - PsiElement(\\n, \\r\\n)('\n')(609,610) - PsiWhiteSpace(' ')(610,614) + PsiWhiteSpace('\n ')(609,614) ElixirStabImpl(STAB)(614,663) ElixirStabBodyImpl(STAB_BODY)(614,663) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(614,635) @@ -397,12 +372,10 @@ Elixir File(0,900) ElixirAtomImpl(ATOM)(656,663) PsiElement(:)(':')(656,657) PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('string')(657,663) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(663,664) - PsiElement(\\n, \\r\\n)('\n')(663,664) - PsiWhiteSpace(' ')(664,666) + PsiWhiteSpace('\n ')(663,666) PsiElement(end)('end')(666,669) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(669,671) - PsiElement(\\n, \\r\\n)('\n')(669,670) + PsiWhiteSpace('\n')(669,670) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(670,671) PsiElement(\\n, \\r\\n)('\n')(670,671) PsiWhiteSpace(' ')(671,673) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(673,757) @@ -416,9 +389,7 @@ Elixir File(0,900) PsiWhiteSpace(' ')(680,681) ElixirDoBlockImpl(DO_BLOCK)(681,757) PsiElement(do)('do')(681,683) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(683,684) - PsiElement(\\n, \\r\\n)('\n')(683,684) - PsiWhiteSpace(' ')(684,688) + PsiWhiteSpace('\n ')(683,688) ElixirStabImpl(STAB)(688,751) ElixirStabBodyImpl(STAB_BODY)(688,751) ElixirUnmatchedMatchOperationImpl(UNMATCHED_MATCH_OPERATION)(688,731) @@ -475,12 +446,10 @@ Elixir File(0,900) ElixirIdentifierImpl(IDENTIFIER)(745,750) PsiElement(identifier)('query')(745,750) PsiElement())(')')(750,751) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(751,752) - PsiElement(\\n, \\r\\n)('\n')(751,752) - PsiWhiteSpace(' ')(752,754) + PsiWhiteSpace('\n ')(751,754) PsiElement(end)('end')(754,757) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(757,759) - PsiElement(\\n, \\r\\n)('\n')(757,758) + PsiWhiteSpace('\n')(757,758) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(758,759) PsiElement(\\n, \\r\\n)('\n')(758,759) PsiWhiteSpace(' ')(759,761) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(761,896) @@ -501,9 +470,7 @@ Elixir File(0,900) PsiWhiteSpace(' ')(777,778) ElixirDoBlockImpl(DO_BLOCK)(778,896) PsiElement(do)('do')(778,780) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(780,781) - PsiElement(\\n, \\r\\n)('\n')(780,781) - PsiWhiteSpace(' ')(781,785) + PsiWhiteSpace('\n ')(780,785) ElixirStabImpl(STAB)(785,890) ElixirStabBodyImpl(STAB_BODY)(785,890) ElixirUnmatchedMatchOperationImpl(UNMATCHED_MATCH_OPERATION)(785,869) @@ -601,10 +568,7 @@ Elixir File(0,900) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(886,890) ElixirIdentifierImpl(IDENTIFIER)(886,890) PsiElement(identifier)('user')(886,890) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(890,891) - PsiElement(\\n, \\r\\n)('\n')(890,891) - PsiWhiteSpace(' ')(891,893) + PsiWhiteSpace('\n ')(890,893) PsiElement(end)('end')(893,896) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(896,897) - PsiElement(\\n, \\r\\n)('\n')(896,897) - PsiElement(end)('end')(897,900) \ No newline at end of file + PsiWhiteSpace('\n')(896,897) + PsiElement(end)('end')(897,900) diff --git a/testData/org/elixir_lang/parser_definition/hexadecimal_whole_number_parsing_test_case/NoDigits.txt b/testData/org/elixir_lang/parser_definition/hexadecimal_whole_number_parsing_test_case/NoDigits.txt index d5285835d..1eddf58d7 100644 --- a/testData/org/elixir_lang/parser_definition/hexadecimal_whole_number_parsing_test_case/NoDigits.txt +++ b/testData/org/elixir_lang/parser_definition/hexadecimal_whole_number_parsing_test_case/NoDigits.txt @@ -9,10 +9,9 @@ Elixir File(0,98) PsiErrorElement: expected, got ' '(36,36) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(36,70) - PsiElement(\\n, \\r\\n)('\n')(36,37) - PsiElement(\\n, \\r\\n)('\n')(37,38) - PsiComment(#)('# No digits should recover at ;')(38,69) + PsiWhiteSpace('\n\n')(36,38) + PsiComment(#)('# No digits should recover at ;')(38,69) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(69,70) PsiElement(\\n, \\r\\n)('\n')(69,70) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(70,72) ElixirHexadecimalWholeNumberImpl(HEXADECIMAL_WHOLE_NUMBER)(70,72) @@ -28,4 +27,4 @@ Elixir File(0,98) PsiElement(0)('0')(74,75) PsiElement(x)('x')(75,76) ElixirHexadecimalDigitsImpl(HEXADECIMAL_DIGITS)(76,98) - PsiElement(A-F, a-f, 0-9)('0123456789ABCDEFabcdef')(76,98) \ No newline at end of file + PsiElement(A-F, a-f, 0-9)('0123456789ABCDEFabcdef')(76,98) diff --git a/testData/org/elixir_lang/parser_definition/hexadecimal_whole_number_parsing_test_case/ObsoleteNoDigits.txt b/testData/org/elixir_lang/parser_definition/hexadecimal_whole_number_parsing_test_case/ObsoleteNoDigits.txt index 259630dc9..4e9cb3dbc 100644 --- a/testData/org/elixir_lang/parser_definition/hexadecimal_whole_number_parsing_test_case/ObsoleteNoDigits.txt +++ b/testData/org/elixir_lang/parser_definition/hexadecimal_whole_number_parsing_test_case/ObsoleteNoDigits.txt @@ -9,10 +9,9 @@ Elixir File(0,98) PsiErrorElement: expected, got ' '(36,36) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(36,70) - PsiElement(\\n, \\r\\n)('\n')(36,37) - PsiElement(\\n, \\r\\n)('\n')(37,38) - PsiComment(#)('# No digits should recover at ;')(38,69) + PsiWhiteSpace('\n\n')(36,38) + PsiComment(#)('# No digits should recover at ;')(38,69) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(69,70) PsiElement(\\n, \\r\\n)('\n')(69,70) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(70,72) ElixirHexadecimalWholeNumberImpl(HEXADECIMAL_WHOLE_NUMBER)(70,72) @@ -28,4 +27,4 @@ Elixir File(0,98) PsiElement(0)('0')(74,75) PsiElement(X)('X')(75,76) ElixirHexadecimalDigitsImpl(HEXADECIMAL_DIGITS)(76,98) - PsiElement(A-F, a-f, 0-9)('0123456789ABCDEFabcdef')(76,98) \ No newline at end of file + PsiElement(A-F, a-f, 0-9)('0123456789ABCDEFabcdef')(76,98) diff --git a/testData/org/elixir_lang/parser_definition/issue_458/MultipleNewlines.txt b/testData/org/elixir_lang/parser_definition/issue_458/MultipleNewlines.txt index 67b608909..4e99a0115 100644 --- a/testData/org/elixir_lang/parser_definition/issue_458/MultipleNewlines.txt +++ b/testData/org/elixir_lang/parser_definition/issue_458/MultipleNewlines.txt @@ -16,11 +16,9 @@ Elixir File(0,19) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(9,10) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(9,10) PsiElement(0-9)('1')(9,10) - ElixirDoBlockImpl(DO_BLOCK)(10,19) - PsiElement(\\n, \\r\\n)('\n')(10,11) - PsiElement(\\n, \\r\\n)('\n')(11,12) + PsiWhiteSpace('\n\n')(10,12) + ElixirDoBlockImpl(DO_BLOCK)(12,19) PsiElement(\\n, \\r\\n)('\n')(12,13) PsiElement(do)('do')(13,15) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(15,16) - PsiElement(\\n, \\r\\n)('\n')(15,16) - PsiElement(end)('end')(16,19) \ No newline at end of file + PsiWhiteSpace('\n')(15,16) + PsiElement(end)('end')(16,19) diff --git a/testData/org/elixir_lang/parser_definition/issue_458/NoNewline.txt b/testData/org/elixir_lang/parser_definition/issue_458/NoNewline.txt index 70bca7717..8039bc47c 100644 --- a/testData/org/elixir_lang/parser_definition/issue_458/NoNewline.txt +++ b/testData/org/elixir_lang/parser_definition/issue_458/NoNewline.txt @@ -19,6 +19,5 @@ Elixir File(0,17) PsiWhiteSpace(' ')(10,11) ElixirDoBlockImpl(DO_BLOCK)(11,17) PsiElement(do)('do')(11,13) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(13,14) - PsiElement(\\n, \\r\\n)('\n')(13,14) - PsiElement(end)('end')(14,17) \ No newline at end of file + PsiWhiteSpace('\n')(13,14) + PsiElement(end)('end')(14,17) diff --git a/testData/org/elixir_lang/parser_definition/issue_458/OneNewline.txt b/testData/org/elixir_lang/parser_definition/issue_458/OneNewline.txt index 679d8aceb..1fd5573d5 100644 --- a/testData/org/elixir_lang/parser_definition/issue_458/OneNewline.txt +++ b/testData/org/elixir_lang/parser_definition/issue_458/OneNewline.txt @@ -19,6 +19,5 @@ Elixir File(0,17) ElixirDoBlockImpl(DO_BLOCK)(10,17) PsiElement(\\n, \\r\\n)('\n')(10,11) PsiElement(do)('do')(11,13) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(13,14) - PsiElement(\\n, \\r\\n)('\n')(13,14) - PsiElement(end)('end')(14,17) \ No newline at end of file + PsiWhiteSpace('\n')(13,14) + PsiElement(end)('end')(14,17) diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn1.ex b/testData/org/elixir_lang/parser_definition/issue_580/Fn1.ex new file mode 100644 index 000000000..346e5b520 --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn1.ex @@ -0,0 +1,6 @@ +defmodule A do + def a do + fn -> + end + end +end diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn1.txt b/testData/org/elixir_lang/parser_definition/issue_580/Fn1.txt new file mode 100644 index 000000000..b3d1fcbbc --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn1.txt @@ -0,0 +1,43 @@ +Elixir File(0,53) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(0,53) + ElixirIdentifierImpl(IDENTIFIER)(0,9) + PsiElement(identifier)('defmodule')(0,9) + PsiWhiteSpace(' ')(9,10) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(10,11) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(10,11) + ElixirAliasImpl(ALIAS)(10,11) + PsiElement(Alias)('A')(10,11) + PsiWhiteSpace(' ')(11,12) + ElixirDoBlockImpl(DO_BLOCK)(12,53) + PsiElement(do)('do')(12,14) + PsiWhiteSpace('\n ')(14,17) + ElixirStabImpl(STAB)(17,49) + ElixirStabBodyImpl(STAB_BODY)(17,49) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(17,49) + ElixirIdentifierImpl(IDENTIFIER)(17,20) + PsiElement(identifier)('def')(17,20) + PsiWhiteSpace(' ')(20,21) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(21,22) + MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,22) + ElixirIdentifierImpl(IDENTIFIER)(21,22) + PsiElement(identifier)('a')(21,22) + PsiWhiteSpace(' ')(22,23) + ElixirDoBlockImpl(DO_BLOCK)(23,49) + PsiElement(do)('do')(23,25) + PsiWhiteSpace('\n ')(25,30) + ElixirStabImpl(STAB)(30,43) + ElixirStabBodyImpl(STAB_BODY)(30,43) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,43) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(30,43) + PsiElement(fn)('fn')(30,32) + PsiWhiteSpace(' ')(32,33) + ElixirStabImpl(STAB)(33,35) + ElixirStabOperationImpl(STAB_OPERATION)(33,35) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(33,35) + PsiElement(->)('->')(33,35) + PsiWhiteSpace('\n ')(35,40) + PsiElement(end)('end')(40,43) + PsiWhiteSpace('\n ')(43,46) + PsiElement(end)('end')(46,49) + PsiWhiteSpace('\n')(49,50) + PsiElement(end)('end')(50,53) diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn2.ex b/testData/org/elixir_lang/parser_definition/issue_580/Fn2.ex new file mode 100644 index 000000000..653f5bb55 --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn2.ex @@ -0,0 +1,8 @@ +defmodule A do + def a do + fn -> + fn -> + end + end + end +end diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn2.txt b/testData/org/elixir_lang/parser_definition/issue_580/Fn2.txt new file mode 100644 index 000000000..79a317239 --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn2.txt @@ -0,0 +1,55 @@ +Elixir File(0,75) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(0,75) + ElixirIdentifierImpl(IDENTIFIER)(0,9) + PsiElement(identifier)('defmodule')(0,9) + PsiWhiteSpace(' ')(9,10) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(10,11) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(10,11) + ElixirAliasImpl(ALIAS)(10,11) + PsiElement(Alias)('A')(10,11) + PsiWhiteSpace(' ')(11,12) + ElixirDoBlockImpl(DO_BLOCK)(12,75) + PsiElement(do)('do')(12,14) + PsiWhiteSpace('\n ')(14,17) + ElixirStabImpl(STAB)(17,71) + ElixirStabBodyImpl(STAB_BODY)(17,71) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(17,71) + ElixirIdentifierImpl(IDENTIFIER)(17,20) + PsiElement(identifier)('def')(17,20) + PsiWhiteSpace(' ')(20,21) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(21,22) + MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,22) + ElixirIdentifierImpl(IDENTIFIER)(21,22) + PsiElement(identifier)('a')(21,22) + PsiWhiteSpace(' ')(22,23) + ElixirDoBlockImpl(DO_BLOCK)(23,71) + PsiElement(do)('do')(23,25) + PsiWhiteSpace('\n ')(25,30) + ElixirStabImpl(STAB)(30,65) + ElixirStabBodyImpl(STAB_BODY)(30,65) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,65) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(30,65) + PsiElement(fn)('fn')(30,32) + PsiWhiteSpace(' ')(32,33) + ElixirStabImpl(STAB)(33,57) + ElixirStabOperationImpl(STAB_OPERATION)(33,57) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(33,35) + PsiElement(->)('->')(33,35) + PsiWhiteSpace('\n ')(35,42) + ElixirStabBodyImpl(STAB_BODY)(42,57) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(42,57) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(42,57) + PsiElement(fn)('fn')(42,44) + PsiWhiteSpace(' ')(44,45) + ElixirStabImpl(STAB)(45,47) + ElixirStabOperationImpl(STAB_OPERATION)(45,47) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(45,47) + PsiElement(->)('->')(45,47) + PsiWhiteSpace('\n ')(47,54) + PsiElement(end)('end')(54,57) + PsiWhiteSpace('\n ')(57,62) + PsiElement(end)('end')(62,65) + PsiWhiteSpace('\n ')(65,68) + PsiElement(end)('end')(68,71) + PsiWhiteSpace('\n')(71,72) + PsiElement(end)('end')(72,75) diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn3.ex b/testData/org/elixir_lang/parser_definition/issue_580/Fn3.ex new file mode 100644 index 000000000..60428bf2d --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn3.ex @@ -0,0 +1,10 @@ +defmodule A do + def a do + fn -> + fn -> + fn -> + end + end + end + end +end diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn3.txt b/testData/org/elixir_lang/parser_definition/issue_580/Fn3.txt new file mode 100644 index 000000000..befb086d2 --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn3.txt @@ -0,0 +1,67 @@ +Elixir File(0,101) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(0,101) + ElixirIdentifierImpl(IDENTIFIER)(0,9) + PsiElement(identifier)('defmodule')(0,9) + PsiWhiteSpace(' ')(9,10) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(10,11) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(10,11) + ElixirAliasImpl(ALIAS)(10,11) + PsiElement(Alias)('A')(10,11) + PsiWhiteSpace(' ')(11,12) + ElixirDoBlockImpl(DO_BLOCK)(12,101) + PsiElement(do)('do')(12,14) + PsiWhiteSpace('\n ')(14,17) + ElixirStabImpl(STAB)(17,97) + ElixirStabBodyImpl(STAB_BODY)(17,97) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(17,97) + ElixirIdentifierImpl(IDENTIFIER)(17,20) + PsiElement(identifier)('def')(17,20) + PsiWhiteSpace(' ')(20,21) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(21,22) + MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,22) + ElixirIdentifierImpl(IDENTIFIER)(21,22) + PsiElement(identifier)('a')(21,22) + PsiWhiteSpace(' ')(22,23) + ElixirDoBlockImpl(DO_BLOCK)(23,97) + PsiElement(do)('do')(23,25) + PsiWhiteSpace('\n ')(25,30) + ElixirStabImpl(STAB)(30,91) + ElixirStabBodyImpl(STAB_BODY)(30,91) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,91) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(30,91) + PsiElement(fn)('fn')(30,32) + PsiWhiteSpace(' ')(32,33) + ElixirStabImpl(STAB)(33,83) + ElixirStabOperationImpl(STAB_OPERATION)(33,83) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(33,35) + PsiElement(->)('->')(33,35) + PsiWhiteSpace('\n ')(35,42) + ElixirStabBodyImpl(STAB_BODY)(42,83) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(42,83) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(42,83) + PsiElement(fn)('fn')(42,44) + PsiWhiteSpace(' ')(44,45) + ElixirStabImpl(STAB)(45,73) + ElixirStabOperationImpl(STAB_OPERATION)(45,73) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(45,47) + PsiElement(->)('->')(45,47) + PsiWhiteSpace('\n ')(47,56) + ElixirStabBodyImpl(STAB_BODY)(56,73) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(56,73) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(56,73) + PsiElement(fn)('fn')(56,58) + PsiWhiteSpace(' ')(58,59) + ElixirStabImpl(STAB)(59,61) + ElixirStabOperationImpl(STAB_OPERATION)(59,61) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(59,61) + PsiElement(->)('->')(59,61) + PsiWhiteSpace('\n ')(61,70) + PsiElement(end)('end')(70,73) + PsiWhiteSpace('\n ')(73,80) + PsiElement(end)('end')(80,83) + PsiWhiteSpace('\n ')(83,88) + PsiElement(end)('end')(88,91) + PsiWhiteSpace('\n ')(91,94) + PsiElement(end)('end')(94,97) + PsiWhiteSpace('\n')(97,98) + PsiElement(end)('end')(98,101) diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn4.ex b/testData/org/elixir_lang/parser_definition/issue_580/Fn4.ex new file mode 100644 index 000000000..8b065499d --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn4.ex @@ -0,0 +1,12 @@ +defmodule A do + def a do + fn -> + fn -> + fn -> + fn -> + end + end + end + end + end +end diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn4.txt b/testData/org/elixir_lang/parser_definition/issue_580/Fn4.txt new file mode 100644 index 000000000..e7137f53b --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn4.txt @@ -0,0 +1,79 @@ +Elixir File(0,131) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(0,131) + ElixirIdentifierImpl(IDENTIFIER)(0,9) + PsiElement(identifier)('defmodule')(0,9) + PsiWhiteSpace(' ')(9,10) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(10,11) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(10,11) + ElixirAliasImpl(ALIAS)(10,11) + PsiElement(Alias)('A')(10,11) + PsiWhiteSpace(' ')(11,12) + ElixirDoBlockImpl(DO_BLOCK)(12,131) + PsiElement(do)('do')(12,14) + PsiWhiteSpace('\n ')(14,17) + ElixirStabImpl(STAB)(17,127) + ElixirStabBodyImpl(STAB_BODY)(17,127) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(17,127) + ElixirIdentifierImpl(IDENTIFIER)(17,20) + PsiElement(identifier)('def')(17,20) + PsiWhiteSpace(' ')(20,21) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(21,22) + MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,22) + ElixirIdentifierImpl(IDENTIFIER)(21,22) + PsiElement(identifier)('a')(21,22) + PsiWhiteSpace(' ')(22,23) + ElixirDoBlockImpl(DO_BLOCK)(23,127) + PsiElement(do)('do')(23,25) + PsiWhiteSpace('\n ')(25,30) + ElixirStabImpl(STAB)(30,121) + ElixirStabBodyImpl(STAB_BODY)(30,121) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,121) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(30,121) + PsiElement(fn)('fn')(30,32) + PsiWhiteSpace(' ')(32,33) + ElixirStabImpl(STAB)(33,113) + ElixirStabOperationImpl(STAB_OPERATION)(33,113) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(33,35) + PsiElement(->)('->')(33,35) + PsiWhiteSpace('\n ')(35,42) + ElixirStabBodyImpl(STAB_BODY)(42,113) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(42,113) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(42,113) + PsiElement(fn)('fn')(42,44) + PsiWhiteSpace(' ')(44,45) + ElixirStabImpl(STAB)(45,103) + ElixirStabOperationImpl(STAB_OPERATION)(45,103) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(45,47) + PsiElement(->)('->')(45,47) + PsiWhiteSpace('\n ')(47,56) + ElixirStabBodyImpl(STAB_BODY)(56,103) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(56,103) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(56,103) + PsiElement(fn)('fn')(56,58) + PsiWhiteSpace(' ')(58,59) + ElixirStabImpl(STAB)(59,91) + ElixirStabOperationImpl(STAB_OPERATION)(59,91) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(59,61) + PsiElement(->)('->')(59,61) + PsiWhiteSpace('\n ')(61,72) + ElixirStabBodyImpl(STAB_BODY)(72,91) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(72,91) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(72,91) + PsiElement(fn)('fn')(72,74) + PsiWhiteSpace(' ')(74,75) + ElixirStabImpl(STAB)(75,77) + ElixirStabOperationImpl(STAB_OPERATION)(75,77) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(75,77) + PsiElement(->)('->')(75,77) + PsiWhiteSpace('\n ')(77,88) + PsiElement(end)('end')(88,91) + PsiWhiteSpace('\n ')(91,100) + PsiElement(end)('end')(100,103) + PsiWhiteSpace('\n ')(103,110) + PsiElement(end)('end')(110,113) + PsiWhiteSpace('\n ')(113,118) + PsiElement(end)('end')(118,121) + PsiWhiteSpace('\n ')(121,124) + PsiElement(end)('end')(124,127) + PsiWhiteSpace('\n')(127,128) + PsiElement(end)('end')(128,131) diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn5.ex b/testData/org/elixir_lang/parser_definition/issue_580/Fn5.ex new file mode 100644 index 000000000..50516a15c --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn5.ex @@ -0,0 +1,14 @@ +defmodule A do + def a do + fn -> + fn -> + fn -> + fn -> + fn -> + end + end + end + end + end + end +end diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn5.txt b/testData/org/elixir_lang/parser_definition/issue_580/Fn5.txt new file mode 100644 index 000000000..66cfa8098 --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn5.txt @@ -0,0 +1,91 @@ +Elixir File(0,165) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(0,165) + ElixirIdentifierImpl(IDENTIFIER)(0,9) + PsiElement(identifier)('defmodule')(0,9) + PsiWhiteSpace(' ')(9,10) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(10,11) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(10,11) + ElixirAliasImpl(ALIAS)(10,11) + PsiElement(Alias)('A')(10,11) + PsiWhiteSpace(' ')(11,12) + ElixirDoBlockImpl(DO_BLOCK)(12,165) + PsiElement(do)('do')(12,14) + PsiWhiteSpace('\n ')(14,17) + ElixirStabImpl(STAB)(17,161) + ElixirStabBodyImpl(STAB_BODY)(17,161) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(17,161) + ElixirIdentifierImpl(IDENTIFIER)(17,20) + PsiElement(identifier)('def')(17,20) + PsiWhiteSpace(' ')(20,21) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(21,22) + MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,22) + ElixirIdentifierImpl(IDENTIFIER)(21,22) + PsiElement(identifier)('a')(21,22) + PsiWhiteSpace(' ')(22,23) + ElixirDoBlockImpl(DO_BLOCK)(23,161) + PsiElement(do)('do')(23,25) + PsiWhiteSpace('\n ')(25,30) + ElixirStabImpl(STAB)(30,155) + ElixirStabBodyImpl(STAB_BODY)(30,155) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,155) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(30,155) + PsiElement(fn)('fn')(30,32) + PsiWhiteSpace(' ')(32,33) + ElixirStabImpl(STAB)(33,147) + ElixirStabOperationImpl(STAB_OPERATION)(33,147) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(33,35) + PsiElement(->)('->')(33,35) + PsiWhiteSpace('\n ')(35,42) + ElixirStabBodyImpl(STAB_BODY)(42,147) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(42,147) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(42,147) + PsiElement(fn)('fn')(42,44) + PsiWhiteSpace(' ')(44,45) + ElixirStabImpl(STAB)(45,137) + ElixirStabOperationImpl(STAB_OPERATION)(45,137) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(45,47) + PsiElement(->)('->')(45,47) + PsiWhiteSpace('\n ')(47,56) + ElixirStabBodyImpl(STAB_BODY)(56,137) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(56,137) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(56,137) + PsiElement(fn)('fn')(56,58) + PsiWhiteSpace(' ')(58,59) + ElixirStabImpl(STAB)(59,125) + ElixirStabOperationImpl(STAB_OPERATION)(59,125) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(59,61) + PsiElement(->)('->')(59,61) + PsiWhiteSpace('\n ')(61,72) + ElixirStabBodyImpl(STAB_BODY)(72,125) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(72,125) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(72,125) + PsiElement(fn)('fn')(72,74) + PsiWhiteSpace(' ')(74,75) + ElixirStabImpl(STAB)(75,111) + ElixirStabOperationImpl(STAB_OPERATION)(75,111) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(75,77) + PsiElement(->)('->')(75,77) + PsiWhiteSpace('\n ')(77,90) + ElixirStabBodyImpl(STAB_BODY)(90,111) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(90,111) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(90,111) + PsiElement(fn)('fn')(90,92) + PsiWhiteSpace(' ')(92,93) + ElixirStabImpl(STAB)(93,95) + ElixirStabOperationImpl(STAB_OPERATION)(93,95) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(93,95) + PsiElement(->)('->')(93,95) + PsiWhiteSpace('\n ')(95,108) + PsiElement(end)('end')(108,111) + PsiWhiteSpace('\n ')(111,122) + PsiElement(end)('end')(122,125) + PsiWhiteSpace('\n ')(125,134) + PsiElement(end)('end')(134,137) + PsiWhiteSpace('\n ')(137,144) + PsiElement(end)('end')(144,147) + PsiWhiteSpace('\n ')(147,152) + PsiElement(end)('end')(152,155) + PsiWhiteSpace('\n ')(155,158) + PsiElement(end)('end')(158,161) + PsiWhiteSpace('\n')(161,162) + PsiElement(end)('end')(162,165) diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn6.ex b/testData/org/elixir_lang/parser_definition/issue_580/Fn6.ex new file mode 100644 index 000000000..0cac0dc4e --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn6.ex @@ -0,0 +1,16 @@ +defmodule A do + def a do + fn -> + fn -> + fn -> + fn -> + fn -> + fn -> + end + end + end + end + end + end + end +end diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn6.txt b/testData/org/elixir_lang/parser_definition/issue_580/Fn6.txt new file mode 100644 index 000000000..a12bf4af3 --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn6.txt @@ -0,0 +1,103 @@ +Elixir File(0,203) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(0,203) + ElixirIdentifierImpl(IDENTIFIER)(0,9) + PsiElement(identifier)('defmodule')(0,9) + PsiWhiteSpace(' ')(9,10) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(10,11) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(10,11) + ElixirAliasImpl(ALIAS)(10,11) + PsiElement(Alias)('A')(10,11) + PsiWhiteSpace(' ')(11,12) + ElixirDoBlockImpl(DO_BLOCK)(12,203) + PsiElement(do)('do')(12,14) + PsiWhiteSpace('\n ')(14,17) + ElixirStabImpl(STAB)(17,199) + ElixirStabBodyImpl(STAB_BODY)(17,199) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(17,199) + ElixirIdentifierImpl(IDENTIFIER)(17,20) + PsiElement(identifier)('def')(17,20) + PsiWhiteSpace(' ')(20,21) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(21,22) + MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,22) + ElixirIdentifierImpl(IDENTIFIER)(21,22) + PsiElement(identifier)('a')(21,22) + PsiWhiteSpace(' ')(22,23) + ElixirDoBlockImpl(DO_BLOCK)(23,199) + PsiElement(do)('do')(23,25) + PsiWhiteSpace('\n ')(25,30) + ElixirStabImpl(STAB)(30,193) + ElixirStabBodyImpl(STAB_BODY)(30,193) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,193) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(30,193) + PsiElement(fn)('fn')(30,32) + PsiWhiteSpace(' ')(32,33) + ElixirStabImpl(STAB)(33,185) + ElixirStabOperationImpl(STAB_OPERATION)(33,185) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(33,35) + PsiElement(->)('->')(33,35) + PsiWhiteSpace('\n ')(35,42) + ElixirStabBodyImpl(STAB_BODY)(42,185) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(42,185) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(42,185) + PsiElement(fn)('fn')(42,44) + PsiWhiteSpace(' ')(44,45) + ElixirStabImpl(STAB)(45,175) + ElixirStabOperationImpl(STAB_OPERATION)(45,175) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(45,47) + PsiElement(->)('->')(45,47) + PsiWhiteSpace('\n ')(47,56) + ElixirStabBodyImpl(STAB_BODY)(56,175) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(56,175) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(56,175) + PsiElement(fn)('fn')(56,58) + PsiWhiteSpace(' ')(58,59) + ElixirStabImpl(STAB)(59,163) + ElixirStabOperationImpl(STAB_OPERATION)(59,163) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(59,61) + PsiElement(->)('->')(59,61) + PsiWhiteSpace('\n ')(61,72) + ElixirStabBodyImpl(STAB_BODY)(72,163) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(72,163) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(72,163) + PsiElement(fn)('fn')(72,74) + PsiWhiteSpace(' ')(74,75) + ElixirStabImpl(STAB)(75,149) + ElixirStabOperationImpl(STAB_OPERATION)(75,149) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(75,77) + PsiElement(->)('->')(75,77) + PsiWhiteSpace('\n ')(77,90) + ElixirStabBodyImpl(STAB_BODY)(90,149) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(90,149) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(90,149) + PsiElement(fn)('fn')(90,92) + PsiWhiteSpace(' ')(92,93) + ElixirStabImpl(STAB)(93,133) + ElixirStabOperationImpl(STAB_OPERATION)(93,133) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(93,95) + PsiElement(->)('->')(93,95) + PsiWhiteSpace('\n ')(95,110) + ElixirStabBodyImpl(STAB_BODY)(110,133) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(110,133) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(110,133) + PsiElement(fn)('fn')(110,112) + PsiWhiteSpace(' ')(112,113) + ElixirStabImpl(STAB)(113,115) + ElixirStabOperationImpl(STAB_OPERATION)(113,115) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(113,115) + PsiElement(->)('->')(113,115) + PsiWhiteSpace('\n ')(115,130) + PsiElement(end)('end')(130,133) + PsiWhiteSpace('\n ')(133,146) + PsiElement(end)('end')(146,149) + PsiWhiteSpace('\n ')(149,160) + PsiElement(end)('end')(160,163) + PsiWhiteSpace('\n ')(163,172) + PsiElement(end)('end')(172,175) + PsiWhiteSpace('\n ')(175,182) + PsiElement(end)('end')(182,185) + PsiWhiteSpace('\n ')(185,190) + PsiElement(end)('end')(190,193) + PsiWhiteSpace('\n ')(193,196) + PsiElement(end)('end')(196,199) + PsiWhiteSpace('\n')(199,200) + PsiElement(end)('end')(200,203) diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn7.ex b/testData/org/elixir_lang/parser_definition/issue_580/Fn7.ex new file mode 100644 index 000000000..86b19d856 --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn7.ex @@ -0,0 +1,18 @@ +defmodule A do + def a do + fn -> + fn -> + fn -> + fn -> + fn -> + fn -> + fn -> + end + end + end + end + end + end + end + end +end diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn7.txt b/testData/org/elixir_lang/parser_definition/issue_580/Fn7.txt new file mode 100644 index 000000000..cc12a26c8 --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn7.txt @@ -0,0 +1,115 @@ +Elixir File(0,245) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(0,245) + ElixirIdentifierImpl(IDENTIFIER)(0,9) + PsiElement(identifier)('defmodule')(0,9) + PsiWhiteSpace(' ')(9,10) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(10,11) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(10,11) + ElixirAliasImpl(ALIAS)(10,11) + PsiElement(Alias)('A')(10,11) + PsiWhiteSpace(' ')(11,12) + ElixirDoBlockImpl(DO_BLOCK)(12,245) + PsiElement(do)('do')(12,14) + PsiWhiteSpace('\n ')(14,17) + ElixirStabImpl(STAB)(17,241) + ElixirStabBodyImpl(STAB_BODY)(17,241) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(17,241) + ElixirIdentifierImpl(IDENTIFIER)(17,20) + PsiElement(identifier)('def')(17,20) + PsiWhiteSpace(' ')(20,21) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(21,22) + MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,22) + ElixirIdentifierImpl(IDENTIFIER)(21,22) + PsiElement(identifier)('a')(21,22) + PsiWhiteSpace(' ')(22,23) + ElixirDoBlockImpl(DO_BLOCK)(23,241) + PsiElement(do)('do')(23,25) + PsiWhiteSpace('\n ')(25,30) + ElixirStabImpl(STAB)(30,235) + ElixirStabBodyImpl(STAB_BODY)(30,235) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,235) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(30,235) + PsiElement(fn)('fn')(30,32) + PsiWhiteSpace(' ')(32,33) + ElixirStabImpl(STAB)(33,227) + ElixirStabOperationImpl(STAB_OPERATION)(33,227) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(33,35) + PsiElement(->)('->')(33,35) + PsiWhiteSpace('\n ')(35,42) + ElixirStabBodyImpl(STAB_BODY)(42,227) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(42,227) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(42,227) + PsiElement(fn)('fn')(42,44) + PsiWhiteSpace(' ')(44,45) + ElixirStabImpl(STAB)(45,217) + ElixirStabOperationImpl(STAB_OPERATION)(45,217) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(45,47) + PsiElement(->)('->')(45,47) + PsiWhiteSpace('\n ')(47,56) + ElixirStabBodyImpl(STAB_BODY)(56,217) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(56,217) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(56,217) + PsiElement(fn)('fn')(56,58) + PsiWhiteSpace(' ')(58,59) + ElixirStabImpl(STAB)(59,205) + ElixirStabOperationImpl(STAB_OPERATION)(59,205) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(59,61) + PsiElement(->)('->')(59,61) + PsiWhiteSpace('\n ')(61,72) + ElixirStabBodyImpl(STAB_BODY)(72,205) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(72,205) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(72,205) + PsiElement(fn)('fn')(72,74) + PsiWhiteSpace(' ')(74,75) + ElixirStabImpl(STAB)(75,191) + ElixirStabOperationImpl(STAB_OPERATION)(75,191) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(75,77) + PsiElement(->)('->')(75,77) + PsiWhiteSpace('\n ')(77,90) + ElixirStabBodyImpl(STAB_BODY)(90,191) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(90,191) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(90,191) + PsiElement(fn)('fn')(90,92) + PsiWhiteSpace(' ')(92,93) + ElixirStabImpl(STAB)(93,175) + ElixirStabOperationImpl(STAB_OPERATION)(93,175) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(93,95) + PsiElement(->)('->')(93,95) + PsiWhiteSpace('\n ')(95,110) + ElixirStabBodyImpl(STAB_BODY)(110,175) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(110,175) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(110,175) + PsiElement(fn)('fn')(110,112) + PsiWhiteSpace(' ')(112,113) + ElixirStabImpl(STAB)(113,157) + ElixirStabOperationImpl(STAB_OPERATION)(113,157) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(113,115) + PsiElement(->)('->')(113,115) + PsiWhiteSpace('\n ')(115,132) + ElixirStabBodyImpl(STAB_BODY)(132,157) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(132,157) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(132,157) + PsiElement(fn)('fn')(132,134) + PsiWhiteSpace(' ')(134,135) + ElixirStabImpl(STAB)(135,137) + ElixirStabOperationImpl(STAB_OPERATION)(135,137) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(135,137) + PsiElement(->)('->')(135,137) + PsiWhiteSpace('\n ')(137,154) + PsiElement(end)('end')(154,157) + PsiWhiteSpace('\n ')(157,172) + PsiElement(end)('end')(172,175) + PsiWhiteSpace('\n ')(175,188) + PsiElement(end)('end')(188,191) + PsiWhiteSpace('\n ')(191,202) + PsiElement(end)('end')(202,205) + PsiWhiteSpace('\n ')(205,214) + PsiElement(end)('end')(214,217) + PsiWhiteSpace('\n ')(217,224) + PsiElement(end)('end')(224,227) + PsiWhiteSpace('\n ')(227,232) + PsiElement(end)('end')(232,235) + PsiWhiteSpace('\n ')(235,238) + PsiElement(end)('end')(238,241) + PsiWhiteSpace('\n')(241,242) + PsiElement(end)('end')(242,245) diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn8.ex b/testData/org/elixir_lang/parser_definition/issue_580/Fn8.ex new file mode 100644 index 000000000..a355222cf --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn8.ex @@ -0,0 +1,20 @@ +defmodule A do + def a do + fn -> + fn -> + fn -> + fn -> + fn -> + fn -> + fn -> + fn -> + end + end + end + end + end + end + end + end + end +end diff --git a/testData/org/elixir_lang/parser_definition/issue_580/Fn8.txt b/testData/org/elixir_lang/parser_definition/issue_580/Fn8.txt new file mode 100644 index 000000000..2bf41638a --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/Fn8.txt @@ -0,0 +1,127 @@ +Elixir File(0,291) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(0,291) + ElixirIdentifierImpl(IDENTIFIER)(0,9) + PsiElement(identifier)('defmodule')(0,9) + PsiWhiteSpace(' ')(9,10) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(10,11) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(10,11) + ElixirAliasImpl(ALIAS)(10,11) + PsiElement(Alias)('A')(10,11) + PsiWhiteSpace(' ')(11,12) + ElixirDoBlockImpl(DO_BLOCK)(12,291) + PsiElement(do)('do')(12,14) + PsiWhiteSpace('\n ')(14,17) + ElixirStabImpl(STAB)(17,287) + ElixirStabBodyImpl(STAB_BODY)(17,287) + UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(17,287) + ElixirIdentifierImpl(IDENTIFIER)(17,20) + PsiElement(identifier)('def')(17,20) + PsiWhiteSpace(' ')(20,21) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(21,22) + MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,22) + ElixirIdentifierImpl(IDENTIFIER)(21,22) + PsiElement(identifier)('a')(21,22) + PsiWhiteSpace(' ')(22,23) + ElixirDoBlockImpl(DO_BLOCK)(23,287) + PsiElement(do)('do')(23,25) + PsiWhiteSpace('\n ')(25,30) + ElixirStabImpl(STAB)(30,281) + ElixirStabBodyImpl(STAB_BODY)(30,281) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,281) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(30,281) + PsiElement(fn)('fn')(30,32) + PsiWhiteSpace(' ')(32,33) + ElixirStabImpl(STAB)(33,273) + ElixirStabOperationImpl(STAB_OPERATION)(33,273) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(33,35) + PsiElement(->)('->')(33,35) + PsiWhiteSpace('\n ')(35,42) + ElixirStabBodyImpl(STAB_BODY)(42,273) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(42,273) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(42,273) + PsiElement(fn)('fn')(42,44) + PsiWhiteSpace(' ')(44,45) + ElixirStabImpl(STAB)(45,263) + ElixirStabOperationImpl(STAB_OPERATION)(45,263) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(45,47) + PsiElement(->)('->')(45,47) + PsiWhiteSpace('\n ')(47,56) + ElixirStabBodyImpl(STAB_BODY)(56,263) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(56,263) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(56,263) + PsiElement(fn)('fn')(56,58) + PsiWhiteSpace(' ')(58,59) + ElixirStabImpl(STAB)(59,251) + ElixirStabOperationImpl(STAB_OPERATION)(59,251) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(59,61) + PsiElement(->)('->')(59,61) + PsiWhiteSpace('\n ')(61,72) + ElixirStabBodyImpl(STAB_BODY)(72,251) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(72,251) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(72,251) + PsiElement(fn)('fn')(72,74) + PsiWhiteSpace(' ')(74,75) + ElixirStabImpl(STAB)(75,237) + ElixirStabOperationImpl(STAB_OPERATION)(75,237) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(75,77) + PsiElement(->)('->')(75,77) + PsiWhiteSpace('\n ')(77,90) + ElixirStabBodyImpl(STAB_BODY)(90,237) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(90,237) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(90,237) + PsiElement(fn)('fn')(90,92) + PsiWhiteSpace(' ')(92,93) + ElixirStabImpl(STAB)(93,221) + ElixirStabOperationImpl(STAB_OPERATION)(93,221) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(93,95) + PsiElement(->)('->')(93,95) + PsiWhiteSpace('\n ')(95,110) + ElixirStabBodyImpl(STAB_BODY)(110,221) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(110,221) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(110,221) + PsiElement(fn)('fn')(110,112) + PsiWhiteSpace(' ')(112,113) + ElixirStabImpl(STAB)(113,203) + ElixirStabOperationImpl(STAB_OPERATION)(113,203) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(113,115) + PsiElement(->)('->')(113,115) + PsiWhiteSpace('\n ')(115,132) + ElixirStabBodyImpl(STAB_BODY)(132,203) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(132,203) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(132,203) + PsiElement(fn)('fn')(132,134) + PsiWhiteSpace(' ')(134,135) + ElixirStabImpl(STAB)(135,183) + ElixirStabOperationImpl(STAB_OPERATION)(135,183) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(135,137) + PsiElement(->)('->')(135,137) + PsiWhiteSpace('\n ')(137,156) + ElixirStabBodyImpl(STAB_BODY)(156,183) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(156,183) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(156,183) + PsiElement(fn)('fn')(156,158) + PsiWhiteSpace(' ')(158,159) + ElixirStabImpl(STAB)(159,161) + ElixirStabOperationImpl(STAB_OPERATION)(159,161) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(159,161) + PsiElement(->)('->')(159,161) + PsiWhiteSpace('\n ')(161,180) + PsiElement(end)('end')(180,183) + PsiWhiteSpace('\n ')(183,200) + PsiElement(end)('end')(200,203) + PsiWhiteSpace('\n ')(203,218) + PsiElement(end)('end')(218,221) + PsiWhiteSpace('\n ')(221,234) + PsiElement(end)('end')(234,237) + PsiWhiteSpace('\n ')(237,248) + PsiElement(end)('end')(248,251) + PsiWhiteSpace('\n ')(251,260) + PsiElement(end)('end')(260,263) + PsiWhiteSpace('\n ')(263,270) + PsiElement(end)('end')(270,273) + PsiWhiteSpace('\n ')(273,278) + PsiElement(end)('end')(278,281) + PsiWhiteSpace('\n ')(281,284) + PsiElement(end)('end')(284,287) + PsiWhiteSpace('\n')(287,288) + PsiElement(end)('end')(288,291) diff --git a/testData/org/elixir_lang/parser_definition/issue_580/FnStructNoParenthesesManyArguments.ex b/testData/org/elixir_lang/parser_definition/issue_580/FnStructNoParenthesesManyArguments.ex new file mode 100644 index 000000000..5862ea8a0 --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/FnStructNoParenthesesManyArguments.ex @@ -0,0 +1,6 @@ +fn + %{} -> + 1 + 2, <<>> -> + 3 +end diff --git a/testData/org/elixir_lang/parser_definition/issue_580/FnStructNoParenthesesManyArguments.txt b/testData/org/elixir_lang/parser_definition/issue_580/FnStructNoParenthesesManyArguments.txt new file mode 100644 index 000000000..2bf9ceccf --- /dev/null +++ b/testData/org/elixir_lang/parser_definition/issue_580/FnStructNoParenthesesManyArguments.txt @@ -0,0 +1,54 @@ +Elixir File(0,40) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(0,40) + ElixirAnonymousFunctionImpl(ANONYMOUS_FUNCTION)(0,40) + PsiElement(fn)('fn')(0,2) + PsiWhiteSpace('\n ')(2,5) + ElixirStabImpl(STAB)(5,36) + ElixirStabOperationImpl(STAB_OPERATION)(5,17) + ElixirStabNoParenthesesSignatureImpl(STAB_NO_PARENTHESES_SIGNATURE)(5,8) + ElixirNoParenthesesArgumentsImpl(NO_PARENTHESES_ARGUMENTS)(5,8) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(5,8) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(5,8) + ElixirMapOperationImpl(MAP_OPERATION)(5,8) + ElixirMapPrefixOperatorImpl(MAP_PREFIX_OPERATOR)(5,6) + PsiElement(%)('%')(5,6) + ElixirMapArgumentsImpl(MAP_ARGUMENTS)(6,8) + PsiElement({)('{')(6,7) + PsiElement(})('}')(7,8) + PsiWhiteSpace(' ')(8,9) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(9,11) + PsiElement(->)('->')(9,11) + PsiWhiteSpace('\n ')(11,16) + ElixirStabBodyImpl(STAB_BODY)(16,17) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(16,17) + ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(16,17) + ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(16,17) + PsiElement(0-9)('1')(16,17) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(17,18) + PsiElement(\\n, \\r\\n)('\n')(17,18) + PsiWhiteSpace(' ')(18,20) + ElixirStabOperationImpl(STAB_OPERATION)(20,36) + ElixirStabNoParenthesesSignatureImpl(STAB_NO_PARENTHESES_SIGNATURE)(20,27) + ElixirNoParenthesesArgumentsImpl(NO_PARENTHESES_ARGUMENTS)(20,27) + ElixirNoParenthesesOneArgumentImpl(NO_PARENTHESES_ONE_ARGUMENT)(20,27) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(20,21) + ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(20,21) + ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(20,21) + PsiElement(0-9)('2')(20,21) + PsiElement(,)(',')(21,22) + PsiWhiteSpace(' ')(22,23) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(23,27) + ElixirBitStringImpl(BIT_STRING)(23,27) + PsiElement(<<)('<<')(23,25) + PsiElement(>>)('>>')(25,27) + PsiWhiteSpace(' ')(27,28) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(28,30) + PsiElement(->)('->')(28,30) + PsiWhiteSpace('\n ')(30,35) + ElixirStabBodyImpl(STAB_BODY)(35,36) + ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(35,36) + ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(35,36) + ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(35,36) + PsiElement(0-9)('3')(35,36) + PsiWhiteSpace('\n')(36,37) + PsiElement(end)('end')(37,40) diff --git a/testData/org/elixir_lang/parser_definition/issue_674/Feymartynov.txt b/testData/org/elixir_lang/parser_definition/issue_674/Feymartynov.txt index 38d121ae2..a2d02e7d6 100644 --- a/testData/org/elixir_lang/parser_definition/issue_674/Feymartynov.txt +++ b/testData/org/elixir_lang/parser_definition/issue_674/Feymartynov.txt @@ -32,9 +32,7 @@ Elixir File(0,46) PsiWhiteSpace(' ')(24,25) ElixirDoBlockImpl(DO_BLOCK)(25,46) PsiElement(do)('do')(25,27) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(27,28) - PsiElement(\\n, \\r\\n)('\n')(27,28) - PsiWhiteSpace(' ')(28,30) + PsiWhiteSpace('\n ')(27,30) ElixirStabImpl(STAB)(30,42) ElixirStabBodyImpl(STAB_BODY)(30,42) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,42) @@ -50,6 +48,5 @@ Elixir File(0,46) ElixirIdentifierImpl(IDENTIFIER)(36,41) PsiElement(identifier)('value')(36,41) PsiElement(})('}')(41,42) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(42,43) - PsiElement(\\n, \\r\\n)('\n')(42,43) - PsiElement(end)('end')(43,46) \ No newline at end of file + PsiWhiteSpace('\n')(42,43) + PsiElement(end)('end')(43,46) diff --git a/testData/org/elixir_lang/parser_definition/list_parsing_test_case/Empty.txt b/testData/org/elixir_lang/parser_definition/list_parsing_test_case/Empty.txt index c2ea7eb56..b2ab5d792 100644 --- a/testData/org/elixir_lang/parser_definition/list_parsing_test_case/Empty.txt +++ b/testData/org/elixir_lang/parser_definition/list_parsing_test_case/Empty.txt @@ -6,14 +6,13 @@ Elixir File(0,42) ElixirListImpl(LIST)(13,15) PsiElement([)('[')(13,14) PsiElement(])(']')(14,15) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(15,38) - PsiElement(\\n, \\r\\n)('\n')(15,16) - PsiElement(\\n, \\r\\n)('\n')(16,17) - PsiComment(#)('# ... with new lines')(17,37) + PsiWhiteSpace('\n\n')(15,17) + PsiComment(#)('# ... with new lines')(17,37) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(37,38) PsiElement(\\n, \\r\\n)('\n')(37,38) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(38,42) ElixirListImpl(LIST)(38,42) PsiElement([)('[')(38,39) PsiElement(\\n, \\r\\n)('\n')(39,40) PsiElement(\\n, \\r\\n)('\n')(40,41) - PsiElement(])(']')(41,42) \ No newline at end of file + PsiElement(])(']')(41,42) diff --git a/testData/org/elixir_lang/parser_definition/list_parsing_test_case/KeywordKey.txt b/testData/org/elixir_lang/parser_definition/list_parsing_test_case/KeywordKey.txt index 7c52aea01..92fb08b55 100644 --- a/testData/org/elixir_lang/parser_definition/list_parsing_test_case/KeywordKey.txt +++ b/testData/org/elixir_lang/parser_definition/list_parsing_test_case/KeywordKey.txt @@ -195,10 +195,9 @@ Elixir File(0,515) PsiElement(()('(')(152,153) PsiElement())(')')(153,154) PsiElement(])(']')(154,155) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(155,181) - PsiElement(\\n, \\r\\n)('\n')(155,156) - PsiElement(\\n, \\r\\n)('\n')(156,157) - PsiComment(#)('# :')(157,180) + PsiWhiteSpace('\n\n')(155,157) + PsiComment(#)('# :')(157,180) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(180,181) PsiElement(\\n, \\r\\n)('\n')(180,181) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(181,189) ElixirListImpl(LIST)(181,189) @@ -453,10 +452,9 @@ Elixir File(0,515) PsiElement(()('(')(330,331) PsiElement())(')')(331,332) PsiElement(])(']')(332,333) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(333,359) - PsiElement(\\n, \\r\\n)('\n')(333,334) - PsiElement(\\n, \\r\\n)('\n')(334,335) - PsiComment(#)('# :')(335,358) + PsiWhiteSpace('\n\n')(333,335) + PsiComment(#)('# :')(335,358) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(358,359) PsiElement(\\n, \\r\\n)('\n')(358,359) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(359,366) ElixirListImpl(LIST)(359,366) @@ -636,7 +634,5 @@ Elixir File(0,515) PsiElement(()('(')(451,452) PsiElement())(')')(452,453) PsiElement(])(']')(453,454) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(454,456) - PsiElement(\\n, \\r\\n)('\n')(454,455) - PsiElement(\\n, \\r\\n)('\n')(455,456) + PsiWhiteSpace('\n\n')(454,456) PsiComment(#)('# comment to given trailing `:` a space')(456,515) diff --git a/testData/org/elixir_lang/parser_definition/list_parsing_test_case/KeywordPair.txt b/testData/org/elixir_lang/parser_definition/list_parsing_test_case/KeywordPair.txt index 222193dcc..bc73fe39a 100644 --- a/testData/org/elixir_lang/parser_definition/list_parsing_test_case/KeywordPair.txt +++ b/testData/org/elixir_lang/parser_definition/list_parsing_test_case/KeywordPair.txt @@ -15,10 +15,9 @@ Elixir File(0,70) PsiElement(()('(')(22,23) PsiElement())(')')(23,24) PsiElement(])(']')(24,25) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(25,62) - PsiElement(\\n, \\r\\n)('\n')(25,26) - PsiElement(\\n, \\r\\n)('\n')(26,27) - PsiComment(#)('# COLON EOL* keywordValue is valid')(27,61) + PsiWhiteSpace('\n\n')(25,27) + PsiComment(#)('# COLON EOL* keywordValue is valid')(27,61) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(61,62) PsiElement(\\n, \\r\\n)('\n')(61,62) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(62,70) ElixirListImpl(LIST)(62,70) @@ -28,9 +27,8 @@ Elixir File(0,70) ElixirKeywordKeyImpl(KEYWORD_KEY)(63,64) PsiElement(identifier)('a')(63,64) PsiElement(Keyword Pair Colon (:))(':')(64,65) - PsiElement(\\n, \\r\\n)('\n')(65,66) - PsiElement(\\n, \\r\\n)('\n')(66,67) + PsiWhiteSpace('\n\n')(65,67) ElixirEmptyParenthesesImpl(EMPTY_PARENTHESES)(67,69) PsiElement(()('(')(67,68) PsiElement())(')')(68,69) - PsiElement(])(']')(69,70) \ No newline at end of file + PsiElement(])(']')(69,70) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/EOLs.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/EOLs.txt index 1d8a4761f..4cd3421ea 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/EOLs.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/EOLs.txt @@ -7,8 +7,7 @@ Elixir File(0,109) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,58) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) UNQUALIFIED_NO_PARENTHESES_MANY_ARGUMENTS_CALL(8,56) ElixirIdentifierImpl(IDENTIFIER)(8,19) PsiElement(identifier)('unqualified')(8,19) @@ -40,8 +39,7 @@ Elixir File(0,109) PsiElement(.)('.')(62,63) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(63,109) PsiElement(()('(')(63,64) - PsiElement(\\n, \\r\\n)('\n')(64,65) - PsiWhiteSpace(' ')(65,67) + PsiWhiteSpace('\n ')(64,67) ElixirKeywordsImpl(KEYWORDS)(67,107) ElixirKeywordPairImpl(KEYWORD_PAIR)(67,85) ElixirKeywordKeyImpl(KEYWORD_KEY)(67,74) @@ -63,4 +61,4 @@ Elixir File(0,109) ElixirIdentifierImpl(IDENTIFIER)(98,107) PsiElement(identifier)('value_two')(98,107) PsiElement(\\n, \\r\\n)('\n')(107,108) - PsiElement())(')')(108,109) \ No newline at end of file + PsiElement())(')')(108,109) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperation.txt index 06b1f5d3f..2792d59c1 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperation.txt @@ -7,8 +7,7 @@ Elixir File(0,36) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,36) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) UNQUALIFIED_NO_PARENTHESES_MANY_ARGUMENTS_CALL(8,34) ElixirIdentifierImpl(IDENTIFIER)(8,11) PsiElement(identifier)('two')(8,11) @@ -28,4 +27,4 @@ Elixir File(0,36) ElixirIdentifierImpl(IDENTIFIER)(29,34) PsiElement(identifier)('value')(29,34) PsiElement(\\n, \\r\\n)('\n')(34,35) - PsiElement())(')')(35,36) \ No newline at end of file + PsiElement())(')')(35,36) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperationAtEnd.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperationAtEnd.txt index 8052c0295..b1fee2326 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperationAtEnd.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperationAtEnd.txt @@ -7,8 +7,7 @@ Elixir File(0,43) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,43) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(8,11) ElixirIdentifierImpl(IDENTIFIER)(8,11) PsiElement(identifier)('one')(8,11) @@ -35,4 +34,4 @@ Elixir File(0,43) ElixirIdentifierImpl(IDENTIFIER)(36,41) PsiElement(identifier)('value')(36,41) PsiElement(\\n, \\r\\n)('\n')(41,42) - PsiElement())(')')(42,43) \ No newline at end of file + PsiElement())(')')(42,43) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperationInMiddle.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperationInMiddle.txt index f886f7ed7..377359de9 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperationInMiddle.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedCallOperationInMiddle.txt @@ -7,8 +7,7 @@ Elixir File(0,52) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,52) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(8,11) ElixirIdentifierImpl(IDENTIFIER)(8,11) PsiElement(identifier)('one')(8,11) @@ -41,4 +40,4 @@ Elixir File(0,52) ElixirIdentifierImpl(IDENTIFIER)(45,50) PsiElement(identifier)('three')(45,50) PsiElement(\\n, \\r\\n)('\n')(50,51) - PsiElement())(')')(51,52) \ No newline at end of file + PsiElement())(')')(51,52) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperation.txt index 32e45343b..8b2caf097 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperation.txt @@ -7,8 +7,7 @@ Elixir File(0,42) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,42) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) UNMATCHED_QUALIFIED_NO_PARENTHESES_CALL(8,40) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(8,11) ElixirAliasImpl(ALIAS)(8,11) @@ -34,4 +33,4 @@ Elixir File(0,42) ElixirIdentifierImpl(IDENTIFIER)(35,40) PsiElement(identifier)('value')(35,40) PsiElement(\\n, \\r\\n)('\n')(40,41) - PsiElement())(')')(41,42) \ No newline at end of file + PsiElement())(')')(41,42) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperationAtEnd.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperationAtEnd.txt index 27ac949ae..bb37140d4 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperationAtEnd.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperationAtEnd.txt @@ -7,8 +7,7 @@ Elixir File(0,47) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,47) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(8,11) ElixirIdentifierImpl(IDENTIFIER)(8,11) PsiElement(identifier)('one')(8,11) @@ -40,4 +39,4 @@ Elixir File(0,47) ElixirIdentifierImpl(IDENTIFIER)(40,45) PsiElement(identifier)('value')(40,45) PsiElement(\\n, \\r\\n)('\n')(45,46) - PsiElement())(')')(46,47) \ No newline at end of file + PsiElement())(')')(46,47) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperationInMiddle.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperationInMiddle.txt index 4fe5cf53c..5a5f1e5e1 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperationInMiddle.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedDotMatchedCallOperationInMiddle.txt @@ -7,8 +7,7 @@ Elixir File(0,56) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,56) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(8,11) ElixirIdentifierImpl(IDENTIFIER)(8,11) PsiElement(identifier)('one')(8,11) @@ -46,4 +45,4 @@ Elixir File(0,56) ElixirIdentifierImpl(IDENTIFIER)(49,54) PsiElement(identifier)('three')(49,54) PsiElement(\\n, \\r\\n)('\n')(54,55) - PsiElement())(')')(55,56) \ No newline at end of file + PsiElement())(')')(55,56) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperation.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperation.txt index 9619cc6e6..67c92aefb 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperation.txt @@ -7,8 +7,7 @@ Elixir File(0,29) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,29) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(8,27) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(8,11) ElixirIdentifierImpl(IDENTIFIER)(8,11) @@ -27,4 +26,4 @@ Elixir File(0,29) ElixirIdentifierImpl(IDENTIFIER)(22,27) PsiElement(identifier)('three')(22,27) PsiElement(\\n, \\r\\n)('\n')(27,28) - PsiElement())(')')(28,29) \ No newline at end of file + PsiElement())(')')(28,29) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperationAtEnd.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperationAtEnd.txt index b20dff89d..5e9e19b92 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperationAtEnd.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperationAtEnd.txt @@ -7,8 +7,7 @@ Elixir File(0,39) PsiElement(.)('.')(5,6) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(6,39) PsiElement(()('(')(6,7) - PsiElement(\\n, \\r\\n)('\n')(7,8) - PsiWhiteSpace(' ')(8,10) + PsiWhiteSpace('\n ')(7,10) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(10,13) ElixirIdentifierImpl(IDENTIFIER)(10,13) PsiElement(identifier)('one')(10,13) @@ -39,4 +38,4 @@ Elixir File(0,39) PsiElement(identifier)('type')(32,36) PsiElement())(')')(36,37) PsiElement(\\n, \\r\\n)('\n')(37,38) - PsiElement())(')')(38,39) \ No newline at end of file + PsiElement())(')')(38,39) diff --git a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperationInMiddle.txt b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperationInMiddle.txt index d3b735860..093ef70a7 100644 --- a/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperationInMiddle.txt +++ b/testData/org/elixir_lang/parser_definition/matched_dot_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperationInMiddle.txt @@ -7,8 +7,7 @@ Elixir File(0,46) PsiElement(.)('.')(5,6) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(6,46) PsiElement(()('(')(6,7) - PsiElement(\\n, \\r\\n)('\n')(7,8) - PsiWhiteSpace(' ')(8,10) + PsiWhiteSpace('\n ')(7,10) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(10,13) ElixirIdentifierImpl(IDENTIFIER)(10,13) PsiElement(identifier)('one')(10,13) @@ -39,4 +38,4 @@ Elixir File(0,46) ElixirIdentifierImpl(IDENTIFIER)(39,44) PsiElement(identifier)('three')(39,44) PsiElement(\\n, \\r\\n)('\n')(44,45) - PsiElement())(')')(45,46) \ No newline at end of file + PsiElement())(')')(45,46) diff --git a/testData/org/elixir_lang/parser_definition/matched_expression_access_expression_parsing_test_case/RegularKeywords.txt b/testData/org/elixir_lang/parser_definition/matched_expression_access_expression_parsing_test_case/RegularKeywords.txt index b020a498d..cab6730a3 100644 --- a/testData/org/elixir_lang/parser_definition/matched_expression_access_expression_parsing_test_case/RegularKeywords.txt +++ b/testData/org/elixir_lang/parser_definition/matched_expression_access_expression_parsing_test_case/RegularKeywords.txt @@ -5,19 +5,17 @@ Elixir File(0,91) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(26,31) ElixirAtomKeywordImpl(ATOM_KEYWORD)(26,31) PsiElement(false)('false')(26,31) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(31,57) - PsiElement(\\n, \\r\\n)('\n')(31,32) - PsiElement(\\n, \\r\\n)('\n')(32,33) - PsiComment(#)('# accessExpression(NIL)')(33,56) + PsiWhiteSpace('\n\n')(31,33) + PsiComment(#)('# accessExpression(NIL)')(33,56) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(56,57) PsiElement(\\n, \\r\\n)('\n')(56,57) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(57,60) ElixirAtomKeywordImpl(ATOM_KEYWORD)(57,60) PsiElement(nil)('nil')(57,60) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(60,87) - PsiElement(\\n, \\r\\n)('\n')(60,61) - PsiElement(\\n, \\r\\n)('\n')(61,62) - PsiComment(#)('# accessExpression(TRUE)')(62,86) + PsiWhiteSpace('\n\n')(60,62) + PsiComment(#)('# accessExpression(TRUE)')(62,86) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(86,87) PsiElement(\\n, \\r\\n)('\n')(86,87) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(87,91) ElixirAtomKeywordImpl(ATOM_KEYWORD)(87,91) - PsiElement(true)('true')(87,91) \ No newline at end of file + PsiElement(true)('true')(87,91) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedDotCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedDotCallOperation.txt index 3da15d675..b463dd5e6 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedDotCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedDotCallOperation.txt @@ -9,8 +9,7 @@ Elixir File(0,39) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,17) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) ElixirUnmatchedQualifiedAliasImpl(UNMATCHED_QUALIFIED_ALIAS)(8,15) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(8,11) ElixirAliasImpl(ALIAS)(8,11) @@ -25,8 +24,7 @@ Elixir File(0,39) PsiElement(.)('.')(17,18) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(18,34) PsiElement(()('(')(18,19) - PsiElement(\\n, \\r\\n)('\n')(19,20) - PsiWhiteSpace(' ')(20,22) + PsiWhiteSpace('\n ')(19,22) ElixirUnmatchedQualifiedAliasImpl(UNMATCHED_QUALIFIED_ALIAS)(22,32) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(22,27) ElixirAliasImpl(ALIAS)(22,27) @@ -40,4 +38,4 @@ Elixir File(0,39) ElixirDotInfixOperatorImpl(DOT_INFIX_OPERATOR)(34,35) PsiElement(.)('.')(34,35) ElixirAliasImpl(ALIAS)(35,39) - PsiElement(Alias)('Five')(35,39) \ No newline at end of file + PsiElement(Alias)('Five')(35,39) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedQualifiedCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedQualifiedCallOperation.txt index ed7374d9b..a24353e09 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedQualifiedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedQualifiedCallOperation.txt @@ -16,8 +16,7 @@ Elixir File(0,334) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(27,57) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(27,43) PsiElement(()('(')(27,28) - PsiElement(\\n, \\r\\n)('\n')(28,29) - PsiWhiteSpace(' ')(29,31) + PsiWhiteSpace('\n ')(28,31) ElixirUnmatchedQualifiedAliasImpl(UNMATCHED_QUALIFIED_ALIAS)(31,41) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(31,36) ElixirAliasImpl(ALIAS)(31,36) @@ -30,8 +29,7 @@ Elixir File(0,334) PsiElement())(')')(42,43) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(43,57) PsiElement(()('(')(43,44) - PsiElement(\\n, \\r\\n)('\n')(44,45) - PsiWhiteSpace(' ')(45,47) + PsiWhiteSpace('\n ')(44,47) ElixirUnmatchedQualifiedAliasImpl(UNMATCHED_QUALIFIED_ALIAS)(47,55) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(47,51) ElixirAliasImpl(ALIAS)(47,51) @@ -164,4 +162,4 @@ Elixir File(0,334) ElixirDotInfixOperatorImpl(DOT_INFIX_OPERATOR)(328,329) PsiElement(.)('.')(328,329) ElixirAliasImpl(ALIAS)(329,334) - PsiElement(Alias)('Value')(329,334) \ No newline at end of file + PsiElement(Alias)('Value')(329,334) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt index 221e375fe..2d1ab8138 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_alias_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt @@ -6,8 +6,7 @@ Elixir File(0,242) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(19,49) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(19,35) PsiElement(()('(')(19,20) - PsiElement(\\n, \\r\\n)('\n')(20,21) - PsiWhiteSpace(' ')(21,23) + PsiWhiteSpace('\n ')(20,23) ElixirUnmatchedQualifiedAliasImpl(UNMATCHED_QUALIFIED_ALIAS)(23,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(23,28) ElixirAliasImpl(ALIAS)(23,28) @@ -20,8 +19,7 @@ Elixir File(0,242) PsiElement())(')')(34,35) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(35,49) PsiElement(()('(')(35,36) - PsiElement(\\n, \\r\\n)('\n')(36,37) - PsiWhiteSpace(' ')(37,39) + PsiWhiteSpace('\n ')(36,39) ElixirUnmatchedQualifiedAliasImpl(UNMATCHED_QUALIFIED_ALIAS)(39,47) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(39,43) ElixirAliasImpl(ALIAS)(39,43) @@ -124,4 +122,4 @@ Elixir File(0,242) ElixirDotInfixOperatorImpl(DOT_INFIX_OPERATOR)(237,238) PsiElement(.)('.')(237,238) ElixirAliasImpl(ALIAS)(238,242) - PsiElement(Alias)('Four')(238,242) \ No newline at end of file + PsiElement(Alias)('Four')(238,242) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Alias.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Alias.txt index e8adb67c3..115c840d1 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Alias.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Alias.txt @@ -10,8 +10,7 @@ Elixir File(0,375) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(25,55) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(25,55) PsiElement(()('(')(25,26) - PsiElement(\\n, \\r\\n)('\n')(26,27) - PsiWhiteSpace(' ')(27,29) + PsiWhiteSpace('\n ')(26,29) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(29,39) ElixirIdentifierImpl(IDENTIFIER)(29,39) PsiElement(identifier)('positional')(29,39) @@ -42,8 +41,7 @@ Elixir File(0,375) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(81,164) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(81,122) PsiElement(()('(')(81,82) - PsiElement(\\n, \\r\\n)('\n')(82,83) - PsiWhiteSpace(' ')(83,85) + PsiWhiteSpace('\n ')(82,85) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(85,100) ElixirIdentifierImpl(IDENTIFIER)(85,100) PsiElement(identifier)('inner_postional')(85,100) @@ -63,8 +61,7 @@ Elixir File(0,375) PsiElement())(')')(121,122) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(122,164) PsiElement(()('(')(122,123) - PsiElement(\\n, \\r\\n)('\n')(123,124) - PsiWhiteSpace(' ')(124,126) + PsiWhiteSpace('\n ')(123,126) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(126,142) ElixirIdentifierImpl(IDENTIFIER)(126,142) PsiElement(identifier)('outer_positional')(126,142) @@ -160,4 +157,4 @@ Elixir File(0,375) PsiWhiteSpace(' ')(369,370) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(370,375) ElixirIdentifierImpl(IDENTIFIER)(370,375) - PsiElement(identifier)('value')(370,375) \ No newline at end of file + PsiElement(identifier)('value')(370,375) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/AtomKeyword.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/AtomKeyword.txt index d65c01bbd..396d74a49 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/AtomKeyword.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/AtomKeyword.txt @@ -10,8 +10,7 @@ Elixir File(0,306) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(25,47) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(25,47) PsiElement(()('(')(25,26) - PsiElement(\\n, \\r\\n)('\n')(26,27) - PsiWhiteSpace(' ')(27,29) + PsiWhiteSpace('\n ')(26,29) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(29,32) ElixirAtomKeywordImpl(ATOM_KEYWORD)(29,32) PsiElement(nil)('nil')(29,32) @@ -42,8 +41,7 @@ Elixir File(0,306) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(71,119) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(71,95) PsiElement(()('(')(71,72) - PsiElement(\\n, \\r\\n)('\n')(72,73) - PsiWhiteSpace(' ')(73,75) + PsiWhiteSpace('\n ')(72,75) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(75,79) ElixirAtomKeywordImpl(ATOM_KEYWORD)(75,79) PsiElement(true)('true')(75,79) @@ -63,8 +61,7 @@ Elixir File(0,306) PsiElement())(')')(94,95) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(95,119) PsiElement(()('(')(95,96) - PsiElement(\\n, \\r\\n)('\n')(96,97) - PsiWhiteSpace(' ')(97,99) + PsiWhiteSpace('\n ')(96,99) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(99,104) ElixirAtomKeywordImpl(ATOM_KEYWORD)(99,104) PsiElement(false)('false')(99,104) @@ -160,4 +157,4 @@ Elixir File(0,306) PsiWhiteSpace(' ')(302,303) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(303,306) ElixirAtomKeywordImpl(ATOM_KEYWORD)(303,306) - PsiElement(nil)('nil')(303,306) \ No newline at end of file + PsiElement(nil)('nil')(303,306) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/BinaryWholeNumber.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/BinaryWholeNumber.txt index c49e45b1d..d4aca028a 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/BinaryWholeNumber.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/BinaryWholeNumber.txt @@ -13,8 +13,7 @@ Elixir File(0,304) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,46) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,46) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,31) ElixirBinaryWholeNumberImpl(BINARY_WHOLE_NUMBER)(27,31) PsiElement(0)('0')(27,28) @@ -54,8 +53,7 @@ Elixir File(0,304) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(70,118) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(70,93) PsiElement(()('(')(70,71) - PsiElement(\\n, \\r\\n)('\n')(71,72) - PsiWhiteSpace(' ')(72,74) + PsiWhiteSpace('\n ')(71,74) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(74,78) ElixirBinaryWholeNumberImpl(BINARY_WHOLE_NUMBER)(74,78) PsiElement(0)('0')(74,75) @@ -81,8 +79,7 @@ Elixir File(0,304) PsiElement())(')')(92,93) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(93,118) PsiElement(()('(')(93,94) - PsiElement(\\n, \\r\\n)('\n')(94,95) - PsiWhiteSpace(' ')(95,97) + PsiWhiteSpace('\n ')(94,97) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(97,102) ElixirBinaryWholeNumberImpl(BINARY_WHOLE_NUMBER)(97,102) PsiElement(0)('0')(97,98) @@ -208,4 +205,4 @@ Elixir File(0,304) PsiElement(0)('0')(300,301) PsiElement(b)('b')(301,302) ElixirBinaryDigitsImpl(BINARY_DIGITS)(302,304) - PsiElement(0-1)('11')(302,304) \ No newline at end of file + PsiElement(0-1)('11')(302,304) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CaptureNumericOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CaptureNumericOperation.txt index f0dfe8ed5..b9b41c295 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CaptureNumericOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CaptureNumericOperation.txt @@ -14,8 +14,7 @@ Elixir File(0,273) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(22,41) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(22,41) PsiElement(()('(')(22,23) - PsiElement(\\n, \\r\\n)('\n')(23,24) - PsiWhiteSpace(' ')(24,26) + PsiWhiteSpace('\n ')(23,26) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(26,28) ElixirCaptureNumericOperationImpl(CAPTURE_NUMERIC_OPERATION)(26,28) ElixirCapturePrefixOperatorImpl(CAPTURE_PREFIX_OPERATOR)(26,27) @@ -58,8 +57,7 @@ Elixir File(0,273) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(64,102) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(64,83) PsiElement(()('(')(64,65) - PsiElement(\\n, \\r\\n)('\n')(65,66) - PsiWhiteSpace(' ')(66,68) + PsiWhiteSpace('\n ')(65,68) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(68,70) ElixirCaptureNumericOperationImpl(CAPTURE_NUMERIC_OPERATION)(68,70) ElixirCapturePrefixOperatorImpl(CAPTURE_PREFIX_OPERATOR)(68,69) @@ -87,8 +85,7 @@ Elixir File(0,273) PsiElement())(')')(82,83) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(83,102) PsiElement(()('(')(83,84) - PsiElement(\\n, \\r\\n)('\n')(84,85) - PsiWhiteSpace(' ')(85,87) + PsiWhiteSpace('\n ')(84,87) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(87,89) ElixirCaptureNumericOperationImpl(CAPTURE_NUMERIC_OPERATION)(87,89) ElixirCapturePrefixOperatorImpl(CAPTURE_PREFIX_OPERATOR)(87,88) @@ -224,4 +221,4 @@ Elixir File(0,273) PsiElement(&)('&')(271,272) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(272,273) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(272,273) - PsiElement(0-9)('3')(272,273) \ No newline at end of file + PsiElement(0-9)('3')(272,273) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharListHeredoc.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharListHeredoc.txt index 3d9eed688..088fc4680 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharListHeredoc.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharListHeredoc.txt @@ -20,8 +20,7 @@ Elixir File(0,801) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(31,88) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(31,88) PsiElement(()('(')(31,32) - PsiElement(\\n, \\r\\n)('\n')(32,33) - PsiWhiteSpace(' ')(33,35) + PsiWhiteSpace('\n ')(32,35) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(35,50) ElixirCharListHeredocImpl(CHAR_LIST_HEREDOC)(35,50) PsiElement(Char List Heredoc Promoter ('''))(''''')(35,38) @@ -82,8 +81,7 @@ Elixir File(0,801) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(120,234) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(120,177) PsiElement(()('(')(120,121) - PsiElement(\\n, \\r\\n)('\n')(121,122) - PsiWhiteSpace(' ')(122,124) + PsiWhiteSpace('\n ')(121,124) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(124,139) ElixirCharListHeredocImpl(CHAR_LIST_HEREDOC)(124,139) PsiElement(Char List Heredoc Promoter ('''))(''''')(124,127) @@ -123,8 +121,7 @@ Elixir File(0,801) PsiElement())(')')(176,177) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(177,234) PsiElement(()('(')(177,178) - PsiElement(\\n, \\r\\n)('\n')(178,179) - PsiWhiteSpace(' ')(179,181) + PsiWhiteSpace('\n ')(178,181) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(181,197) ElixirCharListHeredocImpl(CHAR_LIST_HEREDOC)(181,197) PsiElement(Char List Heredoc Promoter ('''))(''''')(181,184) @@ -320,4 +317,4 @@ Elixir File(0,801) PsiElement(\\n, \\r\\n)('\n')(768,769) ElixirHeredocPrefixImpl(HEREDOC_PREFIX)(769,798) PsiElement(Whitespace at beginning of last line of heredoc before terminator)(' ')(769,798) - PsiElement(Char List Heredoc Terminator ('''))(''''')(798,801) \ No newline at end of file + PsiElement(Char List Heredoc Terminator ('''))(''''')(798,801) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharListLine.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharListLine.txt index 546398d99..27c7967c1 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharListLine.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharListLine.txt @@ -13,8 +13,7 @@ Elixir File(0,337) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(25,52) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(25,52) PsiElement(()('(')(25,26) - PsiElement(\\n, \\r\\n)('\n')(26,27) - PsiWhiteSpace(' ')(27,29) + PsiWhiteSpace('\n ')(26,29) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(29,34) ElixirCharListLineImpl(CHAR_LIST_LINE)(29,34) PsiElement(Char List Promoter ('))(''')(29,30) @@ -54,8 +53,7 @@ Elixir File(0,337) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(78,132) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(78,105) PsiElement(()('(')(78,79) - PsiElement(\\n, \\r\\n)('\n')(79,80) - PsiWhiteSpace(' ')(80,82) + PsiWhiteSpace('\n ')(79,82) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(82,87) ElixirCharListLineImpl(CHAR_LIST_LINE)(82,87) PsiElement(Char List Promoter ('))(''')(82,83) @@ -81,8 +79,7 @@ Elixir File(0,337) PsiElement())(')')(104,105) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(105,132) PsiElement(()('(')(105,106) - PsiElement(\\n, \\r\\n)('\n')(106,107) - PsiWhiteSpace(' ')(107,109) + PsiWhiteSpace('\n ')(106,109) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(109,115) ElixirCharListLineImpl(CHAR_LIST_LINE)(109,115) PsiElement(Char List Promoter ('))(''')(109,110) @@ -208,4 +205,4 @@ Elixir File(0,337) PsiElement(Char List Promoter ('))(''')(330,331) ElixirQuoteCharListBodyImpl(QUOTE_CHAR_LIST_BODY)(331,336) PsiElement(Char List Fragment)('Three')(331,336) - PsiElement(Char List Terminator ('))(''')(336,337) \ No newline at end of file + PsiElement(Char List Terminator ('))(''')(336,337) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharToken.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharToken.txt index a87f0bf64..e404bb78b 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharToken.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/CharToken.txt @@ -11,8 +11,7 @@ Elixir File(0,273) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(22,41) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(22,41) PsiElement(()('(')(22,23) - PsiElement(\\n, \\r\\n)('\n')(23,24) - PsiWhiteSpace(' ')(24,26) + PsiWhiteSpace('\n ')(23,26) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(26,28) ElixirCharTokenImpl(CHAR_TOKEN)(26,28) PsiElement(?)('?')(26,27) @@ -46,8 +45,7 @@ Elixir File(0,273) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(64,102) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(64,83) PsiElement(()('(')(64,65) - PsiElement(\\n, \\r\\n)('\n')(65,66) - PsiWhiteSpace(' ')(66,68) + PsiWhiteSpace('\n ')(65,68) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(68,70) ElixirCharTokenImpl(CHAR_TOKEN)(68,70) PsiElement(?)('?')(68,69) @@ -69,8 +67,7 @@ Elixir File(0,273) PsiElement())(')')(82,83) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(83,102) PsiElement(()('(')(83,84) - PsiElement(\\n, \\r\\n)('\n')(84,85) - PsiWhiteSpace(' ')(85,87) + PsiWhiteSpace('\n ')(84,87) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(87,89) ElixirCharTokenImpl(CHAR_TOKEN)(87,89) PsiElement(?)('?')(87,88) @@ -176,4 +173,4 @@ Elixir File(0,273) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(271,273) ElixirCharTokenImpl(CHAR_TOKEN)(271,273) PsiElement(?)('?')(271,272) - PsiElement(Char List Fragment)('3')(272,273) \ No newline at end of file + PsiElement(Char List Fragment)('3')(272,273) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/DecimalFloat.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/DecimalFloat.txt index bf245fc21..f631b697a 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/DecimalFloat.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/DecimalFloat.txt @@ -25,8 +25,7 @@ Elixir File(0,326) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(26,50) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(26,50) PsiElement(()('(')(26,27) - PsiElement(\\n, \\r\\n)('\n')(27,28) - PsiWhiteSpace(' ')(28,30) + PsiWhiteSpace('\n ')(27,30) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(30,33) ElixirDecimalFloatImpl(DECIMAL_FLOAT)(30,33) ElixirDecimalFloatIntegralImpl(DECIMAL_FLOAT_INTEGRAL)(30,31) @@ -95,8 +94,7 @@ Elixir File(0,326) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(77,124) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,101) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(81,84) ElixirDecimalFloatImpl(DECIMAL_FLOAT)(81,84) ElixirDecimalFloatIntegralImpl(DECIMAL_FLOAT_INTEGRAL)(81,82) @@ -139,8 +137,7 @@ Elixir File(0,326) PsiElement())(')')(100,101) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(101,124) PsiElement(()('(')(101,102) - PsiElement(\\n, \\r\\n)('\n')(102,103) - PsiWhiteSpace(' ')(103,105) + PsiWhiteSpace('\n ')(102,105) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(105,110) ElixirDecimalFloatImpl(DECIMAL_FLOAT)(105,110) ElixirDecimalFloatIntegralImpl(DECIMAL_FLOAT_INTEGRAL)(105,106) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/DecimalWholeNumber.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/DecimalWholeNumber.txt index c048bfd90..37cb7e304 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/DecimalWholeNumber.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/DecimalWholeNumber.txt @@ -11,8 +11,7 @@ Elixir File(0,255) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(21,38) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(21,38) PsiElement(()('(')(21,22) - PsiElement(\\n, \\r\\n)('\n')(22,23) - PsiWhiteSpace(' ')(23,25) + PsiWhiteSpace('\n ')(22,25) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(25,26) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(25,26) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(25,26) @@ -46,8 +45,7 @@ Elixir File(0,255) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(60,94) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(60,77) PsiElement(()('(')(60,61) - PsiElement(\\n, \\r\\n)('\n')(61,62) - PsiWhiteSpace(' ')(62,64) + PsiWhiteSpace('\n ')(61,64) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(64,65) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(64,65) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(64,65) @@ -69,8 +67,7 @@ Elixir File(0,255) PsiElement())(')')(76,77) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,94) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(81,82) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(81,82) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(81,82) @@ -176,4 +173,4 @@ Elixir File(0,255) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(254,255) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(254,255) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(254,255) - PsiElement(0-9)('3')(254,255) \ No newline at end of file + PsiElement(0-9)('3')(254,255) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/EmptyBlock.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/EmptyBlock.txt index 145f74276..03b8974bd 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/EmptyBlock.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/EmptyBlock.txt @@ -12,8 +12,7 @@ Elixir File(0,291) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,44) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,44) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,30) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(27,30) PsiElement(()('(')(27,28) @@ -50,8 +49,7 @@ Elixir File(0,291) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(68,110) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(68,89) PsiElement(()('(')(68,69) - PsiElement(\\n, \\r\\n)('\n')(69,70) - PsiWhiteSpace(' ')(70,72) + PsiWhiteSpace('\n ')(69,72) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(72,75) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(72,75) PsiElement(()('(')(72,73) @@ -75,8 +73,7 @@ Elixir File(0,291) PsiElement())(')')(88,89) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(89,110) PsiElement(()('(')(89,90) - PsiElement(\\n, \\r\\n)('\n')(90,91) - PsiWhiteSpace(' ')(91,93) + PsiWhiteSpace('\n ')(90,93) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(93,96) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(93,96) PsiElement(()('(')(93,94) @@ -192,4 +189,4 @@ Elixir File(0,291) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(288,291) PsiElement(()('(')(288,289) PsiElement(;)(';')(289,290) - PsiElement())(')')(290,291) \ No newline at end of file + PsiElement())(')')(290,291) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/HexadecimalWholeNumber.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/HexadecimalWholeNumber.txt index d1a2b950d..21be7f8f3 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/HexadecimalWholeNumber.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/HexadecimalWholeNumber.txt @@ -13,8 +13,7 @@ Elixir File(0,291) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,44) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,44) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,30) ElixirHexadecimalWholeNumberImpl(HEXADECIMAL_WHOLE_NUMBER)(27,30) PsiElement(0)('0')(27,28) @@ -54,8 +53,7 @@ Elixir File(0,291) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(68,110) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(68,89) PsiElement(()('(')(68,69) - PsiElement(\\n, \\r\\n)('\n')(69,70) - PsiWhiteSpace(' ')(70,72) + PsiWhiteSpace('\n ')(69,72) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(72,75) ElixirHexadecimalWholeNumberImpl(HEXADECIMAL_WHOLE_NUMBER)(72,75) PsiElement(0)('0')(72,73) @@ -81,8 +79,7 @@ Elixir File(0,291) PsiElement())(')')(88,89) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(89,110) PsiElement(()('(')(89,90) - PsiElement(\\n, \\r\\n)('\n')(90,91) - PsiWhiteSpace(' ')(91,93) + PsiWhiteSpace('\n ')(90,93) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(93,96) ElixirHexadecimalWholeNumberImpl(HEXADECIMAL_WHOLE_NUMBER)(93,96) PsiElement(0)('0')(93,94) @@ -208,4 +205,4 @@ Elixir File(0,291) PsiElement(0)('0')(288,289) PsiElement(x)('x')(289,290) ElixirHexadecimalDigitsImpl(HEXADECIMAL_DIGITS)(290,291) - PsiElement(A-F, a-f, 0-9)('3')(290,291) \ No newline at end of file + PsiElement(A-F, a-f, 0-9)('3')(290,291) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/List.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/List.txt index 765602a72..facc93c8b 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/List.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/List.txt @@ -21,8 +21,7 @@ Elixir File(0,381) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(28,59) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(28,59) PsiElement(()('(')(28,29) - PsiElement(\\n, \\r\\n)('\n')(29,30) - PsiWhiteSpace(' ')(30,32) + PsiWhiteSpace('\n ')(29,32) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(32,40) ElixirListImpl(LIST)(32,40) PsiElement([)('[')(32,33) @@ -86,8 +85,7 @@ Elixir File(0,381) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(88,150) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(88,119) PsiElement(()('(')(88,89) - PsiElement(\\n, \\r\\n)('\n')(89,90) - PsiWhiteSpace(' ')(90,92) + PsiWhiteSpace('\n ')(89,92) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(92,100) ElixirListImpl(LIST)(92,100) PsiElement([)('[')(92,93) @@ -129,8 +127,7 @@ Elixir File(0,381) PsiElement())(')')(118,119) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(119,150) PsiElement(()('(')(119,120) - PsiElement(\\n, \\r\\n)('\n')(120,121) - PsiWhiteSpace(' ')(121,123) + PsiWhiteSpace('\n ')(120,123) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(123,131) ElixirListImpl(LIST)(123,131) PsiElement([)('[')(123,124) @@ -336,4 +333,4 @@ Elixir File(0,381) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(379,380) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(379,380) PsiElement(0-9)('3')(379,380) - PsiElement(])(']')(380,381) \ No newline at end of file + PsiElement(])(']')(380,381) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedAdditionOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedAdditionOperation.txt index 99fee0158..47aee247f 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedAdditionOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedAdditionOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,48) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,48) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedAdditionOperationImpl(UNMATCHED_ADDITION_OPERATION)(27,32) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(74,99) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(74,99) PsiElement(()('(')(74,75) - PsiElement(\\n, \\r\\n)('\n')(75,76) - PsiWhiteSpace(' ')(76,78) + PsiWhiteSpace('\n ')(75,78) ElixirUnmatchedAdditionOperationImpl(UNMATCHED_ADDITION_OPERATION)(78,83) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(78,79) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(78,79) @@ -118,8 +116,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(123,173) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(123,148) PsiElement(()('(')(123,124) - PsiElement(\\n, \\r\\n)('\n')(124,125) - PsiWhiteSpace(' ')(125,127) + PsiWhiteSpace('\n ')(124,127) ElixirUnmatchedAdditionOperationImpl(UNMATCHED_ADDITION_OPERATION)(127,132) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(127,128) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(127,128) @@ -159,8 +156,7 @@ Elixir File(0,440) PsiElement())(')')(147,148) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(148,173) PsiElement(()('(')(148,149) - PsiElement(\\n, \\r\\n)('\n')(149,150) - PsiWhiteSpace(' ')(150,152) + PsiWhiteSpace('\n ')(149,152) ElixirUnmatchedAdditionOperationImpl(UNMATCHED_ADDITION_OPERATION)(152,157) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(152,153) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(152,153) @@ -213,8 +209,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(199,249) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(199,224) PsiElement(()('(')(199,200) - PsiElement(\\n, \\r\\n)('\n')(200,201) - PsiWhiteSpace(' ')(201,203) + PsiWhiteSpace('\n ')(200,203) ElixirUnmatchedAdditionOperationImpl(UNMATCHED_ADDITION_OPERATION)(203,208) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(203,204) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(203,204) @@ -254,8 +249,7 @@ Elixir File(0,440) PsiElement())(')')(223,224) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(224,249) PsiElement(()('(')(224,225) - PsiElement(\\n, \\r\\n)('\n')(225,226) - PsiWhiteSpace(' ')(226,228) + PsiWhiteSpace('\n ')(225,228) ElixirUnmatchedAdditionOperationImpl(UNMATCHED_ADDITION_OPERATION)(228,233) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(228,229) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(228,229) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedAndOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedAndOperation.txt index fb0785a43..5db6a6db5 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedAndOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedAndOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,472) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,51) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,51) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedAndOperationImpl(UNMATCHED_AND_OPERATION)(27,34) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,472) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(79,107) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(79,107) PsiElement(()('(')(79,80) - PsiElement(\\n, \\r\\n)('\n')(80,81) - PsiWhiteSpace(' ')(81,83) + PsiWhiteSpace('\n ')(80,83) ElixirUnmatchedAndOperationImpl(UNMATCHED_AND_OPERATION)(83,90) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(83,84) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(83,84) @@ -118,8 +116,7 @@ Elixir File(0,472) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(131,188) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(131,160) PsiElement(()('(')(131,132) - PsiElement(\\n, \\r\\n)('\n')(132,133) - PsiWhiteSpace(' ')(133,135) + PsiWhiteSpace('\n ')(132,135) ElixirUnmatchedAndOperationImpl(UNMATCHED_AND_OPERATION)(135,142) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(135,136) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(135,136) @@ -159,8 +156,7 @@ Elixir File(0,472) PsiElement())(')')(159,160) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(160,188) PsiElement(()('(')(160,161) - PsiElement(\\n, \\r\\n)('\n')(161,162) - PsiWhiteSpace(' ')(162,164) + PsiWhiteSpace('\n ')(161,164) ElixirUnmatchedAndOperationImpl(UNMATCHED_AND_OPERATION)(164,170) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(164,165) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(164,165) @@ -213,8 +209,7 @@ Elixir File(0,472) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(216,273) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(216,244) PsiElement(()('(')(216,217) - PsiElement(\\n, \\r\\n)('\n')(217,218) - PsiWhiteSpace(' ')(218,220) + PsiWhiteSpace('\n ')(217,220) ElixirUnmatchedAndOperationImpl(UNMATCHED_AND_OPERATION)(220,227) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(220,221) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(220,221) @@ -254,8 +249,7 @@ Elixir File(0,472) PsiElement())(')')(243,244) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(244,273) PsiElement(()('(')(244,245) - PsiElement(\\n, \\r\\n)('\n')(245,246) - PsiWhiteSpace(' ')(246,248) + PsiWhiteSpace('\n ')(245,248) ElixirUnmatchedAndOperationImpl(UNMATCHED_AND_OPERATION)(248,255) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(248,249) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(248,249) @@ -421,4 +415,4 @@ Elixir File(0,472) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(471,472) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(471,472) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(471,472) - PsiElement(0-9)('4')(471,472) \ No newline at end of file + PsiElement(0-9)('4')(471,472) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedArrowOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedArrowOperation.txt index a3854f292..166dbe1d4 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedArrowOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedArrowOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,460) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,50) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,50) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedArrowOperationImpl(UNMATCHED_ARROW_OPERATION)(27,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,460) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(77,104) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,104) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) ElixirUnmatchedArrowOperationImpl(UNMATCHED_ARROW_OPERATION)(81,87) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(81,82) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(81,82) @@ -118,8 +116,7 @@ Elixir File(0,460) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(128,182) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(128,155) PsiElement(()('(')(128,129) - PsiElement(\\n, \\r\\n)('\n')(129,130) - PsiWhiteSpace(' ')(130,132) + PsiWhiteSpace('\n ')(129,132) ElixirUnmatchedArrowOperationImpl(UNMATCHED_ARROW_OPERATION)(132,138) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(132,133) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(132,133) @@ -159,8 +156,7 @@ Elixir File(0,460) PsiElement())(')')(154,155) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(155,182) PsiElement(()('(')(155,156) - PsiElement(\\n, \\r\\n)('\n')(156,157) - PsiWhiteSpace(' ')(157,159) + PsiWhiteSpace('\n ')(156,159) ElixirUnmatchedArrowOperationImpl(UNMATCHED_ARROW_OPERATION)(159,165) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(159,160) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(159,160) @@ -213,8 +209,7 @@ Elixir File(0,460) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(210,264) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(210,237) PsiElement(()('(')(210,211) - PsiElement(\\n, \\r\\n)('\n')(211,212) - PsiWhiteSpace(' ')(212,214) + PsiWhiteSpace('\n ')(211,214) ElixirUnmatchedArrowOperationImpl(UNMATCHED_ARROW_OPERATION)(214,220) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(214,215) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(214,215) @@ -254,8 +249,7 @@ Elixir File(0,460) PsiElement())(')')(236,237) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(237,264) PsiElement(()('(')(237,238) - PsiElement(\\n, \\r\\n)('\n')(238,239) - PsiWhiteSpace(' ')(239,241) + PsiWhiteSpace('\n ')(238,241) ElixirUnmatchedArrowOperationImpl(UNMATCHED_ARROW_OPERATION)(241,247) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(241,242) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(241,242) @@ -421,4 +415,4 @@ Elixir File(0,460) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(459,460) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(459,460) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(459,460) - PsiElement(0-9)('4')(459,460) \ No newline at end of file + PsiElement(0-9)('4')(459,460) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedCaptureNonNumericOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedCaptureNonNumericOperation.txt index 50dcf3753..bee6f5a82 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedCaptureNonNumericOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedCaptureNonNumericOperation.txt @@ -13,8 +13,7 @@ Elixir File(0,319) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(24,49) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(24,49) PsiElement(()('(')(24,25) - PsiElement(\\n, \\r\\n)('\n')(25,26) - PsiWhiteSpace(' ')(26,28) + PsiWhiteSpace('\n ')(25,28) ElixirUnmatchedCaptureNonNumericOperationImpl(UNMATCHED_CAPTURE_NON_NUMERIC_OPERATION)(28,32) ElixirCapturePrefixOperatorImpl(CAPTURE_PREFIX_OPERATOR)(28,29) PsiElement(&)('&')(28,29) @@ -54,8 +53,7 @@ Elixir File(0,319) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(74,124) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(74,99) PsiElement(()('(')(74,75) - PsiElement(\\n, \\r\\n)('\n')(75,76) - PsiWhiteSpace(' ')(76,78) + PsiWhiteSpace('\n ')(75,78) ElixirUnmatchedCaptureNonNumericOperationImpl(UNMATCHED_CAPTURE_NON_NUMERIC_OPERATION)(78,82) ElixirCapturePrefixOperatorImpl(CAPTURE_PREFIX_OPERATOR)(78,79) PsiElement(&)('&')(78,79) @@ -81,8 +79,7 @@ Elixir File(0,319) PsiElement())(')')(98,99) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(99,124) PsiElement(()('(')(99,100) - PsiElement(\\n, \\r\\n)('\n')(100,101) - PsiWhiteSpace(' ')(101,103) + PsiWhiteSpace('\n ')(100,103) ElixirUnmatchedCaptureNonNumericOperationImpl(UNMATCHED_CAPTURE_NON_NUMERIC_OPERATION)(103,108) ElixirCapturePrefixOperatorImpl(CAPTURE_PREFIX_OPERATOR)(103,104) PsiElement(&)('&')(103,104) @@ -208,4 +205,4 @@ Elixir File(0,319) PsiElement(&)('&')(313,314) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(314,319) ElixirIdentifierImpl(IDENTIFIER)(314,319) - PsiElement(identifier)('three')(314,319) \ No newline at end of file + PsiElement(identifier)('three')(314,319) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedComparisonOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedComparisonOperation.txt index e7f9380db..c900ae6e0 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedComparisonOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedComparisonOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,50) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,50) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedComparisonOperationImpl(UNMATCHED_COMPARISON_OPERATION)(27,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(77,104) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,104) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) ElixirUnmatchedComparisonOperationImpl(UNMATCHED_COMPARISON_OPERATION)(81,87) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(81,82) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(81,82) @@ -118,8 +116,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(128,182) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(128,155) PsiElement(()('(')(128,129) - PsiElement(\\n, \\r\\n)('\n')(129,130) - PsiWhiteSpace(' ')(130,132) + PsiWhiteSpace('\n ')(129,132) ElixirUnmatchedComparisonOperationImpl(UNMATCHED_COMPARISON_OPERATION)(132,138) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(132,133) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(132,133) @@ -159,8 +156,7 @@ Elixir File(0,459) PsiElement())(')')(154,155) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(155,182) PsiElement(()('(')(155,156) - PsiElement(\\n, \\r\\n)('\n')(156,157) - PsiWhiteSpace(' ')(157,159) + PsiWhiteSpace('\n ')(156,159) ElixirUnmatchedComparisonOperationImpl(UNMATCHED_COMPARISON_OPERATION)(159,165) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(159,160) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(159,160) @@ -213,8 +209,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(209,263) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(209,236) PsiElement(()('(')(209,210) - PsiElement(\\n, \\r\\n)('\n')(210,211) - PsiWhiteSpace(' ')(211,213) + PsiWhiteSpace('\n ')(210,213) ElixirUnmatchedComparisonOperationImpl(UNMATCHED_COMPARISON_OPERATION)(213,219) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(213,214) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(213,214) @@ -254,8 +249,7 @@ Elixir File(0,459) PsiElement())(')')(235,236) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(236,263) PsiElement(()('(')(236,237) - PsiElement(\\n, \\r\\n)('\n')(237,238) - PsiWhiteSpace(' ')(238,240) + PsiWhiteSpace('\n ')(237,240) ElixirUnmatchedComparisonOperationImpl(UNMATCHED_COMPARISON_OPERATION)(240,246) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(240,241) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(240,241) @@ -421,4 +415,4 @@ Elixir File(0,459) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(458,459) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(458,459) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(458,459) - PsiElement(0-9)('4')(458,459) \ No newline at end of file + PsiElement(0-9)('4')(458,459) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedDotCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedDotCallOperation.txt index 7e3e78f34..75616018a 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedDotCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedDotCallOperation.txt @@ -17,8 +17,7 @@ Elixir File(0,358) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(26,55) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(26,55) PsiElement(()('(')(26,27) - PsiElement(\\n, \\r\\n)('\n')(27,28) - PsiWhiteSpace(' ')(28,30) + PsiWhiteSpace('\n ')(27,30) UNMATCHED_DOT_CALL(30,36) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(30,33) ElixirIdentifierImpl(IDENTIFIER)(30,33) @@ -72,8 +71,7 @@ Elixir File(0,358) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(85,143) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(85,114) PsiElement(()('(')(85,86) - PsiElement(\\n, \\r\\n)('\n')(86,87) - PsiWhiteSpace(' ')(87,89) + PsiWhiteSpace('\n ')(86,89) UNMATCHED_DOT_CALL(89,95) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(89,92) ElixirIdentifierImpl(IDENTIFIER)(89,92) @@ -105,8 +103,7 @@ Elixir File(0,358) PsiElement())(')')(113,114) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(114,143) PsiElement(()('(')(114,115) - PsiElement(\\n, \\r\\n)('\n')(115,116) - PsiWhiteSpace(' ')(116,118) + PsiWhiteSpace('\n ')(115,118) UNMATCHED_DOT_CALL(118,125) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(118,122) ElixirIdentifierImpl(IDENTIFIER)(118,122) @@ -262,4 +259,4 @@ Elixir File(0,358) PsiElement(.)('.')(355,356) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(356,358) PsiElement(()('(')(356,357) - PsiElement())(')')(357,358) \ No newline at end of file + PsiElement())(')')(357,358) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedInMatchOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedInMatchOperation.txt index 75f557b27..c321fc1d7 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedInMatchOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedInMatchOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,50) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,50) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedInMatchOperationImpl(UNMATCHED_IN_MATCH_OPERATION)(27,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(77,104) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,104) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) ElixirUnmatchedInMatchOperationImpl(UNMATCHED_IN_MATCH_OPERATION)(81,87) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(81,82) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(81,82) @@ -118,8 +116,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(128,182) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(128,155) PsiElement(()('(')(128,129) - PsiElement(\\n, \\r\\n)('\n')(129,130) - PsiWhiteSpace(' ')(130,132) + PsiWhiteSpace('\n ')(129,132) ElixirUnmatchedInMatchOperationImpl(UNMATCHED_IN_MATCH_OPERATION)(132,138) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(132,133) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(132,133) @@ -159,8 +156,7 @@ Elixir File(0,459) PsiElement())(')')(154,155) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(155,182) PsiElement(()('(')(155,156) - PsiElement(\\n, \\r\\n)('\n')(156,157) - PsiWhiteSpace(' ')(157,159) + PsiWhiteSpace('\n ')(156,159) ElixirUnmatchedInMatchOperationImpl(UNMATCHED_IN_MATCH_OPERATION)(159,165) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(159,160) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(159,160) @@ -213,8 +209,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(209,263) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(209,236) PsiElement(()('(')(209,210) - PsiElement(\\n, \\r\\n)('\n')(210,211) - PsiWhiteSpace(' ')(211,213) + PsiWhiteSpace('\n ')(210,213) ElixirUnmatchedInMatchOperationImpl(UNMATCHED_IN_MATCH_OPERATION)(213,219) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(213,214) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(213,214) @@ -254,8 +249,7 @@ Elixir File(0,459) PsiElement())(')')(235,236) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(236,263) PsiElement(()('(')(236,237) - PsiElement(\\n, \\r\\n)('\n')(237,238) - PsiWhiteSpace(' ')(238,240) + PsiWhiteSpace('\n ')(237,240) ElixirUnmatchedInMatchOperationImpl(UNMATCHED_IN_MATCH_OPERATION)(240,246) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(240,241) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(240,241) @@ -421,4 +415,4 @@ Elixir File(0,459) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(458,459) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(458,459) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(458,459) - PsiElement(0-9)('4')(458,459) \ No newline at end of file + PsiElement(0-9)('4')(458,459) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedInOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedInOperation.txt index e409b6052..de3f25bb4 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedInOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedInOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,50) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,50) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedInOperationImpl(UNMATCHED_IN_OPERATION)(27,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(77,104) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,104) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) ElixirUnmatchedInOperationImpl(UNMATCHED_IN_OPERATION)(81,87) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(81,82) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(81,82) @@ -118,8 +116,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(128,182) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(128,155) PsiElement(()('(')(128,129) - PsiElement(\\n, \\r\\n)('\n')(129,130) - PsiWhiteSpace(' ')(130,132) + PsiWhiteSpace('\n ')(129,132) ElixirUnmatchedInOperationImpl(UNMATCHED_IN_OPERATION)(132,138) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(132,133) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(132,133) @@ -159,8 +156,7 @@ Elixir File(0,459) PsiElement())(')')(154,155) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(155,182) PsiElement(()('(')(155,156) - PsiElement(\\n, \\r\\n)('\n')(156,157) - PsiWhiteSpace(' ')(157,159) + PsiWhiteSpace('\n ')(156,159) ElixirUnmatchedInOperationImpl(UNMATCHED_IN_OPERATION)(159,165) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(159,160) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(159,160) @@ -213,8 +209,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(209,263) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(209,236) PsiElement(()('(')(209,210) - PsiElement(\\n, \\r\\n)('\n')(210,211) - PsiWhiteSpace(' ')(211,213) + PsiWhiteSpace('\n ')(210,213) ElixirUnmatchedInOperationImpl(UNMATCHED_IN_OPERATION)(213,219) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(213,214) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(213,214) @@ -254,8 +249,7 @@ Elixir File(0,459) PsiElement())(')')(235,236) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(236,263) PsiElement(()('(')(236,237) - PsiElement(\\n, \\r\\n)('\n')(237,238) - PsiWhiteSpace(' ')(238,240) + PsiWhiteSpace('\n ')(237,240) ElixirUnmatchedInOperationImpl(UNMATCHED_IN_OPERATION)(240,246) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(240,241) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(240,241) @@ -421,4 +415,4 @@ Elixir File(0,459) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(458,459) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(458,459) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(458,459) - PsiElement(0-9)('4')(458,459) \ No newline at end of file + PsiElement(0-9)('4')(458,459) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedMatchOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedMatchOperation.txt index 72de77785..94f4e8fb2 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedMatchOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedMatchOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,48) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,48) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedMatchOperationImpl(UNMATCHED_MATCH_OPERATION)(27,32) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(74,99) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(74,99) PsiElement(()('(')(74,75) - PsiElement(\\n, \\r\\n)('\n')(75,76) - PsiWhiteSpace(' ')(76,78) + PsiWhiteSpace('\n ')(75,78) ElixirUnmatchedMatchOperationImpl(UNMATCHED_MATCH_OPERATION)(78,83) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(78,79) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(78,79) @@ -118,8 +116,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(123,173) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(123,148) PsiElement(()('(')(123,124) - PsiElement(\\n, \\r\\n)('\n')(124,125) - PsiWhiteSpace(' ')(125,127) + PsiWhiteSpace('\n ')(124,127) ElixirUnmatchedMatchOperationImpl(UNMATCHED_MATCH_OPERATION)(127,132) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(127,128) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(127,128) @@ -159,8 +156,7 @@ Elixir File(0,440) PsiElement())(')')(147,148) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(148,173) PsiElement(()('(')(148,149) - PsiElement(\\n, \\r\\n)('\n')(149,150) - PsiWhiteSpace(' ')(150,152) + PsiWhiteSpace('\n ')(149,152) ElixirUnmatchedMatchOperationImpl(UNMATCHED_MATCH_OPERATION)(152,157) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(152,153) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(152,153) @@ -213,8 +209,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(199,249) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(199,224) PsiElement(()('(')(199,200) - PsiElement(\\n, \\r\\n)('\n')(200,201) - PsiWhiteSpace(' ')(201,203) + PsiWhiteSpace('\n ')(200,203) ElixirUnmatchedMatchOperationImpl(UNMATCHED_MATCH_OPERATION)(203,208) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(203,204) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(203,204) @@ -254,8 +249,7 @@ Elixir File(0,440) PsiElement())(')')(223,224) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(224,249) PsiElement(()('(')(224,225) - PsiElement(\\n, \\r\\n)('\n')(225,226) - PsiWhiteSpace(' ')(226,228) + PsiWhiteSpace('\n ')(225,228) ElixirUnmatchedMatchOperationImpl(UNMATCHED_MATCH_OPERATION)(228,233) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(228,229) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(228,229) @@ -421,4 +415,4 @@ Elixir File(0,440) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(439,440) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(439,440) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(439,440) - PsiElement(0-9)('4')(439,440) \ No newline at end of file + PsiElement(0-9)('4')(439,440) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedMultiplicationOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedMultiplicationOperation.txt index 1012a7bbd..85af37934 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedMultiplicationOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedMultiplicationOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,48) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,48) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedMultiplicationOperationImpl(UNMATCHED_MULTIPLICATION_OPERATION)(27,32) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(74,99) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(74,99) PsiElement(()('(')(74,75) - PsiElement(\\n, \\r\\n)('\n')(75,76) - PsiWhiteSpace(' ')(76,78) + PsiWhiteSpace('\n ')(75,78) ElixirUnmatchedMultiplicationOperationImpl(UNMATCHED_MULTIPLICATION_OPERATION)(78,83) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(78,79) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(78,79) @@ -118,8 +116,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(123,173) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(123,148) PsiElement(()('(')(123,124) - PsiElement(\\n, \\r\\n)('\n')(124,125) - PsiWhiteSpace(' ')(125,127) + PsiWhiteSpace('\n ')(124,127) ElixirUnmatchedMultiplicationOperationImpl(UNMATCHED_MULTIPLICATION_OPERATION)(127,132) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(127,128) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(127,128) @@ -159,8 +156,7 @@ Elixir File(0,440) PsiElement())(')')(147,148) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(148,173) PsiElement(()('(')(148,149) - PsiElement(\\n, \\r\\n)('\n')(149,150) - PsiWhiteSpace(' ')(150,152) + PsiWhiteSpace('\n ')(149,152) ElixirUnmatchedMultiplicationOperationImpl(UNMATCHED_MULTIPLICATION_OPERATION)(152,157) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(152,153) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(152,153) @@ -213,8 +209,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(199,249) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(199,224) PsiElement(()('(')(199,200) - PsiElement(\\n, \\r\\n)('\n')(200,201) - PsiWhiteSpace(' ')(201,203) + PsiWhiteSpace('\n ')(200,203) ElixirUnmatchedMultiplicationOperationImpl(UNMATCHED_MULTIPLICATION_OPERATION)(203,208) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(203,204) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(203,204) @@ -254,8 +249,7 @@ Elixir File(0,440) PsiElement())(')')(223,224) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(224,249) PsiElement(()('(')(224,225) - PsiElement(\\n, \\r\\n)('\n')(225,226) - PsiWhiteSpace(' ')(226,228) + PsiWhiteSpace('\n ')(225,228) ElixirUnmatchedMultiplicationOperationImpl(UNMATCHED_MULTIPLICATION_OPERATION)(228,233) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(228,229) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(228,229) @@ -421,4 +415,4 @@ Elixir File(0,440) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(439,440) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(439,440) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(439,440) - PsiElement(0-9)('4')(439,440) \ No newline at end of file + PsiElement(0-9)('4')(439,440) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedOrOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedOrOperation.txt index e527eeee3..8c00213ac 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedOrOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedOrOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,463) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,50) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,50) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedOrOperationImpl(UNMATCHED_OR_OPERATION)(27,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,463) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(77,105) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,105) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) ElixirUnmatchedOrOperationImpl(UNMATCHED_OR_OPERATION)(81,88) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(81,82) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(81,82) @@ -118,8 +116,7 @@ Elixir File(0,463) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(129,184) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(129,156) PsiElement(()('(')(129,130) - PsiElement(\\n, \\r\\n)('\n')(130,131) - PsiWhiteSpace(' ')(131,133) + PsiWhiteSpace('\n ')(130,133) ElixirUnmatchedOrOperationImpl(UNMATCHED_OR_OPERATION)(133,139) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(133,134) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(133,134) @@ -159,8 +156,7 @@ Elixir File(0,463) PsiElement())(')')(155,156) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(156,184) PsiElement(()('(')(156,157) - PsiElement(\\n, \\r\\n)('\n')(157,158) - PsiWhiteSpace(' ')(158,160) + PsiWhiteSpace('\n ')(157,160) ElixirUnmatchedOrOperationImpl(UNMATCHED_OR_OPERATION)(160,167) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(160,161) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(160,161) @@ -213,8 +209,7 @@ Elixir File(0,463) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(211,266) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(211,238) PsiElement(()('(')(211,212) - PsiElement(\\n, \\r\\n)('\n')(212,213) - PsiWhiteSpace(' ')(213,215) + PsiWhiteSpace('\n ')(212,215) ElixirUnmatchedOrOperationImpl(UNMATCHED_OR_OPERATION)(215,221) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(215,216) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(215,216) @@ -254,8 +249,7 @@ Elixir File(0,463) PsiElement())(')')(237,238) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(238,266) PsiElement(()('(')(238,239) - PsiElement(\\n, \\r\\n)('\n')(239,240) - PsiWhiteSpace(' ')(240,242) + PsiWhiteSpace('\n ')(239,242) ElixirUnmatchedOrOperationImpl(UNMATCHED_OR_OPERATION)(242,249) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(242,243) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(242,243) @@ -421,4 +415,4 @@ Elixir File(0,463) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(462,463) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(462,463) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(462,463) - PsiElement(0-9)('4')(462,463) \ No newline at end of file + PsiElement(0-9)('4')(462,463) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedPipeOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedPipeOperation.txt index 5fd20641e..b0ee15d62 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedPipeOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedPipeOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,48) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,48) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedPipeOperationImpl(UNMATCHED_PIPE_OPERATION)(27,32) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(74,99) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(74,99) PsiElement(()('(')(74,75) - PsiElement(\\n, \\r\\n)('\n')(75,76) - PsiWhiteSpace(' ')(76,78) + PsiWhiteSpace('\n ')(75,78) ElixirUnmatchedPipeOperationImpl(UNMATCHED_PIPE_OPERATION)(78,83) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(78,79) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(78,79) @@ -118,8 +116,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(123,173) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(123,148) PsiElement(()('(')(123,124) - PsiElement(\\n, \\r\\n)('\n')(124,125) - PsiWhiteSpace(' ')(125,127) + PsiWhiteSpace('\n ')(124,127) ElixirUnmatchedPipeOperationImpl(UNMATCHED_PIPE_OPERATION)(127,132) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(127,128) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(127,128) @@ -159,8 +156,7 @@ Elixir File(0,440) PsiElement())(')')(147,148) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(148,173) PsiElement(()('(')(148,149) - PsiElement(\\n, \\r\\n)('\n')(149,150) - PsiWhiteSpace(' ')(150,152) + PsiWhiteSpace('\n ')(149,152) ElixirUnmatchedPipeOperationImpl(UNMATCHED_PIPE_OPERATION)(152,157) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(152,153) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(152,153) @@ -213,8 +209,7 @@ Elixir File(0,440) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(199,249) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(199,224) PsiElement(()('(')(199,200) - PsiElement(\\n, \\r\\n)('\n')(200,201) - PsiWhiteSpace(' ')(201,203) + PsiWhiteSpace('\n ')(200,203) ElixirUnmatchedPipeOperationImpl(UNMATCHED_PIPE_OPERATION)(203,208) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(203,204) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(203,204) @@ -254,8 +249,7 @@ Elixir File(0,440) PsiElement())(')')(223,224) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(224,249) PsiElement(()('(')(224,225) - PsiElement(\\n, \\r\\n)('\n')(225,226) - PsiWhiteSpace(' ')(226,228) + PsiWhiteSpace('\n ')(225,228) ElixirUnmatchedPipeOperationImpl(UNMATCHED_PIPE_OPERATION)(228,233) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(228,229) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(228,229) @@ -421,4 +415,4 @@ Elixir File(0,440) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(439,440) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(439,440) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(439,440) - PsiElement(0-9)('4')(439,440) \ No newline at end of file + PsiElement(0-9)('4')(439,440) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedQualifiedAliasOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedQualifiedAliasOperation.txt index 39a095a31..fe1622bbd 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedQualifiedAliasOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedQualifiedAliasOperation.txt @@ -15,8 +15,7 @@ Elixir File(0,387) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(27,60) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(27,60) PsiElement(()('(')(27,28) - PsiElement(\\n, \\r\\n)('\n')(28,29) - PsiWhiteSpace(' ')(29,31) + PsiWhiteSpace('\n ')(28,31) ElixirUnmatchedQualifiedAliasImpl(UNMATCHED_QUALIFIED_ALIAS)(31,41) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(31,36) ElixirAliasImpl(ALIAS)(31,36) @@ -62,8 +61,7 @@ Elixir File(0,387) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(88,155) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(88,121) PsiElement(()('(')(88,89) - PsiElement(\\n, \\r\\n)('\n')(89,90) - PsiWhiteSpace(' ')(90,92) + PsiWhiteSpace('\n ')(89,92) ElixirUnmatchedQualifiedAliasImpl(UNMATCHED_QUALIFIED_ALIAS)(92,102) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(92,97) ElixirAliasImpl(ALIAS)(92,97) @@ -93,8 +91,7 @@ Elixir File(0,387) PsiElement())(')')(120,121) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(121,155) PsiElement(()('(')(121,122) - PsiElement(\\n, \\r\\n)('\n')(122,123) - PsiWhiteSpace(' ')(123,125) + PsiWhiteSpace('\n ')(122,125) ElixirUnmatchedQualifiedAliasImpl(UNMATCHED_QUALIFIED_ALIAS)(125,136) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(125,130) ElixirAliasImpl(ALIAS)(125,130) @@ -240,4 +237,4 @@ Elixir File(0,387) ElixirDotInfixOperatorImpl(DOT_INFIX_OPERATOR)(383,384) PsiElement(.)('.')(383,384) ElixirAliasImpl(ALIAS)(384,387) - PsiElement(Alias)('Six')(384,387) \ No newline at end of file + PsiElement(Alias)('Six')(384,387) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedQualifiedCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedQualifiedCallOperation.txt index 63f6a6a91..9abee3e91 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedQualifiedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedQualifiedCallOperation.txt @@ -19,8 +19,7 @@ Elixir File(0,697) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(45,112) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(45,112) PsiElement(()('(')(45,46) - PsiElement(\\n, \\r\\n)('\n')(46,47) - PsiWhiteSpace(' ')(47,49) + PsiWhiteSpace('\n ')(46,49) UNMATCHED_QUALIFIED_PARENTHESES_CALL(49,74) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(49,52) ElixirAliasImpl(ALIAS)(49,52) @@ -78,8 +77,7 @@ Elixir File(0,697) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(158,292) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(158,225) PsiElement(()('(')(158,159) - PsiElement(\\n, \\r\\n)('\n')(159,160) - PsiWhiteSpace(' ')(160,162) + PsiWhiteSpace('\n ')(159,162) UNMATCHED_QUALIFIED_PARENTHESES_CALL(162,187) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(162,165) ElixirAliasImpl(ALIAS)(162,165) @@ -117,8 +115,7 @@ Elixir File(0,697) PsiElement())(')')(224,225) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(225,292) PsiElement(()('(')(225,226) - PsiElement(\\n, \\r\\n)('\n')(226,227) - PsiWhiteSpace(' ')(227,229) + PsiWhiteSpace('\n ')(226,229) UNMATCHED_QUALIFIED_PARENTHESES_CALL(229,255) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(229,233) ElixirAliasImpl(ALIAS)(229,233) @@ -304,4 +301,4 @@ Elixir File(0,697) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(695,697) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(695,697) PsiElement(()('(')(695,696) - PsiElement())(')')(696,697) \ No newline at end of file + PsiElement())(')')(696,697) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedRelationalOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedRelationalOperation.txt index a5ef61981..ddc9b2107 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedRelationalOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedRelationalOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,458) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,50) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,50) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedRelationalOperationImpl(UNMATCHED_RELATIONAL_OPERATION)(27,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,458) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(77,104) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,104) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) ElixirUnmatchedRelationalOperationImpl(UNMATCHED_RELATIONAL_OPERATION)(81,87) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(81,82) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(81,82) @@ -118,8 +116,7 @@ Elixir File(0,458) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(128,182) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(128,155) PsiElement(()('(')(128,129) - PsiElement(\\n, \\r\\n)('\n')(129,130) - PsiWhiteSpace(' ')(130,132) + PsiWhiteSpace('\n ')(129,132) ElixirUnmatchedRelationalOperationImpl(UNMATCHED_RELATIONAL_OPERATION)(132,138) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(132,133) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(132,133) @@ -159,8 +156,7 @@ Elixir File(0,458) PsiElement())(')')(154,155) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(155,182) PsiElement(()('(')(155,156) - PsiElement(\\n, \\r\\n)('\n')(156,157) - PsiWhiteSpace(' ')(157,159) + PsiWhiteSpace('\n ')(156,159) ElixirUnmatchedRelationalOperationImpl(UNMATCHED_RELATIONAL_OPERATION)(159,165) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(159,160) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(159,160) @@ -213,8 +209,7 @@ Elixir File(0,458) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(208,262) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(208,235) PsiElement(()('(')(208,209) - PsiElement(\\n, \\r\\n)('\n')(209,210) - PsiWhiteSpace(' ')(210,212) + PsiWhiteSpace('\n ')(209,212) ElixirUnmatchedRelationalOperationImpl(UNMATCHED_RELATIONAL_OPERATION)(212,218) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(212,213) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(212,213) @@ -254,8 +249,7 @@ Elixir File(0,458) PsiElement())(')')(234,235) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(235,262) PsiElement(()('(')(235,236) - PsiElement(\\n, \\r\\n)('\n')(236,237) - PsiWhiteSpace(' ')(237,239) + PsiWhiteSpace('\n ')(236,239) ElixirUnmatchedRelationalOperationImpl(UNMATCHED_RELATIONAL_OPERATION)(239,245) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(239,240) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(239,240) @@ -421,4 +415,4 @@ Elixir File(0,458) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(457,458) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(457,458) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(457,458) - PsiElement(0-9)('4')(457,458) \ No newline at end of file + PsiElement(0-9)('4')(457,458) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedThreeOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedThreeOperation.txt index 7c5c6392d..cde4c3cbd 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedThreeOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedThreeOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,478) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,52) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,52) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedThreeOperationImpl(UNMATCHED_THREE_OPERATION)(27,34) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,478) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(80,109) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(80,109) PsiElement(()('(')(80,81) - PsiElement(\\n, \\r\\n)('\n')(81,82) - PsiWhiteSpace(' ')(82,84) + PsiWhiteSpace('\n ')(81,84) ElixirUnmatchedThreeOperationImpl(UNMATCHED_THREE_OPERATION)(84,91) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(84,85) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(84,85) @@ -118,8 +116,7 @@ Elixir File(0,478) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(133,191) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(133,162) PsiElement(()('(')(133,134) - PsiElement(\\n, \\r\\n)('\n')(134,135) - PsiWhiteSpace(' ')(135,137) + PsiWhiteSpace('\n ')(134,137) ElixirUnmatchedThreeOperationImpl(UNMATCHED_THREE_OPERATION)(137,144) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(137,138) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(137,138) @@ -159,8 +156,7 @@ Elixir File(0,478) PsiElement())(')')(161,162) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(162,191) PsiElement(()('(')(162,163) - PsiElement(\\n, \\r\\n)('\n')(163,164) - PsiWhiteSpace(' ')(164,166) + PsiWhiteSpace('\n ')(163,166) ElixirUnmatchedThreeOperationImpl(UNMATCHED_THREE_OPERATION)(166,173) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(166,167) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(166,167) @@ -213,8 +209,7 @@ Elixir File(0,478) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(219,277) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(219,248) PsiElement(()('(')(219,220) - PsiElement(\\n, \\r\\n)('\n')(220,221) - PsiWhiteSpace(' ')(221,223) + PsiWhiteSpace('\n ')(220,223) ElixirUnmatchedThreeOperationImpl(UNMATCHED_THREE_OPERATION)(223,230) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(223,224) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(223,224) @@ -254,8 +249,7 @@ Elixir File(0,478) PsiElement())(')')(247,248) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(248,277) PsiElement(()('(')(248,249) - PsiElement(\\n, \\r\\n)('\n')(249,250) - PsiWhiteSpace(' ')(250,252) + PsiWhiteSpace('\n ')(249,252) ElixirUnmatchedThreeOperationImpl(UNMATCHED_THREE_OPERATION)(252,259) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(252,253) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(252,253) @@ -421,4 +415,4 @@ Elixir File(0,478) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(477,478) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(477,478) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(477,478) - PsiElement(0-9)('4')(477,478) \ No newline at end of file + PsiElement(0-9)('4')(477,478) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedTwoOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedTwoOperation.txt index 9e019db1d..515a0a571 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedTwoOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedTwoOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,457) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,48) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,48) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedTwoOperationImpl(UNMATCHED_TWO_OPERATION)(27,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -63,8 +62,7 @@ Elixir File(0,457) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(75,102) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(75,102) PsiElement(()('(')(75,76) - PsiElement(\\n, \\r\\n)('\n')(76,77) - PsiWhiteSpace(' ')(77,79) + PsiWhiteSpace('\n ')(76,79) ElixirUnmatchedTwoOperationImpl(UNMATCHED_TWO_OPERATION)(79,85) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(79,80) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(79,80) @@ -116,8 +114,7 @@ Elixir File(0,457) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(126,180) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(126,153) PsiElement(()('(')(126,127) - PsiElement(\\n, \\r\\n)('\n')(127,128) - PsiWhiteSpace(' ')(128,130) + PsiWhiteSpace('\n ')(127,130) ElixirUnmatchedTwoOperationImpl(UNMATCHED_TWO_OPERATION)(130,136) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(130,131) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(130,131) @@ -157,8 +154,7 @@ Elixir File(0,457) PsiElement())(')')(152,153) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(153,180) PsiElement(()('(')(153,154) - PsiElement(\\n, \\r\\n)('\n')(154,155) - PsiWhiteSpace(' ')(155,157) + PsiWhiteSpace('\n ')(154,157) ElixirUnmatchedTwoOperationImpl(UNMATCHED_TWO_OPERATION)(157,163) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(157,158) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(157,158) @@ -211,8 +207,7 @@ Elixir File(0,457) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(207,261) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(207,234) PsiElement(()('(')(207,208) - PsiElement(\\n, \\r\\n)('\n')(208,209) - PsiWhiteSpace(' ')(209,211) + PsiWhiteSpace('\n ')(208,211) ElixirUnmatchedTwoOperationImpl(UNMATCHED_TWO_OPERATION)(211,217) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(211,212) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(211,212) @@ -252,8 +247,7 @@ Elixir File(0,457) PsiElement())(')')(233,234) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(234,261) PsiElement(()('(')(234,235) - PsiElement(\\n, \\r\\n)('\n')(235,236) - PsiWhiteSpace(' ')(236,238) + PsiWhiteSpace('\n ')(235,238) ElixirUnmatchedTwoOperationImpl(UNMATCHED_TWO_OPERATION)(238,244) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(238,239) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(238,239) @@ -419,4 +413,4 @@ Elixir File(0,457) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(456,457) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(456,457) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(456,457) - PsiElement(0-9)('4')(456,457) \ No newline at end of file + PsiElement(0-9)('4')(456,457) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedTypeOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedTypeOperation.txt index 2e6e87661..449113fc9 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedTypeOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedTypeOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,50) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,50) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedTypeOperationImpl(UNMATCHED_TYPE_OPERATION)(27,33) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(77,104) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,104) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) ElixirUnmatchedTypeOperationImpl(UNMATCHED_TYPE_OPERATION)(81,87) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(81,82) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(81,82) @@ -118,8 +116,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(128,182) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(128,155) PsiElement(()('(')(128,129) - PsiElement(\\n, \\r\\n)('\n')(129,130) - PsiWhiteSpace(' ')(130,132) + PsiWhiteSpace('\n ')(129,132) ElixirUnmatchedTypeOperationImpl(UNMATCHED_TYPE_OPERATION)(132,138) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(132,133) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(132,133) @@ -159,8 +156,7 @@ Elixir File(0,459) PsiElement())(')')(154,155) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(155,182) PsiElement(()('(')(155,156) - PsiElement(\\n, \\r\\n)('\n')(156,157) - PsiWhiteSpace(' ')(157,159) + PsiWhiteSpace('\n ')(156,159) ElixirUnmatchedTypeOperationImpl(UNMATCHED_TYPE_OPERATION)(159,165) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(159,160) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(159,160) @@ -213,8 +209,7 @@ Elixir File(0,459) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(209,263) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(209,236) PsiElement(()('(')(209,210) - PsiElement(\\n, \\r\\n)('\n')(210,211) - PsiWhiteSpace(' ')(211,213) + PsiWhiteSpace('\n ')(210,213) ElixirUnmatchedTypeOperationImpl(UNMATCHED_TYPE_OPERATION)(213,219) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(213,214) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(213,214) @@ -254,8 +249,7 @@ Elixir File(0,459) PsiElement())(')')(235,236) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(236,263) PsiElement(()('(')(236,237) - PsiElement(\\n, \\r\\n)('\n')(237,238) - PsiWhiteSpace(' ')(238,240) + PsiWhiteSpace('\n ')(237,240) ElixirUnmatchedTypeOperationImpl(UNMATCHED_TYPE_OPERATION)(240,246) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(240,241) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(240,241) @@ -421,4 +415,4 @@ Elixir File(0,459) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(458,459) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(458,459) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(458,459) - PsiElement(0-9)('4')(458,459) \ No newline at end of file + PsiElement(0-9)('4')(458,459) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt index 59ca674d6..3d5600f73 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedUnqualifiedCallOperation.txt @@ -14,8 +14,7 @@ Elixir File(0,669) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(44,107) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(44,107) PsiElement(()('(')(44,45) - PsiElement(\\n, \\r\\n)('\n')(45,46) - PsiWhiteSpace(' ')(46,48) + PsiWhiteSpace('\n ')(45,48) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(48,72) ElixirIdentifierImpl(IDENTIFIER)(48,70) PsiElement(identifier)('unqualified_identifier')(48,70) @@ -58,8 +57,7 @@ Elixir File(0,669) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(152,278) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(152,215) PsiElement(()('(')(152,153) - PsiElement(\\n, \\r\\n)('\n')(153,154) - PsiWhiteSpace(' ')(154,156) + PsiWhiteSpace('\n ')(153,156) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(156,180) ElixirIdentifierImpl(IDENTIFIER)(156,178) PsiElement(identifier)('unqualified_identifier')(156,178) @@ -87,8 +85,7 @@ Elixir File(0,669) PsiElement())(')')(214,215) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(215,278) PsiElement(()('(')(215,216) - PsiElement(\\n, \\r\\n)('\n')(216,217) - PsiWhiteSpace(' ')(217,219) + PsiWhiteSpace('\n ')(216,219) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(219,243) ElixirIdentifierImpl(IDENTIFIER)(219,241) PsiElement(identifier)('unqualified_identifier')(219,241) @@ -224,4 +221,4 @@ Elixir File(0,669) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(667,669) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(667,669) PsiElement(()('(')(667,668) - PsiElement())(')')(668,669) \ No newline at end of file + PsiElement())(')')(668,669) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperation.txt index b703285bf..2b4bd9b1a 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedWhenNoParenthesesKeywordsOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,466) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,44) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,44) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(27,42) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(27,30) ElixirIdentifierImpl(IDENTIFIER)(27,30) @@ -54,8 +53,7 @@ Elixir File(0,466) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(78,103) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(78,103) PsiElement(()('(')(78,79) - PsiElement(\\n, \\r\\n)('\n')(79,80) - PsiWhiteSpace(' ')(80,82) + PsiWhiteSpace('\n ')(79,82) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(82,101) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(82,87) ElixirIdentifierImpl(IDENTIFIER)(82,87) @@ -90,8 +88,7 @@ Elixir File(0,466) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(127,169) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(127,148) PsiElement(()('(')(127,128) - PsiElement(\\n, \\r\\n)('\n')(128,129) - PsiWhiteSpace(' ')(129,131) + PsiWhiteSpace('\n ')(128,131) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(131,146) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(131,134) ElixirIdentifierImpl(IDENTIFIER)(131,134) @@ -114,8 +111,7 @@ Elixir File(0,466) PsiElement())(')')(147,148) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(148,169) PsiElement(()('(')(148,149) - PsiElement(\\n, \\r\\n)('\n')(149,150) - PsiWhiteSpace(' ')(150,152) + PsiWhiteSpace('\n ')(149,152) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(152,167) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(152,155) ElixirIdentifierImpl(IDENTIFIER)(152,155) @@ -157,8 +153,7 @@ Elixir File(0,466) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(205,251) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(205,228) PsiElement(()('(')(205,206) - PsiElement(\\n, \\r\\n)('\n')(206,207) - PsiWhiteSpace(' ')(207,209) + PsiWhiteSpace('\n ')(206,209) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(209,226) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(209,213) ElixirIdentifierImpl(IDENTIFIER)(209,213) @@ -181,8 +176,7 @@ Elixir File(0,466) PsiElement())(')')(227,228) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(228,251) PsiElement(()('(')(228,229) - PsiElement(\\n, \\r\\n)('\n')(229,230) - PsiWhiteSpace(' ')(230,232) + PsiWhiteSpace('\n ')(229,232) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(232,249) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(232,236) ElixirIdentifierImpl(IDENTIFIER)(232,236) @@ -327,4 +321,4 @@ Elixir File(0,466) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(465,466) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(465,466) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(465,466) - PsiElement(0-9)('2')(465,466) \ No newline at end of file + PsiElement(0-9)('2')(465,466) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedWhenOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedWhenOperation.txt index d4932f171..0277d18f8 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedWhenOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/MatchedWhenOperation.txt @@ -11,8 +11,7 @@ Elixir File(0,497) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,54) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,54) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(27,35) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,28) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(27,28) @@ -65,8 +64,7 @@ Elixir File(0,497) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(83,114) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(83,114) PsiElement(()('(')(83,84) - PsiElement(\\n, \\r\\n)('\n')(84,85) - PsiWhiteSpace(' ')(85,87) + PsiWhiteSpace('\n ')(84,87) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(87,95) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(87,88) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(87,88) @@ -118,8 +116,7 @@ Elixir File(0,497) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(138,200) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(138,169) PsiElement(()('(')(138,139) - PsiElement(\\n, \\r\\n)('\n')(139,140) - PsiWhiteSpace(' ')(140,142) + PsiWhiteSpace('\n ')(139,142) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(142,150) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(142,143) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(142,143) @@ -159,8 +156,7 @@ Elixir File(0,497) PsiElement())(')')(168,169) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(169,200) PsiElement(()('(')(169,170) - PsiElement(\\n, \\r\\n)('\n')(170,171) - PsiWhiteSpace(' ')(171,173) + PsiWhiteSpace('\n ')(170,173) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(173,181) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(173,174) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(173,174) @@ -213,8 +209,7 @@ Elixir File(0,497) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(229,291) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(229,260) PsiElement(()('(')(229,230) - PsiElement(\\n, \\r\\n)('\n')(230,231) - PsiWhiteSpace(' ')(231,233) + PsiWhiteSpace('\n ')(230,233) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(233,241) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(233,234) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(233,234) @@ -254,8 +249,7 @@ Elixir File(0,497) PsiElement())(')')(259,260) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(260,291) PsiElement(()('(')(260,261) - PsiElement(\\n, \\r\\n)('\n')(261,262) - PsiWhiteSpace(' ')(262,264) + PsiWhiteSpace('\n ')(261,264) ElixirUnmatchedWhenOperationImpl(UNMATCHED_WHEN_OPERATION)(264,272) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(264,265) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(264,265) @@ -421,4 +415,4 @@ Elixir File(0,497) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(496,497) ElixirDecimalWholeNumberImpl(DECIMAL_WHOLE_NUMBER)(496,497) ElixirDecimalDigitsImpl(DECIMAL_DIGITS)(496,497) - PsiElement(0-9)('4')(496,497) \ No newline at end of file + PsiElement(0-9)('4')(496,497) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/OctalWholeNumber.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/OctalWholeNumber.txt index fe4b8aee2..25eba0358 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/OctalWholeNumber.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/OctalWholeNumber.txt @@ -13,8 +13,7 @@ Elixir File(0,291) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,44) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,44) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,30) ElixirOctalWholeNumberImpl(OCTAL_WHOLE_NUMBER)(27,30) PsiElement(0)('0')(27,28) @@ -54,8 +53,7 @@ Elixir File(0,291) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(68,110) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(68,89) PsiElement(()('(')(68,69) - PsiElement(\\n, \\r\\n)('\n')(69,70) - PsiWhiteSpace(' ')(70,72) + PsiWhiteSpace('\n ')(69,72) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(72,75) ElixirOctalWholeNumberImpl(OCTAL_WHOLE_NUMBER)(72,75) PsiElement(0)('0')(72,73) @@ -81,8 +79,7 @@ Elixir File(0,291) PsiElement())(')')(88,89) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(89,110) PsiElement(()('(')(89,90) - PsiElement(\\n, \\r\\n)('\n')(90,91) - PsiWhiteSpace(' ')(91,93) + PsiWhiteSpace('\n ')(90,93) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(93,96) ElixirOctalWholeNumberImpl(OCTAL_WHOLE_NUMBER)(93,96) PsiElement(0)('0')(93,94) @@ -208,4 +205,4 @@ Elixir File(0,291) PsiElement(0)('0')(288,289) PsiElement(o)('o')(289,290) ElixirOctalDigitsImpl(OCTAL_DIGITS)(290,291) - PsiElement(0-7)('3')(290,291) \ No newline at end of file + PsiElement(0-7)('3')(290,291) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Sigil.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Sigil.txt index fb6824975..1b5ec0b5c 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Sigil.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Sigil.txt @@ -25,8 +25,7 @@ Elixir File(0,403) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(36,65) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(36,65) PsiElement(()('(')(36,37) - PsiElement(\\n, \\r\\n)('\n')(37,38) - PsiWhiteSpace(' ')(38,40) + PsiWhiteSpace('\n ')(37,40) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(40,47) ElixirInterpolatedCharListSigilLineImpl(INTERPOLATED_CHAR_LIST_SIGIL_LINE)(40,47) PsiElement(~)('~')(40,41) @@ -86,8 +85,7 @@ Elixir File(0,403) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(102,163) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(102,131) PsiElement(()('(')(102,103) - PsiElement(\\n, \\r\\n)('\n')(103,104) - PsiWhiteSpace(' ')(104,106) + PsiWhiteSpace('\n ')(103,106) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(106,113) ElixirInterpolatedCharListSigilLineImpl(INTERPOLATED_CHAR_LIST_SIGIL_LINE)(106,113) PsiElement(~)('~')(106,107) @@ -121,8 +119,7 @@ Elixir File(0,403) PsiElement())(')')(130,131) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(131,163) PsiElement(()('(')(131,132) - PsiElement(\\n, \\r\\n)('\n')(132,133) - PsiWhiteSpace(' ')(133,135) + PsiWhiteSpace('\n ')(132,135) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(135,141) ElixirInterpolatedRegexLineImpl(INTERPOLATED_REGEX_LINE)(135,141) PsiElement(~)('~')(135,136) @@ -312,4 +309,4 @@ Elixir File(0,403) PsiElement(String Fragment)('one')(399,402) PsiElement(String Sigil Terminator ({, [, <, ", /, (, |, '))('/')(402,403) ElixirSigilModifiersImpl(SIGIL_MODIFIERS)(403,403) - \ No newline at end of file + diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/StringHeredoc.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/StringHeredoc.txt index 7d52410a8..9aa57dcb7 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/StringHeredoc.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/StringHeredoc.txt @@ -20,8 +20,7 @@ Elixir File(0,801) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(31,88) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(31,88) PsiElement(()('(')(31,32) - PsiElement(\\n, \\r\\n)('\n')(32,33) - PsiWhiteSpace(' ')(33,35) + PsiWhiteSpace('\n ')(32,35) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(35,50) ElixirStringHeredocImpl(STRING_HEREDOC)(35,50) PsiElement(String Heredoc Promoter ("""))('"""')(35,38) @@ -82,8 +81,7 @@ Elixir File(0,801) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(120,234) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(120,177) PsiElement(()('(')(120,121) - PsiElement(\\n, \\r\\n)('\n')(121,122) - PsiWhiteSpace(' ')(122,124) + PsiWhiteSpace('\n ')(121,124) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(124,139) ElixirStringHeredocImpl(STRING_HEREDOC)(124,139) PsiElement(String Heredoc Promoter ("""))('"""')(124,127) @@ -123,8 +121,7 @@ Elixir File(0,801) PsiElement())(')')(176,177) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(177,234) PsiElement(()('(')(177,178) - PsiElement(\\n, \\r\\n)('\n')(178,179) - PsiWhiteSpace(' ')(179,181) + PsiWhiteSpace('\n ')(178,181) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(181,197) ElixirStringHeredocImpl(STRING_HEREDOC)(181,197) PsiElement(String Heredoc Promoter ("""))('"""')(181,184) @@ -320,4 +317,4 @@ Elixir File(0,801) PsiElement(\\n, \\r\\n)('\n')(768,769) ElixirHeredocPrefixImpl(HEREDOC_PREFIX)(769,798) PsiElement(Whitespace at beginning of last line of heredoc before terminator)(' ')(769,798) - PsiElement(String Heredoc Terminator ("""))('"""')(798,801) \ No newline at end of file + PsiElement(String Heredoc Terminator ("""))('"""')(798,801) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/StringLine.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/StringLine.txt index 1a0998d5b..af1daf503 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/StringLine.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/StringLine.txt @@ -13,8 +13,7 @@ Elixir File(0,337) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(25,52) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(25,52) PsiElement(()('(')(25,26) - PsiElement(\\n, \\r\\n)('\n')(26,27) - PsiWhiteSpace(' ')(27,29) + PsiWhiteSpace('\n ')(26,29) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(29,34) ElixirStringLineImpl(STRING_LINE)(29,34) PsiElement(String Promoter ("))('"')(29,30) @@ -54,8 +53,7 @@ Elixir File(0,337) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(78,132) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(78,105) PsiElement(()('(')(78,79) - PsiElement(\\n, \\r\\n)('\n')(79,80) - PsiWhiteSpace(' ')(80,82) + PsiWhiteSpace('\n ')(79,82) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(82,87) ElixirStringLineImpl(STRING_LINE)(82,87) PsiElement(String Promoter ("))('"')(82,83) @@ -81,8 +79,7 @@ Elixir File(0,337) PsiElement())(')')(104,105) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(105,132) PsiElement(()('(')(105,106) - PsiElement(\\n, \\r\\n)('\n')(106,107) - PsiWhiteSpace(' ')(107,109) + PsiWhiteSpace('\n ')(106,109) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(109,115) ElixirStringLineImpl(STRING_LINE)(109,115) PsiElement(String Promoter ("))('"')(109,110) @@ -208,4 +205,4 @@ Elixir File(0,337) PsiElement(String Promoter ("))('"')(330,331) ElixirQuoteStringBodyImpl(QUOTE_STRING_BODY)(331,336) PsiElement(String Fragment)('Three')(331,336) - PsiElement(String Terminator ("))('"')(336,337) \ No newline at end of file + PsiElement(String Terminator ("))('"')(336,337) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/UnknownBaseWholeNumber.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/UnknownBaseWholeNumber.txt index 625b127ef..ac2d2da8b 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/UnknownBaseWholeNumber.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/UnknownBaseWholeNumber.txt @@ -13,8 +13,7 @@ Elixir File(0,291) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,44) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,44) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(27,30) ElixirUnknownBaseWholeNumberImpl(UNKNOWN_BASE_WHOLE_NUMBER)(27,30) PsiElement(0)('0')(27,28) @@ -54,8 +53,7 @@ Elixir File(0,291) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(68,110) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(68,89) PsiElement(()('(')(68,69) - PsiElement(\\n, \\r\\n)('\n')(69,70) - PsiWhiteSpace(' ')(70,72) + PsiWhiteSpace('\n ')(69,72) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(72,75) ElixirUnknownBaseWholeNumberImpl(UNKNOWN_BASE_WHOLE_NUMBER)(72,75) PsiElement(0)('0')(72,73) @@ -81,8 +79,7 @@ Elixir File(0,291) PsiElement())(')')(88,89) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(89,110) PsiElement(()('(')(89,90) - PsiElement(\\n, \\r\\n)('\n')(90,91) - PsiWhiteSpace(' ')(91,93) + PsiWhiteSpace('\n ')(90,93) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(93,96) ElixirUnknownBaseWholeNumberImpl(UNKNOWN_BASE_WHOLE_NUMBER)(93,96) PsiElement(0)('0')(93,94) @@ -208,4 +205,4 @@ Elixir File(0,291) PsiElement(0)('0')(288,289) PsiElement(A-Z, a, c-n, p-w, z)('z')(289,290) ElixirUnknownBaseDigitsImpl(UNKNOWN_BASE_DIGITS)(290,291) - PsiElement(A-Z, a-z, 0-9)('3')(290,291) \ No newline at end of file + PsiElement(A-Z, a-z, 0-9)('3')(290,291) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Variable.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Variable.txt index 76b937e8e..8d3043662 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Variable.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_call_operation_parsing_test_case/Variable.txt @@ -10,8 +10,7 @@ Elixir File(0,362) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(23,53) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(23,53) PsiElement(()('(')(23,24) - PsiElement(\\n, \\r\\n)('\n')(24,25) - PsiWhiteSpace(' ')(25,27) + PsiWhiteSpace('\n ')(24,27) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(27,37) ElixirIdentifierImpl(IDENTIFIER)(27,37) PsiElement(identifier)('positional')(27,37) @@ -42,8 +41,7 @@ Elixir File(0,362) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(77,161) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(77,119) PsiElement(()('(')(77,78) - PsiElement(\\n, \\r\\n)('\n')(78,79) - PsiWhiteSpace(' ')(79,81) + PsiWhiteSpace('\n ')(78,81) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(81,97) ElixirIdentifierImpl(IDENTIFIER)(81,97) PsiElement(identifier)('inner_positional')(81,97) @@ -63,8 +61,7 @@ Elixir File(0,362) PsiElement())(')')(118,119) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(119,161) PsiElement(()('(')(119,120) - PsiElement(\\n, \\r\\n)('\n')(120,121) - PsiWhiteSpace(' ')(121,123) + PsiWhiteSpace('\n ')(120,123) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(123,139) ElixirIdentifierImpl(IDENTIFIER)(123,139) PsiElement(identifier)('outer_positional')(123,139) @@ -160,4 +157,4 @@ Elixir File(0,362) PsiWhiteSpace(' ')(356,357) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(357,362) ElixirIdentifierImpl(IDENTIFIER)(357,362) - PsiElement(identifier)('value')(357,362) \ No newline at end of file + PsiElement(identifier)('value')(357,362) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedDotCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedDotCallOperation.txt index c54f9be9e..21c3f56c8 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedDotCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedDotCallOperation.txt @@ -9,8 +9,7 @@ Elixir File(0,148) PsiElement(.)('.')(3,4) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(4,16) PsiElement(()('(')(4,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiWhiteSpace(' ')(6,8) + PsiWhiteSpace('\n ')(5,8) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(8,14) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(8,11) ElixirAliasImpl(ALIAS)(8,11) @@ -26,8 +25,7 @@ Elixir File(0,148) PsiElement(.)('.')(16,17) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(17,31) PsiElement(()('(')(17,18) - PsiElement(\\n, \\r\\n)('\n')(18,19) - PsiWhiteSpace(' ')(19,21) + PsiWhiteSpace('\n ')(18,21) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(21,29) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(21,26) ElixirAliasImpl(ALIAS)(21,26) @@ -57,8 +55,7 @@ Elixir File(0,148) PsiElement(.)('.')(39,40) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(40,57) PsiElement(()('(')(40,41) - PsiElement(\\n, \\r\\n)('\n')(41,42) - PsiWhiteSpace(' ')(42,44) + PsiWhiteSpace('\n ')(41,44) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(44,55) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(44,47) ElixirAliasImpl(ALIAS)(44,47) @@ -77,8 +74,7 @@ Elixir File(0,148) PsiElement(.)('.')(57,58) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(58,75) PsiElement(()('(')(58,59) - PsiElement(\\n, \\r\\n)('\n')(59,60) - PsiWhiteSpace(' ')(60,62) + PsiWhiteSpace('\n ')(59,62) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(62,73) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(62,66) ElixirAliasImpl(ALIAS)(62,66) @@ -114,8 +110,7 @@ Elixir File(0,148) PsiElement(.)('.')(86,87) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(87,110) PsiElement(()('(')(87,88) - PsiElement(\\n, \\r\\n)('\n')(88,89) - PsiWhiteSpace(' ')(89,91) + PsiWhiteSpace('\n ')(88,91) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(91,108) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(91,94) ElixirAliasImpl(ALIAS)(91,94) @@ -139,8 +134,7 @@ Elixir File(0,148) PsiElement(.)('.')(110,111) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(111,134) PsiElement(()('(')(111,112) - PsiElement(\\n, \\r\\n)('\n')(112,113) - PsiWhiteSpace(' ')(113,115) + PsiWhiteSpace('\n ')(112,115) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(115,132) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(115,119) ElixirAliasImpl(ALIAS)(115,119) @@ -172,4 +166,4 @@ Elixir File(0,148) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(143,147) ElixirAliasImpl(ALIAS)(143,147) PsiElement(Alias)('Nine')(143,147) - PsiElement(})('}')(147,148) \ No newline at end of file + PsiElement(})('}')(147,148) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedQualifiedCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedQualifiedCallOperation.txt index 710a67dab..219d35f64 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedQualifiedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedQualifiedCallOperation.txt @@ -16,8 +16,7 @@ Elixir File(0,328) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(27,54) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(27,41) PsiElement(()('(')(27,28) - PsiElement(\\n, \\r\\n)('\n')(28,29) - PsiWhiteSpace(' ')(29,31) + PsiWhiteSpace('\n ')(28,31) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(31,39) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(31,36) ElixirAliasImpl(ALIAS)(31,36) @@ -31,8 +30,7 @@ Elixir File(0,328) PsiElement())(')')(40,41) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(41,54) PsiElement(()('(')(41,42) - PsiElement(\\n, \\r\\n)('\n')(42,43) - PsiWhiteSpace(' ')(43,45) + PsiWhiteSpace('\n ')(42,45) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(45,52) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(45,49) ElixirAliasImpl(ALIAS)(45,49) @@ -167,4 +165,4 @@ Elixir File(0,328) ElixirDotInfixOperatorImpl(DOT_INFIX_OPERATOR)(322,323) PsiElement(.)('.')(322,323) ElixirAliasImpl(ALIAS)(323,328) - PsiElement(Alias)('Value')(323,328) \ No newline at end of file + PsiElement(Alias)('Value')(323,328) diff --git a/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedUnqualifiedCallOperation.txt b/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedUnqualifiedCallOperation.txt index 73a5e04a4..5516d4f71 100644 --- a/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedUnqualifiedCallOperation.txt +++ b/testData/org/elixir_lang/parser_definition/matched_qualified_multiple_aliases_parsing_test_case/MatchedUnqualifiedCallOperation.txt @@ -6,8 +6,7 @@ Elixir File(0,257) ElixirMatchedParenthesesArgumentsImpl(MATCHED_PARENTHESES_ARGUMENTS)(19,48) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(19,31) PsiElement(()('(')(19,20) - PsiElement(\\n, \\r\\n)('\n')(20,21) - PsiWhiteSpace(' ')(21,23) + PsiWhiteSpace('\n ')(20,23) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(23,29) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(23,26) ElixirAliasImpl(ALIAS)(23,26) @@ -21,8 +20,7 @@ Elixir File(0,257) PsiElement())(')')(30,31) ElixirParenthesesArgumentsImpl(PARENTHESES_ARGUMENTS)(31,48) PsiElement(()('(')(31,32) - PsiElement(\\n, \\r\\n)('\n')(32,33) - PsiWhiteSpace(' ')(33,35) + PsiWhiteSpace('\n ')(32,35) ElixirUnmatchedQualifiedMultipleAliasesImpl(UNMATCHED_QUALIFIED_MULTIPLE_ALIASES)(35,46) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(35,38) ElixirAliasImpl(ALIAS)(35,38) @@ -157,4 +155,4 @@ Elixir File(0,257) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(251,256) ElixirAliasImpl(ALIAS)(251,256) PsiElement(Alias)('Three')(251,256) - PsiElement(})('}')(256,257) \ No newline at end of file + PsiElement(})('}')(256,257) diff --git a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/KeywordValue.txt b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/KeywordValue.txt index dab0f41b6..12b7f9eef 100644 --- a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/KeywordValue.txt +++ b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/KeywordValue.txt @@ -29,10 +29,9 @@ Elixir File(0,1415) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(87,90) ElixirAtomKeywordImpl(ATOM_KEYWORD)(87,90) PsiElement(nil)('nil')(87,90) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(90,125) - PsiElement(\\n, \\r\\n)('\n')(90,91) - PsiElement(\\n, \\r\\n)('\n')(91,92) - PsiComment(#)('# matchedExpressionWhenOperation')(92,124) + PsiWhiteSpace('\n\n')(90,92) + PsiComment(#)('# matchedExpressionWhenOperation')(92,124) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(124,125) PsiElement(\\n, \\r\\n)('\n')(124,125) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(125,183) ElixirIdentifierImpl(IDENTIFIER)(125,133) @@ -61,10 +60,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(178,183) ElixirIdentifierImpl(IDENTIFIER)(178,183) PsiElement(identifier)('guard')(178,183) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(183,218) - PsiElement(\\n, \\r\\n)('\n')(183,184) - PsiElement(\\n, \\r\\n)('\n')(184,185) - PsiComment(#)('# matchedExpressionTypeOperation')(185,217) + PsiWhiteSpace('\n\n')(183,185) + PsiComment(#)('# matchedExpressionTypeOperation')(185,217) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(217,218) PsiElement(\\n, \\r\\n)('\n')(217,218) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(218,274) ElixirIdentifierImpl(IDENTIFIER)(218,226) @@ -93,10 +91,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(269,274) ElixirIdentifierImpl(IDENTIFIER)(269,274) PsiElement(identifier)('guard')(269,274) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(274,309) - PsiElement(\\n, \\r\\n)('\n')(274,275) - PsiElement(\\n, \\r\\n)('\n')(275,276) - PsiComment(#)('# matchedExpressionPipeOperation')(276,308) + PsiWhiteSpace('\n\n')(274,276) + PsiComment(#)('# matchedExpressionPipeOperation')(276,308) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(308,309) PsiElement(\\n, \\r\\n)('\n')(308,309) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(309,365) ElixirIdentifierImpl(IDENTIFIER)(309,317) @@ -125,10 +122,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(359,365) ElixirIdentifierImpl(IDENTIFIER)(359,365) PsiElement(identifier)('update')(359,365) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(365,401) - PsiElement(\\n, \\r\\n)('\n')(365,366) - PsiElement(\\n, \\r\\n)('\n')(366,367) - PsiComment(#)('# matchedExpressionMatchOperation')(367,400) + PsiWhiteSpace('\n\n')(365,367) + PsiComment(#)('# matchedExpressionMatchOperation')(367,400) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(400,401) PsiElement(\\n, \\r\\n)('\n')(400,401) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(401,462) ElixirIdentifierImpl(IDENTIFIER)(401,409) @@ -157,10 +153,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(451,462) ElixirIdentifierImpl(IDENTIFIER)(451,462) PsiElement(identifier)('match_value')(451,462) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(462,495) - PsiElement(\\n, \\r\\n)('\n')(462,463) - PsiElement(\\n, \\r\\n)('\n')(463,464) - PsiComment(#)('# matchedExpressionOrOperation')(464,494) + PsiWhiteSpace('\n\n')(462,464) + PsiComment(#)('# matchedExpressionOrOperation')(464,494) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(494,495) PsiElement(\\n, \\r\\n)('\n')(494,495) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(495,556) ElixirIdentifierImpl(IDENTIFIER)(495,503) @@ -218,10 +213,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(607,619) ElixirIdentifierImpl(IDENTIFIER)(607,619) PsiElement(identifier)('second_value')(607,619) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(619,653) - PsiElement(\\n, \\r\\n)('\n')(619,620) - PsiElement(\\n, \\r\\n)('\n')(620,621) - PsiComment(#)('# matchedExpressionAndOperation')(621,652) + PsiWhiteSpace('\n\n')(619,621) + PsiComment(#)('# matchedExpressionAndOperation')(621,652) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(652,653) PsiElement(\\n, \\r\\n)('\n')(652,653) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(653,715) ElixirIdentifierImpl(IDENTIFIER)(653,661) @@ -279,10 +273,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(766,778) ElixirIdentifierImpl(IDENTIFIER)(766,778) PsiElement(identifier)('second_value')(766,778) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(778,819) - PsiElement(\\n, \\r\\n)('\n')(778,779) - PsiElement(\\n, \\r\\n)('\n')(779,780) - PsiComment(#)('# matchedExpressionComparisonOperation')(780,818) + PsiWhiteSpace('\n\n')(778,780) + PsiComment(#)('# matchedExpressionComparisonOperation')(780,818) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(818,819) PsiElement(\\n, \\r\\n)('\n')(818,819) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(819,880) ElixirIdentifierImpl(IDENTIFIER)(819,827) @@ -311,10 +304,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(868,880) ElixirIdentifierImpl(IDENTIFIER)(868,880) PsiElement(identifier)('second_value')(868,880) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(880,921) - PsiElement(\\n, \\r\\n)('\n')(880,881) - PsiElement(\\n, \\r\\n)('\n')(881,882) - PsiComment(#)('# matchedExpressionRelationalOperation')(882,920) + PsiWhiteSpace('\n\n')(880,882) + PsiComment(#)('# matchedExpressionRelationalOperation')(882,920) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(920,921) PsiElement(\\n, \\r\\n)('\n')(920,921) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(921,981) ElixirIdentifierImpl(IDENTIFIER)(921,929) @@ -343,10 +335,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(969,981) ElixirIdentifierImpl(IDENTIFIER)(969,981) PsiElement(identifier)('second_value')(969,981) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(981,1017) - PsiElement(\\n, \\r\\n)('\n')(981,982) - PsiElement(\\n, \\r\\n)('\n')(982,983) - PsiComment(#)('# matchedExpressionArrowOperation')(983,1016) + PsiWhiteSpace('\n\n')(981,983) + PsiComment(#)('# matchedExpressionArrowOperation')(983,1016) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(1016,1017) PsiElement(\\n, \\r\\n)('\n')(1016,1017) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(1017,1087) ElixirIdentifierImpl(IDENTIFIER)(1017,1031) @@ -375,10 +366,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(1072,1087) ElixirIdentifierImpl(IDENTIFIER)(1072,1087) PsiElement(identifier)('second_function')(1072,1087) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(1087,1120) - PsiElement(\\n, \\r\\n)('\n')(1087,1088) - PsiElement(\\n, \\r\\n)('\n')(1088,1089) - PsiComment(#)('# matchedExpressionInOperation')(1089,1119) + PsiWhiteSpace('\n\n')(1087,1089) + PsiComment(#)('# matchedExpressionInOperation')(1089,1119) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(1119,1120) PsiElement(\\n, \\r\\n)('\n')(1119,1120) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(1120,1177) ElixirIdentifierImpl(IDENTIFIER)(1120,1128) @@ -407,10 +397,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(1163,1177) ElixirIdentifierImpl(IDENTIFIER)(1163,1177) PsiElement(identifier)('array_or_range')(1163,1177) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(1177,1211) - PsiElement(\\n, \\r\\n)('\n')(1177,1178) - PsiElement(\\n, \\r\\n)('\n')(1178,1179) - PsiComment(#)('# matchedExpressionTwoOperation')(1179,1210) + PsiWhiteSpace('\n\n')(1177,1179) + PsiComment(#)('# matchedExpressionTwoOperation')(1179,1210) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(1210,1211) PsiElement(\\n, \\r\\n)('\n')(1210,1211) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(1211,1270) ElixirIdentifierImpl(IDENTIFIER)(1211,1219) @@ -466,10 +455,9 @@ Elixir File(0,1415) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(1312,1316) ElixirIdentifierImpl(IDENTIFIER)(1312,1316) PsiElement(identifier)('last')(1312,1316) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(1316,1355) - PsiElement(\\n, \\r\\n)('\n')(1316,1317) - PsiElement(\\n, \\r\\n)('\n')(1317,1318) - PsiComment(#)('# matchedExpressionAdditionOperation')(1318,1354) + PsiWhiteSpace('\n\n')(1316,1318) + PsiComment(#)('# matchedExpressionAdditionOperation')(1318,1354) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(1354,1355) PsiElement(\\n, \\r\\n)('\n')(1354,1355) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(1355,1415) ElixirIdentifierImpl(IDENTIFIER)(1355,1363) diff --git a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/KeywordValueEOLComma.txt b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/KeywordValueEOLComma.txt index a10580ce0..f6a98d45f 100644 --- a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/KeywordValueEOLComma.txt +++ b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/KeywordValueEOLComma.txt @@ -22,15 +22,12 @@ Elixir File(0,167) ElixirIdentifierImpl(IDENTIFIER)(94,113) PsiElement(identifier)('first_keyword_value')(94,113) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(113,114) - PsiErrorElement: expected, got ' -'(113,113) - PsiElement(\\n, \\r\\n)('\n')(113,114) PsiWhiteSpace(' ')(114,125) - PsiErrorElement:';', '\\n or \\r\\n' expected, got ','(125,126) + PsiErrorElement:'(', ';', , '\\n, \\r\\n' or identifier expected, got ','(125,126) PsiElement(,)(',')(125,126) PsiWhiteSpace(' ')(126,127) PsiElement(identifier)('second_keyword_key')(127,145) PsiElement(Keyword Pair Colon (:))(':')(145,146) PsiWhiteSpace(' ')(146,147) - PsiElement(identifier)('second_keyword_value')(147,167) \ No newline at end of file + PsiElement(identifier)('second_keyword_value')(147,167) diff --git a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/NoParenthesesExpressionKeywordValue.txt b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/NoParenthesesExpressionKeywordValue.txt index 301c79b5b..b1fa7a668 100644 --- a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/NoParenthesesExpressionKeywordValue.txt +++ b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/NoParenthesesExpressionKeywordValue.txt @@ -1,10 +1,10 @@ Elixir File(0,616) PsiComment(#)('# A noParenthesesExpression can't itself have a noParenthesesExpression as a keyword value according to')(0,103) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(103,237) - PsiElement(\\n, \\r\\n)('\n')(103,104) - PsiComment(#)('# elixir_parser.yrl, but it is allowed so that {@link: org.elixir_lang.inspection.NoParenthesesManyStrict} can mark it')(104,222) - PsiElement(\\n, \\r\\n)('\n')(222,223) - PsiComment(#)('# as an error')(223,236) + PsiWhiteSpace('\n')(103,104) + PsiComment(#)('# elixir_parser.yrl, but it is allowed so that {@link: org.elixir_lang.inspection.NoParenthesesManyStrict} can mark it')(104,222) + PsiWhiteSpace('\n')(222,223) + PsiComment(#)('# as an error')(223,236) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(236,237) PsiElement(\\n, \\r\\n)('\n')(236,237) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(237,616) ElixirIdentifierImpl(IDENTIFIER)(237,251) @@ -15,11 +15,9 @@ Elixir File(0,616) ElixirIdentifierImpl(IDENTIFIER)(252,268) PsiElement(identifier)('first_positional')(252,268) PsiElement(,)(',')(268,269) - PsiElement(\\n, \\r\\n)('\n')(269,270) - PsiWhiteSpace(' ')(270,285) + PsiWhiteSpace('\n ')(269,285) PsiComment(#)('# `second_function second_position, ambiguous_keyword_key: ambigious_keyword_value` is the errant')(285,382) - PsiElement(\\n, \\r\\n)('\n')(382,383) - PsiWhiteSpace(' ')(383,398) + PsiWhiteSpace('\n ')(382,398) PsiComment(#)('# nested noParenthesesExpression, but the actual error will appear on the first `,`.')(398,482) PsiElement(\\n, \\r\\n)('\n')(482,483) PsiWhiteSpace(' ')(483,498) @@ -48,4 +46,4 @@ Elixir File(0,616) PsiWhiteSpace(' ')(592,593) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(593,616) ElixirIdentifierImpl(IDENTIFIER)(593,616) - PsiElement(identifier)('ambiguous_keyword_value')(593,616) \ No newline at end of file + PsiElement(identifier)('ambiguous_keyword_value')(593,616) diff --git a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalEOLComma.txt b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalEOLComma.txt index 2d1848e6e..59df5c19c 100644 --- a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalEOLComma.txt +++ b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalEOLComma.txt @@ -11,15 +11,12 @@ Elixir File(0,132) ElixirIdentifierImpl(IDENTIFIER)(66,80) PsiElement(identifier)('first_argument')(66,80) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(80,81) - PsiErrorElement: expected, got ' -'(80,80) - PsiElement(\\n, \\r\\n)('\n')(80,81) PsiWhiteSpace(' ')(81,92) - PsiErrorElement:';', '\\n or \\r\\n' expected, got ','(92,93) + PsiErrorElement:'(', ';', , '\\n, \\r\\n' or identifier expected, got ','(92,93) PsiElement(,)(',')(92,93) PsiWhiteSpace(' ')(93,94) PsiElement(identifier)('first_keyword_key')(94,111) PsiElement(Keyword Pair Colon (:))(':')(111,112) PsiWhiteSpace(' ')(112,113) - PsiElement(identifier)('first_keyword_value')(113,132) \ No newline at end of file + PsiElement(identifier)('first_keyword_value')(113,132) diff --git a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalOrOperation.txt b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalOrOperation.txt index 811270dd0..006ba2715 100644 --- a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalOrOperation.txt +++ b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalOrOperation.txt @@ -26,8 +26,8 @@ Elixir File(0,158) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(59,78) ElixirIdentifierImpl(IDENTIFIER)(59,78) PsiElement(identifier)('first_keyword_value')(59,78) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(78,80) - PsiElement(\\n, \\r\\n)('\n')(78,79) + PsiWhiteSpace('\n')(78,79) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(79,80) PsiElement(\\n, \\r\\n)('\n')(79,80) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(80,158) ElixirIdentifierImpl(IDENTIFIER)(80,90) @@ -55,4 +55,4 @@ Elixir File(0,158) PsiWhiteSpace(' ')(138,139) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(139,158) ElixirIdentifierImpl(IDENTIFIER)(139,158) - PsiElement(identifier)('first_keyword_value')(139,158) \ No newline at end of file + PsiElement(identifier)('first_keyword_value')(139,158) diff --git a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsEOLComma.txt b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsEOLComma.txt index 816e52760..1d42a843a 100644 --- a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsEOLComma.txt +++ b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsEOLComma.txt @@ -16,15 +16,12 @@ Elixir File(0,144) ElixirIdentifierImpl(IDENTIFIER)(78,93) PsiElement(identifier)('last_positional')(78,93) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(93,94) - PsiErrorElement: expected, got ' -'(93,93) - PsiElement(\\n, \\r\\n)('\n')(93,94) PsiWhiteSpace(' ')(94,105) - PsiErrorElement:';', '\\n or \\r\\n' expected, got ','(105,106) + PsiErrorElement:'(', ';', , '\\n, \\r\\n' or identifier expected, got ','(105,106) PsiElement(,)(',')(105,106) PsiWhiteSpace(' ')(106,107) PsiElement(identifier)('first_keyword_key')(107,124) PsiElement(Keyword Pair Colon (:))(':')(124,125) PsiWhiteSpace(' ')(125,126) - PsiElement(identifier)('second_keyword_key')(126,144) \ No newline at end of file + PsiElement(identifier)('second_keyword_key')(126,144) diff --git a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsWithKeywords.txt b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsWithKeywords.txt index 09ea8fb70..bdc22602a 100644 --- a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsWithKeywords.txt +++ b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsWithKeywords.txt @@ -26,10 +26,9 @@ Elixir File(0,292) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(111,130) ElixirIdentifierImpl(IDENTIFIER)(111,130) PsiElement(identifier)('first_keyword_value')(111,130) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(130,181) - PsiElement(\\n, \\r\\n)('\n')(130,131) - PsiElement(\\n, \\r\\n)('\n')(131,132) - PsiComment(#)('# two positionals, one keyword on separate lines')(132,180) + PsiWhiteSpace('\n\n')(130,132) + PsiComment(#)('# two positionals, one keyword on separate lines')(132,180) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(180,181) PsiElement(\\n, \\r\\n)('\n')(180,181) PsiWhiteSpace(' ')(181,182) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(182,292) @@ -57,4 +56,4 @@ Elixir File(0,292) PsiWhiteSpace(' ')(272,273) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(273,292) ElixirIdentifierImpl(IDENTIFIER)(273,292) - PsiElement(identifier)('first_keyword_value')(273,292) \ No newline at end of file + PsiElement(identifier)('first_keyword_value')(273,292) diff --git a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsWithoutKeywords.txt b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsWithoutKeywords.txt index e00ad93d3..f5506b9ea 100644 --- a/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsWithoutKeywords.txt +++ b/testData/org/elixir_lang/parser_definition/no_parentheses_many_arguments_call_parsing_test_case/PositionalsWithoutKeywords.txt @@ -15,10 +15,9 @@ Elixir File(0,357) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(70,87) ElixirIdentifierImpl(IDENTIFIER)(70,87) PsiElement(identifier)('second_positional')(70,87) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(87,129) - PsiElement(\\n, \\r\\n)('\n')(87,88) - PsiElement(\\n, \\r\\n)('\n')(88,89) - PsiComment(#)('# second positional is emptyParentheses')(89,128) + PsiWhiteSpace('\n\n')(87,89) + PsiComment(#)('# second positional is emptyParentheses')(89,128) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(128,129) PsiElement(\\n, \\r\\n)('\n')(128,129) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(129,160) ElixirIdentifierImpl(IDENTIFIER)(129,139) @@ -33,10 +32,9 @@ Elixir File(0,357) ElixirEmptyParenthesesImpl(EMPTY_PARENTHESES)(158,160) PsiElement(()('(')(158,159) PsiElement())(')')(159,160) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(160,202) - PsiElement(\\n, \\r\\n)('\n')(160,161) - PsiElement(\\n, \\r\\n)('\n')(161,162) - PsiComment(#)('# third positional is matchedExpression')(162,201) + PsiWhiteSpace('\n\n')(160,162) + PsiComment(#)('# third positional is matchedExpression')(162,201) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(201,202) PsiElement(\\n, \\r\\n)('\n')(201,202) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(202,266) ElixirIdentifierImpl(IDENTIFIER)(202,212) @@ -56,10 +54,9 @@ Elixir File(0,357) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(250,266) ElixirIdentifierImpl(IDENTIFIER)(250,266) PsiElement(identifier)('third_positional')(250,266) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(266,307) - PsiElement(\\n, \\r\\n)('\n')(266,267) - PsiElement(\\n, \\r\\n)('\n')(267,268) - PsiComment(#)('# third positional is emptyParentheses')(268,306) + PsiWhiteSpace('\n\n')(266,268) + PsiComment(#)('# third positional is emptyParentheses')(268,306) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(306,307) PsiElement(\\n, \\r\\n)('\n')(306,307) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(307,357) ElixirIdentifierImpl(IDENTIFIER)(307,317) @@ -78,4 +75,4 @@ Elixir File(0,357) PsiWhiteSpace(' ')(354,355) ElixirEmptyParenthesesImpl(EMPTY_PARENTHESES)(355,357) PsiElement(()('(')(355,356) - PsiElement())(')')(356,357) \ No newline at end of file + PsiElement())(')')(356,357) diff --git a/testData/org/elixir_lang/parser_definition/no_parentheses_strict_parsing_test_case/EmptyParentheses.txt b/testData/org/elixir_lang/parser_definition/no_parentheses_strict_parsing_test_case/EmptyParentheses.txt index 8369cc733..7ddbd9db4 100644 --- a/testData/org/elixir_lang/parser_definition/no_parentheses_strict_parsing_test_case/EmptyParentheses.txt +++ b/testData/org/elixir_lang/parser_definition/no_parentheses_strict_parsing_test_case/EmptyParentheses.txt @@ -1,8 +1,8 @@ Elixir File(0,197) PsiComment(#)('# space between function and empty parentheses is a compiler error, but it is allowed so that it can be marked as an')(0,116) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(116,184) - PsiElement(\\n, \\r\\n)('\n')(116,117) - PsiComment(#)('# error by {@link: org.elixir_lang.inspection.NoParenthesesStrict}')(117,183) + PsiWhiteSpace('\n')(116,117) + PsiComment(#)('# error by {@link: org.elixir_lang.inspection.NoParenthesesStrict}')(117,183) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(183,184) PsiElement(\\n, \\r\\n)('\n')(183,184) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(184,197) ElixirIdentifierImpl(IDENTIFIER)(184,194) @@ -12,4 +12,4 @@ Elixir File(0,197) ElixirNoParenthesesStrictImpl(NO_PARENTHESES_STRICT)(195,197) ElixirEmptyParenthesesImpl(EMPTY_PARENTHESES)(195,197) PsiElement(()('(')(195,196) - PsiElement())(')')(196,197) \ No newline at end of file + PsiElement())(')')(196,197) diff --git a/testData/org/elixir_lang/parser_definition/octal_whole_number_parsing_test_case/NoDigits.txt b/testData/org/elixir_lang/parser_definition/octal_whole_number_parsing_test_case/NoDigits.txt index 8bd768bc9..7c451ab79 100644 --- a/testData/org/elixir_lang/parser_definition/octal_whole_number_parsing_test_case/NoDigits.txt +++ b/testData/org/elixir_lang/parser_definition/octal_whole_number_parsing_test_case/NoDigits.txt @@ -9,10 +9,9 @@ Elixir File(0,84) PsiErrorElement:'0-7', A-Z, a-z or 8-9 expected, got ' '(36,36) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(36,70) - PsiElement(\\n, \\r\\n)('\n')(36,37) - PsiElement(\\n, \\r\\n)('\n')(37,38) - PsiComment(#)('# No digits should recover at ;')(38,69) + PsiWhiteSpace('\n\n')(36,38) + PsiComment(#)('# No digits should recover at ;')(38,69) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(69,70) PsiElement(\\n, \\r\\n)('\n')(69,70) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(70,72) ElixirOctalWholeNumberImpl(OCTAL_WHOLE_NUMBER)(70,72) diff --git a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/Block.txt b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/Block.txt index 909286cf1..d771ac3bb 100644 --- a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/Block.txt +++ b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/Block.txt @@ -21,8 +21,7 @@ Elixir File(0,28) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(13,28) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(13,28) PsiElement(()('(')(13,14) - PsiElement(\\n, \\r\\n)('\n')(14,15) - PsiWhiteSpace(' ')(15,17) + PsiWhiteSpace('\n ')(14,17) ElixirStabImpl(STAB)(17,26) ElixirStabBodyImpl(STAB_BODY)(17,26) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(17,20) @@ -35,4 +34,4 @@ Elixir File(0,28) ElixirIdentifierImpl(IDENTIFIER)(23,26) PsiElement(identifier)('two')(23,26) PsiElement(\\n, \\r\\n)('\n')(26,27) - PsiElement())(')')(27,28) \ No newline at end of file + PsiElement())(')')(27,28) diff --git a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/EmptyParenthesesStab.txt b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/EmptyParenthesesStab.txt index 3c7cdb911..9ee2de509 100644 --- a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/EmptyParenthesesStab.txt +++ b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/EmptyParenthesesStab.txt @@ -13,10 +13,9 @@ Elixir File(0,44) PsiElement(->)('->')(4,6) PsiWhiteSpace(' ')(6,7) PsiElement())(')')(7,8) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(8,34) - PsiElement(\\n, \\r\\n)('\n')(8,9) - PsiComment(#)('#(; () -> )')(9,20) - PsiElement(\\n, \\r\\n)('\n')(20,21) - PsiComment(#)('#(; () -> ;)')(21,33) - PsiElement(\\n, \\r\\n)('\n')(33,34) - PsiComment(#)('#(() -> ;)')(34,44) \ No newline at end of file + PsiWhiteSpace('\n')(8,9) + PsiComment(#)('#(; () -> )')(9,20) + PsiWhiteSpace('\n')(20,21) + PsiComment(#)('#(; () -> ;)')(21,33) + PsiWhiteSpace('\n')(33,34) + PsiComment(#)('#(() -> ;)')(34,44) diff --git a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/EndOfExpressionStab.txt b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/EndOfExpressionStab.txt index 000e47a0d..212cf2596 100644 --- a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/EndOfExpressionStab.txt +++ b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/EndOfExpressionStab.txt @@ -2,46 +2,42 @@ Elixir File(0,43) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(0,7) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(0,7) PsiElement(()('(')(0,1) - PsiElement(\\n, \\r\\n)('\n')(1,2) - PsiWhiteSpace(' ')(2,3) - ElixirStabImpl(STAB)(3,6) - ElixirStabOperationImpl(STAB_OPERATION)(3,6) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(3,6) + PsiWhiteSpace('\n ')(1,3) + ElixirStabImpl(STAB)(3,5) + ElixirStabOperationImpl(STAB_OPERATION)(3,5) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(3,5) PsiElement(->)('->')(3,5) - PsiElement(\\n, \\r\\n)('\n')(5,6) + PsiWhiteSpace('\n')(5,6) PsiElement())(')')(6,7) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(7,8) PsiElement(\\n, \\r\\n)('\n')(7,8) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(8,18) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(8,18) PsiElement(()('(')(8,9) - PsiElement(\\n, \\r\\n)('\n')(9,10) - PsiWhiteSpace(' ')(10,11) + PsiWhiteSpace('\n ')(9,11) PsiElement(;)(';')(11,12) PsiElement(\\n, \\r\\n)('\n')(12,13) PsiWhiteSpace(' ')(13,14) - ElixirStabImpl(STAB)(14,17) - ElixirStabOperationImpl(STAB_OPERATION)(14,17) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(14,17) + ElixirStabImpl(STAB)(14,16) + ElixirStabOperationImpl(STAB_OPERATION)(14,16) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(14,16) PsiElement(->)('->')(14,16) - PsiElement(\\n, \\r\\n)('\n')(16,17) + PsiWhiteSpace('\n')(16,17) PsiElement())(')')(17,18) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(18,19) PsiElement(\\n, \\r\\n)('\n')(18,19) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(19,32) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(19,32) PsiElement(()('(')(19,20) - PsiElement(\\n, \\r\\n)('\n')(20,21) - PsiWhiteSpace(' ')(21,22) + PsiWhiteSpace('\n ')(20,22) PsiElement(;)(';')(22,23) PsiElement(\\n, \\r\\n)('\n')(23,24) PsiWhiteSpace(' ')(24,25) - ElixirStabImpl(STAB)(25,28) - ElixirStabOperationImpl(STAB_OPERATION)(25,28) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(25,28) + ElixirStabImpl(STAB)(25,27) + ElixirStabOperationImpl(STAB_OPERATION)(25,27) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(25,27) PsiElement(->)('->')(25,27) - PsiElement(\\n, \\r\\n)('\n')(27,28) - PsiWhiteSpace(' ')(28,29) + PsiWhiteSpace('\n ')(27,29) PsiElement(;)(';')(29,30) PsiElement(\\n, \\r\\n)('\n')(30,31) PsiElement())(')')(31,32) @@ -50,14 +46,12 @@ Elixir File(0,43) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(33,43) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(33,43) PsiElement(()('(')(33,34) - PsiElement(\\n, \\r\\n)('\n')(34,35) - PsiWhiteSpace(' ')(35,36) - ElixirStabImpl(STAB)(36,39) - ElixirStabOperationImpl(STAB_OPERATION)(36,39) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(36,39) + PsiWhiteSpace('\n ')(34,36) + ElixirStabImpl(STAB)(36,38) + ElixirStabOperationImpl(STAB_OPERATION)(36,38) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(36,38) PsiElement(->)('->')(36,38) - PsiElement(\\n, \\r\\n)('\n')(38,39) - PsiWhiteSpace(' ')(39,40) + PsiWhiteSpace('\n ')(38,40) PsiElement(;)(';')(40,41) PsiElement(\\n, \\r\\n)('\n')(41,42) - PsiElement())(')')(42,43) \ No newline at end of file + PsiElement())(')')(42,43) diff --git a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/Expression.txt b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/Expression.txt index 08b17e8f0..ff48174b0 100644 --- a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/Expression.txt +++ b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/Expression.txt @@ -1,68 +1,68 @@ Elixir File(0,785) PsiComment(#)('#(())')(0,5) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(5,624) - PsiElement(\\n, \\r\\n)('\n')(5,6) - PsiComment(#)('#( function positional, key: value )')(6,42) - PsiElement(\\n, \\r\\n)('\n')(42,43) - PsiComment(#)('#( &one )')(43,52) - PsiElement(\\n, \\r\\n)('\n')(52,53) - PsiComment(#)('#( one \\ default )')(53,72) - PsiElement(\\n, \\r\\n)('\n')(72,73) - PsiComment(#)('#( one when key: value )')(73,97) - PsiElement(\\n, \\r\\n)('\n')(97,98) - PsiComment(#)('#( one when guard )')(98,117) - PsiElement(\\n, \\r\\n)('\n')(117,118) - PsiComment(#)('#( one :: type )')(118,134) - PsiElement(\\n, \\r\\n)('\n')(134,135) - PsiComment(#)('#( one | two )')(135,149) - PsiElement(\\n, \\r\\n)('\n')(149,150) - PsiComment(#)('#( one = two )')(150,164) - PsiElement(\\n, \\r\\n)('\n')(164,165) - PsiComment(#)('#( one || two )')(165,180) - PsiElement(\\n, \\r\\n)('\n')(180,181) - PsiComment(#)('#( one && two )')(181,196) - PsiElement(\\n, \\r\\n)('\n')(196,197) - PsiComment(#)('#( one != two )')(197,212) - PsiElement(\\n, \\r\\n)('\n')(212,213) - PsiComment(#)('#( one < two )')(213,227) - PsiElement(\\n, \\r\\n)('\n')(227,228) - PsiComment(#)('#( one + two )')(228,242) - PsiElement(\\n, \\r\\n)('\n')(242,243) - PsiComment(#)('#( one * two )')(243,257) - PsiElement(\\n, \\r\\n)('\n')(257,258) - PsiComment(#)('#( one ^^^ two )')(258,274) - PsiElement(\\n, \\r\\n)('\n')(274,275) - PsiComment(#)('#( not one )')(275,287) - PsiElement(\\n, \\r\\n)('\n')(287,288) - PsiComment(#)('#( Module.function positional, key: value )')(288,331) - PsiElement(\\n, \\r\\n)('\n')(331,332) - PsiComment(#)('#( @function positional, key: value )')(332,369) - PsiElement(\\n, \\r\\n)('\n')(369,370) - PsiComment(#)('#( function positional, key: value )')(370,406) - PsiElement(\\n, \\r\\n)('\n')(406,407) - PsiComment(#)('#( One.Two[key] )')(407,424) - PsiElement(\\n, \\r\\n)('\n')(424,425) - PsiComment(#)('#( Module.function[key] )')(425,450) - PsiElement(\\n, \\r\\n)('\n')(450,451) - PsiComment(#)('#( Module.function() )')(451,473) - PsiElement(\\n, \\r\\n)('\n')(473,474) - PsiComment(#)('#( Module.function )')(474,494) - PsiElement(\\n, \\r\\n)('\n')(494,495) - PsiComment(#)('#( @variable[key] )')(495,514) - PsiElement(\\n, \\r\\n)('\n')(514,515) - PsiComment(#)('#( @variable )')(515,529) - PsiElement(\\n, \\r\\n)('\n')(529,530) - PsiComment(#)('#( function positional, key: value )')(530,566) - PsiElement(\\n, \\r\\n)('\n')(566,567) - PsiComment(#)('#( variable[key] )')(567,585) - PsiElement(\\n, \\r\\n)('\n')(585,586) - PsiComment(#)('#( variable )')(586,599) - PsiElement(\\n, \\r\\n)('\n')(599,600) - PsiComment(#)('#( @1 )')(600,607) - PsiElement(\\n, \\r\\n)('\n')(607,608) - PsiComment(#)('#( &1 )')(608,615) - PsiElement(\\n, \\r\\n)('\n')(615,616) - PsiComment(#)('#( !1 )')(616,623) + PsiWhiteSpace('\n')(5,6) + PsiComment(#)('#( function positional, key: value )')(6,42) + PsiWhiteSpace('\n')(42,43) + PsiComment(#)('#( &one )')(43,52) + PsiWhiteSpace('\n')(52,53) + PsiComment(#)('#( one \\ default )')(53,72) + PsiWhiteSpace('\n')(72,73) + PsiComment(#)('#( one when key: value )')(73,97) + PsiWhiteSpace('\n')(97,98) + PsiComment(#)('#( one when guard )')(98,117) + PsiWhiteSpace('\n')(117,118) + PsiComment(#)('#( one :: type )')(118,134) + PsiWhiteSpace('\n')(134,135) + PsiComment(#)('#( one | two )')(135,149) + PsiWhiteSpace('\n')(149,150) + PsiComment(#)('#( one = two )')(150,164) + PsiWhiteSpace('\n')(164,165) + PsiComment(#)('#( one || two )')(165,180) + PsiWhiteSpace('\n')(180,181) + PsiComment(#)('#( one && two )')(181,196) + PsiWhiteSpace('\n')(196,197) + PsiComment(#)('#( one != two )')(197,212) + PsiWhiteSpace('\n')(212,213) + PsiComment(#)('#( one < two )')(213,227) + PsiWhiteSpace('\n')(227,228) + PsiComment(#)('#( one + two )')(228,242) + PsiWhiteSpace('\n')(242,243) + PsiComment(#)('#( one * two )')(243,257) + PsiWhiteSpace('\n')(257,258) + PsiComment(#)('#( one ^^^ two )')(258,274) + PsiWhiteSpace('\n')(274,275) + PsiComment(#)('#( not one )')(275,287) + PsiWhiteSpace('\n')(287,288) + PsiComment(#)('#( Module.function positional, key: value )')(288,331) + PsiWhiteSpace('\n')(331,332) + PsiComment(#)('#( @function positional, key: value )')(332,369) + PsiWhiteSpace('\n')(369,370) + PsiComment(#)('#( function positional, key: value )')(370,406) + PsiWhiteSpace('\n')(406,407) + PsiComment(#)('#( One.Two[key] )')(407,424) + PsiWhiteSpace('\n')(424,425) + PsiComment(#)('#( Module.function[key] )')(425,450) + PsiWhiteSpace('\n')(450,451) + PsiComment(#)('#( Module.function() )')(451,473) + PsiWhiteSpace('\n')(473,474) + PsiComment(#)('#( Module.function )')(474,494) + PsiWhiteSpace('\n')(494,495) + PsiComment(#)('#( @variable[key] )')(495,514) + PsiWhiteSpace('\n')(514,515) + PsiComment(#)('#( @variable )')(515,529) + PsiWhiteSpace('\n')(529,530) + PsiComment(#)('#( function positional, key: value )')(530,566) + PsiWhiteSpace('\n')(566,567) + PsiComment(#)('#( variable[key] )')(567,585) + PsiWhiteSpace('\n')(585,586) + PsiComment(#)('#( variable )')(586,599) + PsiWhiteSpace('\n')(599,600) + PsiComment(#)('#( @1 )')(600,607) + PsiWhiteSpace('\n')(607,608) + PsiComment(#)('#( &1 )')(608,615) + PsiWhiteSpace('\n')(615,616) + PsiComment(#)('#( !1 )')(616,623) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(623,624) PsiElement(\\n, \\r\\n)('\n')(623,624) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(624,637) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(624,637) @@ -82,34 +82,33 @@ Elixir File(0,785) PsiElement(end)('end')(632,635) PsiWhiteSpace(' ')(635,636) PsiElement())(')')(636,637) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(637,775) - PsiElement(\\n, \\r\\n)('\n')(637,638) - PsiComment(#)('#( (;) )')(638,646) - PsiElement(\\n, \\r\\n)('\n')(646,647) - PsiComment(#)('#( 1 )')(647,653) - PsiElement(\\n, \\r\\n)('\n')(653,654) - PsiComment(#)('#( [] )')(654,661) - PsiElement(\\n, \\r\\n)('\n')(661,662) - PsiComment(#)('#( "one" )')(662,672) - PsiElement(\\n, \\r\\n)('\n')(672,673) - PsiComment(#)('#( """')(673,679) - PsiElement(\\n, \\r\\n)('\n')(679,680) - PsiComment(#)('# one')(680,686) - PsiElement(\\n, \\r\\n)('\n')(686,687) - PsiComment(#)('# """ )')(687,695) - PsiElement(\\n, \\r\\n)('\n')(695,696) - PsiComment(#)('#( 'one' )')(696,706) - PsiElement(\\n, \\r\\n)('\n')(706,707) - PsiComment(#)('#( '''')(707,713) - PsiElement(\\n, \\r\\n)('\n')(713,714) - PsiComment(#)('# one')(714,720) - PsiElement(\\n, \\r\\n)('\n')(720,721) - PsiComment(#)('# ''' )')(721,729) - PsiElement(\\n, \\r\\n)('\n')(729,730) - PsiComment(#)('#( ~x{sigil}modifiers )')(730,753) - PsiElement(\\n, \\r\\n)('\n')(753,754) - PsiComment(#)('#( true )')(754,763) - PsiElement(\\n, \\r\\n)('\n')(763,764) - PsiComment(#)('#( :atom )')(764,774) - PsiElement(\\n, \\r\\n)('\n')(774,775) - PsiComment(#)('#( Alias )')(775,785) \ No newline at end of file + PsiWhiteSpace('\n')(637,638) + PsiComment(#)('#( (;) )')(638,646) + PsiWhiteSpace('\n')(646,647) + PsiComment(#)('#( 1 )')(647,653) + PsiWhiteSpace('\n')(653,654) + PsiComment(#)('#( [] )')(654,661) + PsiWhiteSpace('\n')(661,662) + PsiComment(#)('#( "one" )')(662,672) + PsiWhiteSpace('\n')(672,673) + PsiComment(#)('#( """')(673,679) + PsiWhiteSpace('\n')(679,680) + PsiComment(#)('# one')(680,686) + PsiWhiteSpace('\n')(686,687) + PsiComment(#)('# """ )')(687,695) + PsiWhiteSpace('\n')(695,696) + PsiComment(#)('#( 'one' )')(696,706) + PsiWhiteSpace('\n')(706,707) + PsiComment(#)('#( '''')(707,713) + PsiWhiteSpace('\n')(713,714) + PsiComment(#)('# one')(714,720) + PsiWhiteSpace('\n')(720,721) + PsiComment(#)('# ''' )')(721,729) + PsiWhiteSpace('\n')(729,730) + PsiComment(#)('#( ~x{sigil}modifiers )')(730,753) + PsiWhiteSpace('\n')(753,754) + PsiComment(#)('#( true )')(754,763) + PsiWhiteSpace('\n')(763,764) + PsiComment(#)('#( :atom )')(764,774) + PsiWhiteSpace('\n')(774,775) + PsiComment(#)('#( Alias )')(775,785) diff --git a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/MultiStab.txt b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/MultiStab.txt index 6faac1850..3b9ebb9a2 100644 --- a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/MultiStab.txt +++ b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/MultiStab.txt @@ -2,8 +2,7 @@ Elixir File(0,69) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(0,69) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(0,69) PsiElement(()('(')(0,1) - PsiElement(\\n, \\r\\n)('\n')(1,2) - PsiWhiteSpace(' ')(2,4) + PsiWhiteSpace('\n ')(1,4) ElixirStabImpl(STAB)(4,67) ElixirStabOperationImpl(STAB_OPERATION)(4,34) ElixirStabNoParenthesesSignatureImpl(STAB_NO_PARENTHESES_SIGNATURE)(4,22) @@ -55,4 +54,4 @@ Elixir File(0,69) ElixirIdentifierImpl(IDENTIFIER)(59,67) PsiElement(identifier)('body_two')(59,67) PsiElement(\\n, \\r\\n)('\n')(67,68) - PsiElement())(')')(68,69) \ No newline at end of file + PsiElement())(')')(68,69) diff --git a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/ParentheticalStabInNoParenthesesStabSignature.txt b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/ParentheticalStabInNoParenthesesStabSignature.txt index 5ad7d7d80..b08fd4368 100644 --- a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/ParentheticalStabInNoParenthesesStabSignature.txt +++ b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/ParentheticalStabInNoParenthesesStabSignature.txt @@ -2,8 +2,7 @@ Elixir File(0,110) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(0,55) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(0,55) PsiElement(()('(')(0,1) - PsiElement(\\n, \\r\\n)('\n')(1,2) - PsiWhiteSpace(' ')(2,4) + PsiWhiteSpace('\n ')(1,4) ElixirStabImpl(STAB)(4,53) ElixirStabOperationImpl(STAB_OPERATION)(4,53) ElixirStabNoParenthesesSignatureImpl(STAB_NO_PARENTHESES_SIGNATURE)(4,37) @@ -27,10 +26,9 @@ Elixir File(0,110) ElixirIdentifierImpl(IDENTIFIER)(24,37) PsiElement(identifier)('signature_two')(24,37) PsiWhiteSpace(' ')(37,38) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(38,41) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(38,40) PsiElement(->)('->')(38,40) - PsiElement(\\n, \\r\\n)('\n')(40,41) - PsiWhiteSpace(' ')(41,45) + PsiWhiteSpace('\n ')(40,45) ElixirStabBodyImpl(STAB_BODY)(45,53) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(45,53) ElixirIdentifierImpl(IDENTIFIER)(45,53) @@ -42,8 +40,7 @@ Elixir File(0,110) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(56,110) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(56,110) PsiElement(()('(')(56,57) - PsiElement(\\n, \\r\\n)('\n')(57,58) - PsiWhiteSpace(' ')(58,60) + PsiWhiteSpace('\n ')(57,60) ElixirStabImpl(STAB)(60,108) ElixirStabOperationImpl(STAB_OPERATION)(60,108) ElixirStabNoParenthesesSignatureImpl(STAB_NO_PARENTHESES_SIGNATURE)(60,92) @@ -67,13 +64,12 @@ Elixir File(0,110) ElixirIdentifierImpl(IDENTIFIER)(79,92) PsiElement(identifier)('signature_two')(79,92) PsiWhiteSpace(' ')(92,93) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(93,96) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(93,95) PsiElement(->)('->')(93,95) - PsiElement(\\n, \\r\\n)('\n')(95,96) - PsiWhiteSpace(' ')(96,100) + PsiWhiteSpace('\n ')(95,100) ElixirStabBodyImpl(STAB_BODY)(100,108) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(100,108) ElixirIdentifierImpl(IDENTIFIER)(100,108) PsiElement(identifier)('body_one')(100,108) PsiElement(\\n, \\r\\n)('\n')(108,109) - PsiElement())(')')(109,110) \ No newline at end of file + PsiElement())(')')(109,110) diff --git a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/SpliceOnStab.txt b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/SpliceOnStab.txt index a0aa22fcd..eb041975c 100644 --- a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/SpliceOnStab.txt +++ b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/SpliceOnStab.txt @@ -95,10 +95,9 @@ Elixir File(0,199) PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('ok')(75,77) PsiWhiteSpace(' ')(77,78) PsiElement())(')')(78,79) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(79,122) - PsiElement(\\n, \\r\\n)('\n')(79,80) - PsiElement(\\n, \\r\\n)('\n')(80,81) - PsiComment(#)('# same as above, just for no parentheses')(81,121) + PsiWhiteSpace('\n\n')(79,81) + PsiComment(#)('# same as above, just for no parentheses')(81,121) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(121,122) PsiElement(\\n, \\r\\n)('\n')(121,122) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(122,160) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(122,160) @@ -195,4 +194,4 @@ Elixir File(0,199) PsiElement(:)(':')(194,195) PsiElement(A-Z, a-z, _, @, 0-9. ?, !)('ok')(195,197) PsiWhiteSpace(' ')(197,198) - PsiElement())(')')(198,199) \ No newline at end of file + PsiElement())(')')(198,199) diff --git a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/StabEndOfExpressionExpressionListEndOfExpression.txt b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/StabEndOfExpressionExpressionListEndOfExpression.txt index 526d1360c..e129e5ba2 100644 --- a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/StabEndOfExpressionExpressionListEndOfExpression.txt +++ b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/StabEndOfExpressionExpressionListEndOfExpression.txt @@ -5,10 +5,9 @@ Elixir File(0,71) PsiWhiteSpace(' ')(1,2) ElixirStabImpl(STAB)(2,32) ElixirStabOperationImpl(STAB_OPERATION)(2,32) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(2,5) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(2,4) PsiElement(->)('->')(2,4) - PsiElement(\\n, \\r\\n)('\n')(4,5) - PsiWhiteSpace(' ')(5,7) + PsiWhiteSpace('\n ')(4,7) ElixirStabBodyImpl(STAB_BODY)(7,32) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(7,18) ElixirIdentifierImpl(IDENTIFIER)(7,18) @@ -31,10 +30,9 @@ Elixir File(0,71) PsiWhiteSpace(' ')(38,39) ElixirStabImpl(STAB)(39,69) ElixirStabOperationImpl(STAB_OPERATION)(39,69) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(39,42) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(39,41) PsiElement(->)('->')(39,41) - PsiElement(\\n, \\r\\n)('\n')(41,42) - PsiWhiteSpace(' ')(42,44) + PsiWhiteSpace('\n ')(41,44) ElixirStabBodyImpl(STAB_BODY)(44,69) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(44,55) ElixirIdentifierImpl(IDENTIFIER)(44,55) @@ -46,4 +44,4 @@ Elixir File(0,71) ElixirIdentifierImpl(IDENTIFIER)(58,69) PsiElement(identifier)('expression2')(58,69) PsiElement(\\n, \\r\\n)('\n')(69,70) - PsiElement())(')')(70,71) \ No newline at end of file + PsiElement())(')')(70,71) diff --git a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/StabMultiEndOfExpressionStab.txt b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/StabMultiEndOfExpressionStab.txt index 0b33490e3..9fb31945f 100644 --- a/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/StabMultiEndOfExpressionStab.txt +++ b/testData/org/elixir_lang/parser_definition/parenthetical_stab_parsing_test_case/StabMultiEndOfExpressionStab.txt @@ -2,8 +2,7 @@ Elixir File(0,70) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(0,70) ElixirParentheticalStabImpl(PARENTHETICAL_STAB)(0,70) PsiElement(()('(')(0,1) - PsiElement(\\n, \\r\\n)('\n')(1,2) - PsiWhiteSpace(' ')(2,4) + PsiWhiteSpace('\n ')(1,4) ElixirStabImpl(STAB)(4,68) ElixirStabOperationImpl(STAB_OPERATION)(4,34) ElixirStabNoParenthesesSignatureImpl(STAB_NO_PARENTHESES_SIGNATURE)(4,22) @@ -28,8 +27,8 @@ Elixir File(0,70) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(26,34) ElixirIdentifierImpl(IDENTIFIER)(26,34) PsiElement(identifier)('body_one')(26,34) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(34,36) - PsiElement(\\n, \\r\\n)('\n')(34,35) + PsiWhiteSpace('\n')(34,35) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(35,36) PsiElement(\\n, \\r\\n)('\n')(35,36) PsiWhiteSpace(' ')(36,38) ElixirStabOperationImpl(STAB_OPERATION)(38,68) @@ -56,4 +55,4 @@ Elixir File(0,70) ElixirIdentifierImpl(IDENTIFIER)(60,68) PsiElement(identifier)('body_two')(60,68) PsiElement(\\n, \\r\\n)('\n')(68,69) - PsiElement())(')')(69,70) \ No newline at end of file + PsiElement())(')')(69,70) diff --git a/testData/org/elixir_lang/parser_definition/unknown_base_whole_number_parsing_test_case/NoDigits.txt b/testData/org/elixir_lang/parser_definition/unknown_base_whole_number_parsing_test_case/NoDigits.txt index 6b662694b..58b5d5f6b 100644 --- a/testData/org/elixir_lang/parser_definition/unknown_base_whole_number_parsing_test_case/NoDigits.txt +++ b/testData/org/elixir_lang/parser_definition/unknown_base_whole_number_parsing_test_case/NoDigits.txt @@ -9,10 +9,9 @@ Elixir File(0,79) PsiErrorElement:A-Z, a-z, 0-9 expected, got ' '(36,36) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(36,70) - PsiElement(\\n, \\r\\n)('\n')(36,37) - PsiElement(\\n, \\r\\n)('\n')(37,38) - PsiComment(#)('# No digits should recover at ;')(38,69) + PsiWhiteSpace('\n\n')(36,38) + PsiComment(#)('# No digits should recover at ;')(38,69) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(69,70) PsiElement(\\n, \\r\\n)('\n')(69,70) ElixirAccessExpressionImpl(ACCESS_EXPRESSION)(70,72) ElixirUnknownBaseWholeNumberImpl(UNKNOWN_BASE_WHOLE_NUMBER)(70,72) @@ -28,4 +27,4 @@ Elixir File(0,79) PsiElement(0)('0')(74,75) PsiElement(A-Z, a, c-n, p-w, z)('z')(75,76) ElixirUnknownBaseDigitsImpl(UNKNOWN_BASE_DIGITS)(76,79) - PsiElement(A-Z, a-z, 0-9)('Aa0')(76,79) \ No newline at end of file + PsiElement(A-Z, a-z, 0-9)('Aa0')(76,79) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/BlockIdentifierKeywordKeys.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/BlockIdentifierKeywordKeys.txt index 0dcc35754..78789c494 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/BlockIdentifierKeywordKeys.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/BlockIdentifierKeywordKeys.txt @@ -5,9 +5,7 @@ Elixir File(0,133) PsiWhiteSpace(' ')(3,4) ElixirDoBlockImpl(DO_BLOCK)(4,68) PsiElement(do)('do')(4,6) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(6,7) - PsiElement(\\n, \\r\\n)('\n')(6,7) - PsiWhiteSpace(' ')(7,9) + PsiWhiteSpace('\n ')(6,9) ElixirStabImpl(STAB)(9,12) ElixirStabBodyImpl(STAB_BODY)(9,12) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(9,12) @@ -15,13 +13,11 @@ Elixir File(0,133) PsiElement(identifier)('two')(9,12) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(12,13) PsiElement(\\n, \\r\\n)('\n')(12,13) - ElixirBlockListImpl(BLOCK_LIST)(13,65) + ElixirBlockListImpl(BLOCK_LIST)(13,64) ElixirBlockItemImpl(BLOCK_ITEM)(13,27) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(13,18) PsiElement(after)('after')(13,18) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(18,19) - PsiElement(\\n, \\r\\n)('\n')(18,19) - PsiWhiteSpace(' ')(19,21) + PsiWhiteSpace('\n ')(18,21) ElixirStabImpl(STAB)(21,26) ElixirStabBodyImpl(STAB_BODY)(21,26) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(21,26) @@ -32,9 +28,7 @@ Elixir File(0,133) ElixirBlockItemImpl(BLOCK_ITEM)(27,40) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(27,32) PsiElement(catch)('catch')(27,32) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(32,33) - PsiElement(\\n, \\r\\n)('\n')(32,33) - PsiWhiteSpace(' ')(33,35) + PsiWhiteSpace('\n ')(32,35) ElixirStabImpl(STAB)(35,39) ElixirStabBodyImpl(STAB_BODY)(35,39) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(35,39) @@ -45,9 +39,7 @@ Elixir File(0,133) ElixirBlockItemImpl(BLOCK_ITEM)(40,52) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(40,44) PsiElement(else)('else')(40,44) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(44,45) - PsiElement(\\n, \\r\\n)('\n')(44,45) - PsiWhiteSpace(' ')(45,47) + PsiWhiteSpace('\n ')(44,47) ElixirStabImpl(STAB)(47,51) ElixirStabBodyImpl(STAB_BODY)(47,51) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(47,51) @@ -55,22 +47,19 @@ Elixir File(0,133) PsiElement(identifier)('five')(47,51) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(51,52) PsiElement(\\n, \\r\\n)('\n')(51,52) - ElixirBlockItemImpl(BLOCK_ITEM)(52,65) + ElixirBlockItemImpl(BLOCK_ITEM)(52,64) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(52,58) PsiElement(rescue)('rescue')(52,58) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(58,59) - PsiElement(\\n, \\r\\n)('\n')(58,59) - PsiWhiteSpace(' ')(59,61) + PsiWhiteSpace('\n ')(58,61) ElixirStabImpl(STAB)(61,64) ElixirStabBodyImpl(STAB_BODY)(61,64) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(61,64) ElixirIdentifierImpl(IDENTIFIER)(61,64) PsiElement(identifier)('six')(61,64) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(64,65) - PsiElement(\\n, \\r\\n)('\n')(64,65) + PsiWhiteSpace('\n')(64,65) PsiElement(end)('end')(65,68) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(68,70) - PsiElement(\\n, \\r\\n)('\n')(68,69) + PsiWhiteSpace('\n')(68,69) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(69,70) PsiElement(\\n, \\r\\n)('\n')(69,70) UNMATCHED_UNQUALIFIED_NO_PARENTHESES_CALL(70,133) ElixirIdentifierImpl(IDENTIFIER)(70,73) @@ -125,4 +114,4 @@ Elixir File(0,133) PsiWhiteSpace(' ')(129,130) MATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(130,133) ElixirIdentifierImpl(IDENTIFIER)(130,133) - PsiElement(identifier)('six')(130,133) \ No newline at end of file + PsiElement(identifier)('six')(130,133) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/BlockItemCommentStab.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/BlockItemCommentStab.txt index df2bb97f9..0ab399a75 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/BlockItemCommentStab.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/BlockItemCommentStab.txt @@ -5,19 +5,16 @@ Elixir File(0,136) PsiWhiteSpace(' ')(3,4) ElixirDoBlockImpl(DO_BLOCK)(4,136) PsiElement(do)('do')(4,6) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(6,7) - PsiElement(\\n, \\r\\n)('\n')(6,7) - ElixirBlockListImpl(BLOCK_LIST)(7,133) - ElixirBlockItemImpl(BLOCK_ITEM)(7,133) + PsiWhiteSpace('\n')(6,7) + ElixirBlockListImpl(BLOCK_LIST)(7,132) + ElixirBlockItemImpl(BLOCK_ITEM)(7,132) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(7,12) PsiElement(catch)('catch')(7,12) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(12,98) - PsiElement(\\n, \\r\\n)('\n')(12,13) - PsiWhiteSpace(' ')(13,15) - PsiComment(#)('# A user could create an error that looks like a builtin one')(15,75) - PsiElement(\\n, \\r\\n)('\n')(75,76) - PsiWhiteSpace(' ')(76,78) - PsiComment(#)('# causing an error.')(78,97) + PsiWhiteSpace('\n ')(12,15) + PsiComment(#)('# A user could create an error that looks like a builtin one')(15,75) + PsiWhiteSpace('\n ')(75,78) + PsiComment(#)('# causing an error.')(78,97) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(97,98) PsiElement(\\n, \\r\\n)('\n')(97,98) PsiWhiteSpace(' ')(98,100) ElixirStabImpl(STAB)(100,132) @@ -35,10 +32,9 @@ Elixir File(0,136) ElixirIdentifierImpl(IDENTIFIER)(108,109) PsiElement(identifier)('_')(108,109) PsiWhiteSpace(' ')(109,110) - ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(110,113) + ElixirStabInfixOperatorImpl(STAB_INFIX_OPERATOR)(110,112) PsiElement(->)('->')(110,112) - PsiElement(\\n, \\r\\n)('\n')(112,113) - PsiWhiteSpace(' ')(113,117) + PsiWhiteSpace('\n ')(112,117) ElixirStabBodyImpl(STAB_BODY)(117,132) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(117,132) ElixirIdentifierImpl(IDENTIFIER)(117,124) @@ -50,6 +46,5 @@ Elixir File(0,136) ElixirIdentifierImpl(IDENTIFIER)(125,131) PsiElement(identifier)('reason')(125,131) PsiElement())(')')(131,132) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(132,133) - PsiElement(\\n, \\r\\n)('\n')(132,133) - PsiElement(end)('end')(133,136) \ No newline at end of file + PsiWhiteSpace('\n')(132,133) + PsiElement(end)('end')(133,136) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/CaptureUnqualifiedNoArgumentsBlock.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/CaptureUnqualifiedNoArgumentsBlock.txt index 6a9493c36..a247dd453 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/CaptureUnqualifiedNoArgumentsBlock.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/CaptureUnqualifiedNoArgumentsBlock.txt @@ -21,8 +21,7 @@ Elixir File(0,58) PsiWhiteSpace(' ')(30,31) ElixirDoBlockImpl(DO_BLOCK)(31,37) PsiElement(do)('do')(31,33) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(33,34) - PsiElement(\\n, \\r\\n)('\n')(33,34) + PsiWhiteSpace('\n')(33,34) PsiElement(end)('end')(34,37) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(37,38) PsiElement(\\n, \\r\\n)('\n')(37,38) @@ -39,4 +38,4 @@ Elixir File(0,58) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(53,54) PsiElement(;)(';')(53,54) PsiWhiteSpace(' ')(54,55) - PsiElement(end)('end')(55,58) \ No newline at end of file + PsiElement(end)('end')(55,58) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/InternalError.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/InternalError.txt index 89c086176..839fb903b 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/InternalError.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/InternalError.txt @@ -5,9 +5,7 @@ Elixir File(0,39) PsiWhiteSpace(' ')(3,4) ElixirDoBlockImpl(DO_BLOCK)(4,30) PsiElement(do)('do')(4,6) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(6,7) - PsiElement(\\n, \\r\\n)('\n')(6,7) - PsiWhiteSpace(' ')(7,9) + PsiWhiteSpace('\n ')(6,9) ElixirStabImpl(STAB)(9,18) ElixirStabBodyImpl(STAB_BODY)(9,18) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(9,12) @@ -19,18 +17,16 @@ Elixir File(0,39) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(15,18) ElixirIdentifierImpl(IDENTIFIER)(15,18) PsiElement(identifier)('two')(15,18) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(18,30) - PsiElement(\\n, \\r\\n)('\n')(18,19) - PsiElement(\\n, \\r\\n)('\n')(19,20) - PsiWhiteSpace(' ')(20,22) - PsiComment(#)('# error')(22,29) + PsiWhiteSpace('\n\n ')(18,22) + PsiComment(#)('# error')(22,29) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(29,30) PsiElement(\\n, \\r\\n)('\n')(29,30) PsiErrorElement:';', , , EEx Empty Marker, '\\n, \\r\\n' or end expected, got '{'(30,30) PsiWhiteSpace(' ')(30,32) PsiElement({)('{')(32,33) - PsiElement(,)(',')(33,34) - PsiErrorElement: expected, got '}'(34,35) - PsiElement(})('}')(34,35) - PsiElement(\\n, \\r\\n)('\n')(35,36) + PsiErrorElement: expected, got ','(33,34) + PsiElement(,)(',')(33,34) + PsiElement(})('}')(34,35) + PsiWhiteSpace('\n')(35,36) PsiElement(end)('end')(36,39) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/QualifiedParenthesesCallBlock.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/QualifiedParenthesesCallBlock.txt index 031c8012c..62c6c7afe 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/QualifiedParenthesesCallBlock.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/QualifiedParenthesesCallBlock.txt @@ -47,11 +47,9 @@ Elixir File(0,132) PsiElement(do)('do')(43,45) PsiWhiteSpace(' ')(45,46) PsiElement(end)('end')(46,49) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(49,108) - PsiElement(\\n, \\r\\n)('\n')(49,50) - PsiElement(\\n, \\r\\n)('\n')(50,51) - PsiComment(#)('# works in Elixir, not intellij-elixir')(51,89) - PsiElement(\\n, \\r\\n)('\n')(89,90) - PsiComment(#)('#@one(two) do end')(90,107) - PsiElement(\\n, \\r\\n)('\n')(107,108) - PsiComment(#)('#@one(two)(three) do end')(108,132) \ No newline at end of file + PsiWhiteSpace('\n\n')(49,51) + PsiComment(#)('# works in Elixir, not intellij-elixir')(51,89) + PsiWhiteSpace('\n')(89,90) + PsiComment(#)('#@one(two) do end')(90,107) + PsiWhiteSpace('\n')(107,108) + PsiComment(#)('#@one(two)(three) do end')(108,132) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsAfterBlock.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsAfterBlock.txt index 2796643e3..2f6902ff6 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsAfterBlock.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsAfterBlock.txt @@ -37,13 +37,10 @@ Elixir File(0,74) PsiWhiteSpace(' ')(59,60) ElixirDoBlockImpl(DO_BLOCK)(60,74) PsiElement(do)('do')(60,62) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(62,63) - PsiElement(\\n, \\r\\n)('\n')(62,63) - PsiWhiteSpace(' ')(63,65) - ElixirBlockListImpl(BLOCK_LIST)(65,71) - ElixirBlockItemImpl(BLOCK_ITEM)(65,71) + PsiWhiteSpace('\n ')(62,65) + ElixirBlockListImpl(BLOCK_LIST)(65,70) + ElixirBlockItemImpl(BLOCK_ITEM)(65,70) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(65,70) PsiElement(after)('after')(65,70) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(70,71) - PsiElement(\\n, \\r\\n)('\n')(70,71) - PsiElement(end)('end')(71,74) \ No newline at end of file + PsiWhiteSpace('\n')(70,71) + PsiElement(end)('end')(71,74) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsBlock.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsBlock.txt index 5373451ce..6844fd3a3 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsBlock.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsBlock.txt @@ -15,8 +15,7 @@ Elixir File(0,55) PsiWhiteSpace(' ')(28,29) ElixirDoBlockImpl(DO_BLOCK)(29,35) PsiElement(do)('do')(29,31) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(31,32) - PsiElement(\\n, \\r\\n)('\n')(31,32) + PsiWhiteSpace('\n')(31,32) PsiElement(end)('end')(32,35) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(35,36) PsiElement(\\n, \\r\\n)('\n')(35,36) @@ -30,4 +29,4 @@ Elixir File(0,55) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(50,51) PsiElement(;)(';')(50,51) PsiWhiteSpace(' ')(51,52) - PsiElement(end)('end')(52,55) \ No newline at end of file + PsiElement(end)('end')(52,55) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsCatchBlock.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsCatchBlock.txt index 88d31d04b..c8719feaa 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsCatchBlock.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsCatchBlock.txt @@ -37,13 +37,10 @@ Elixir File(0,74) PsiWhiteSpace(' ')(59,60) ElixirDoBlockImpl(DO_BLOCK)(60,74) PsiElement(do)('do')(60,62) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(62,63) - PsiElement(\\n, \\r\\n)('\n')(62,63) - PsiWhiteSpace(' ')(63,65) - ElixirBlockListImpl(BLOCK_LIST)(65,71) - ElixirBlockItemImpl(BLOCK_ITEM)(65,71) + PsiWhiteSpace('\n ')(62,65) + ElixirBlockListImpl(BLOCK_LIST)(65,70) + ElixirBlockItemImpl(BLOCK_ITEM)(65,70) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(65,70) PsiElement(catch)('catch')(65,70) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(70,71) - PsiElement(\\n, \\r\\n)('\n')(70,71) - PsiElement(end)('end')(71,74) \ No newline at end of file + PsiWhiteSpace('\n')(70,71) + PsiElement(end)('end')(71,74) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsElseBlock.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsElseBlock.txt index 7e0fcaf81..98be7b5ba 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsElseBlock.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsElseBlock.txt @@ -37,13 +37,10 @@ Elixir File(0,71) PsiWhiteSpace(' ')(57,58) ElixirDoBlockImpl(DO_BLOCK)(58,71) PsiElement(do)('do')(58,60) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(60,61) - PsiElement(\\n, \\r\\n)('\n')(60,61) - PsiWhiteSpace(' ')(61,63) - ElixirBlockListImpl(BLOCK_LIST)(63,68) - ElixirBlockItemImpl(BLOCK_ITEM)(63,68) + PsiWhiteSpace('\n ')(60,63) + ElixirBlockListImpl(BLOCK_LIST)(63,67) + ElixirBlockItemImpl(BLOCK_ITEM)(63,67) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(63,67) PsiElement(else)('else')(63,67) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(67,68) - PsiElement(\\n, \\r\\n)('\n')(67,68) - PsiElement(end)('end')(68,71) \ No newline at end of file + PsiWhiteSpace('\n')(67,68) + PsiElement(end)('end')(68,71) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsRepeatBlock.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsRepeatBlock.txt index c74068c24..8e91fe061 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsRepeatBlock.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsRepeatBlock.txt @@ -202,8 +202,8 @@ Elixir File(0,566) PsiElement(identifier)('three')(230,235) PsiWhiteSpace(' ')(235,236) PsiElement(end)('end')(236,239) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(239,241) - PsiElement(\\n, \\r\\n)('\n')(239,240) + PsiWhiteSpace('\n')(239,240) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(240,241) PsiElement(\\n, \\r\\n)('\n')(240,241) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(241,332) ElixirIdentifierImpl(IDENTIFIER)(241,251) @@ -211,9 +211,7 @@ Elixir File(0,566) PsiWhiteSpace(' ')(251,252) ElixirDoBlockImpl(DO_BLOCK)(252,332) PsiElement(do)('do')(252,254) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(254,255) - PsiElement(\\n, \\r\\n)('\n')(254,255) - PsiWhiteSpace(' ')(255,257) + PsiWhiteSpace('\n ')(254,257) ElixirStabImpl(STAB)(257,260) ElixirStabBodyImpl(STAB_BODY)(257,260) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(257,260) @@ -222,13 +220,11 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(260,261) PsiElement(\\n, \\r\\n)('\n')(260,261) PsiWhiteSpace(' ')(261,263) - ElixirBlockListImpl(BLOCK_LIST)(263,329) + ElixirBlockListImpl(BLOCK_LIST)(263,328) ElixirBlockItemImpl(BLOCK_ITEM)(263,277) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(263,268) PsiElement(after)('after')(263,268) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(268,269) - PsiElement(\\n, \\r\\n)('\n')(268,269) - PsiWhiteSpace(' ')(269,273) + PsiWhiteSpace('\n ')(268,273) ElixirStabImpl(STAB)(273,276) ElixirStabBodyImpl(STAB_BODY)(273,276) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(273,276) @@ -240,9 +236,7 @@ Elixir File(0,566) ElixirBlockItemImpl(BLOCK_ITEM)(279,295) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(279,284) PsiElement(catch)('catch')(279,284) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(284,285) - PsiElement(\\n, \\r\\n)('\n')(284,285) - PsiWhiteSpace(' ')(285,289) + PsiWhiteSpace('\n ')(284,289) ElixirStabImpl(STAB)(289,294) ElixirStabBodyImpl(STAB_BODY)(289,294) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(289,294) @@ -254,9 +248,7 @@ Elixir File(0,566) ElixirBlockItemImpl(BLOCK_ITEM)(297,311) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(297,301) PsiElement(else)('else')(297,301) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(301,302) - PsiElement(\\n, \\r\\n)('\n')(301,302) - PsiWhiteSpace(' ')(302,306) + PsiWhiteSpace('\n ')(301,306) ElixirStabImpl(STAB)(306,310) ElixirStabBodyImpl(STAB_BODY)(306,310) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(306,310) @@ -265,22 +257,19 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(310,311) PsiElement(\\n, \\r\\n)('\n')(310,311) PsiWhiteSpace(' ')(311,313) - ElixirBlockItemImpl(BLOCK_ITEM)(313,329) + ElixirBlockItemImpl(BLOCK_ITEM)(313,328) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(313,319) PsiElement(rescue)('rescue')(313,319) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(319,320) - PsiElement(\\n, \\r\\n)('\n')(319,320) - PsiWhiteSpace(' ')(320,324) + PsiWhiteSpace('\n ')(319,324) ElixirStabImpl(STAB)(324,328) ElixirStabBodyImpl(STAB_BODY)(324,328) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(324,328) ElixirIdentifierImpl(IDENTIFIER)(324,328) PsiElement(identifier)('five')(324,328) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(328,329) - PsiElement(\\n, \\r\\n)('\n')(328,329) + PsiWhiteSpace('\n')(328,329) PsiElement(end)('end')(329,332) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(332,334) - PsiElement(\\n, \\r\\n)('\n')(332,333) + PsiWhiteSpace('\n')(332,333) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(333,334) PsiElement(\\n, \\r\\n)('\n')(333,334) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(334,391) ElixirIdentifierImpl(IDENTIFIER)(334,344) @@ -288,9 +277,7 @@ Elixir File(0,566) PsiWhiteSpace(' ')(344,345) ElixirDoBlockImpl(DO_BLOCK)(345,391) PsiElement(do)('do')(345,347) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(347,348) - PsiElement(\\n, \\r\\n)('\n')(347,348) - PsiWhiteSpace(' ')(348,350) + PsiWhiteSpace('\n ')(347,350) ElixirStabImpl(STAB)(350,353) ElixirStabBodyImpl(STAB_BODY)(350,353) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(350,353) @@ -299,13 +286,11 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(353,354) PsiElement(\\n, \\r\\n)('\n')(353,354) PsiWhiteSpace(' ')(354,356) - ElixirBlockListImpl(BLOCK_LIST)(356,388) + ElixirBlockListImpl(BLOCK_LIST)(356,387) ElixirBlockItemImpl(BLOCK_ITEM)(356,370) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(356,361) PsiElement(after)('after')(356,361) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(361,362) - PsiElement(\\n, \\r\\n)('\n')(361,362) - PsiWhiteSpace(' ')(362,366) + PsiWhiteSpace('\n ')(361,366) ElixirStabImpl(STAB)(366,369) ElixirStabBodyImpl(STAB_BODY)(366,369) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(366,369) @@ -314,22 +299,19 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(369,370) PsiElement(\\n, \\r\\n)('\n')(369,370) PsiWhiteSpace(' ')(370,372) - ElixirBlockItemImpl(BLOCK_ITEM)(372,388) + ElixirBlockItemImpl(BLOCK_ITEM)(372,387) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(372,377) PsiElement(after)('after')(372,377) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(377,378) - PsiElement(\\n, \\r\\n)('\n')(377,378) - PsiWhiteSpace(' ')(378,382) + PsiWhiteSpace('\n ')(377,382) ElixirStabImpl(STAB)(382,387) ElixirStabBodyImpl(STAB_BODY)(382,387) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(382,387) ElixirIdentifierImpl(IDENTIFIER)(382,387) PsiElement(identifier)('three')(382,387) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(387,388) - PsiElement(\\n, \\r\\n)('\n')(387,388) + PsiWhiteSpace('\n')(387,388) PsiElement(end)('end')(388,391) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(391,393) - PsiElement(\\n, \\r\\n)('\n')(391,392) + PsiWhiteSpace('\n')(391,392) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(392,393) PsiElement(\\n, \\r\\n)('\n')(392,393) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(393,450) ElixirIdentifierImpl(IDENTIFIER)(393,403) @@ -337,9 +319,7 @@ Elixir File(0,566) PsiWhiteSpace(' ')(403,404) ElixirDoBlockImpl(DO_BLOCK)(404,450) PsiElement(do)('do')(404,406) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(406,407) - PsiElement(\\n, \\r\\n)('\n')(406,407) - PsiWhiteSpace(' ')(407,409) + PsiWhiteSpace('\n ')(406,409) ElixirStabImpl(STAB)(409,412) ElixirStabBodyImpl(STAB_BODY)(409,412) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(409,412) @@ -348,13 +328,11 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(412,413) PsiElement(\\n, \\r\\n)('\n')(412,413) PsiWhiteSpace(' ')(413,415) - ElixirBlockListImpl(BLOCK_LIST)(415,447) + ElixirBlockListImpl(BLOCK_LIST)(415,446) ElixirBlockItemImpl(BLOCK_ITEM)(415,429) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(415,420) PsiElement(catch)('catch')(415,420) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(420,421) - PsiElement(\\n, \\r\\n)('\n')(420,421) - PsiWhiteSpace(' ')(421,425) + PsiWhiteSpace('\n ')(420,425) ElixirStabImpl(STAB)(425,428) ElixirStabBodyImpl(STAB_BODY)(425,428) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(425,428) @@ -363,22 +341,19 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(428,429) PsiElement(\\n, \\r\\n)('\n')(428,429) PsiWhiteSpace(' ')(429,431) - ElixirBlockItemImpl(BLOCK_ITEM)(431,447) + ElixirBlockItemImpl(BLOCK_ITEM)(431,446) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(431,436) PsiElement(catch)('catch')(431,436) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(436,437) - PsiElement(\\n, \\r\\n)('\n')(436,437) - PsiWhiteSpace(' ')(437,441) + PsiWhiteSpace('\n ')(436,441) ElixirStabImpl(STAB)(441,446) ElixirStabBodyImpl(STAB_BODY)(441,446) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(441,446) ElixirIdentifierImpl(IDENTIFIER)(441,446) PsiElement(identifier)('three')(441,446) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(446,447) - PsiElement(\\n, \\r\\n)('\n')(446,447) + PsiWhiteSpace('\n')(446,447) PsiElement(end)('end')(447,450) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(450,452) - PsiElement(\\n, \\r\\n)('\n')(450,451) + PsiWhiteSpace('\n')(450,451) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(451,452) PsiElement(\\n, \\r\\n)('\n')(451,452) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(452,507) ElixirIdentifierImpl(IDENTIFIER)(452,462) @@ -386,9 +361,7 @@ Elixir File(0,566) PsiWhiteSpace(' ')(462,463) ElixirDoBlockImpl(DO_BLOCK)(463,507) PsiElement(do)('do')(463,465) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(465,466) - PsiElement(\\n, \\r\\n)('\n')(465,466) - PsiWhiteSpace(' ')(466,468) + PsiWhiteSpace('\n ')(465,468) ElixirStabImpl(STAB)(468,471) ElixirStabBodyImpl(STAB_BODY)(468,471) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(468,471) @@ -397,13 +370,11 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(471,472) PsiElement(\\n, \\r\\n)('\n')(471,472) PsiWhiteSpace(' ')(472,474) - ElixirBlockListImpl(BLOCK_LIST)(474,504) + ElixirBlockListImpl(BLOCK_LIST)(474,503) ElixirBlockItemImpl(BLOCK_ITEM)(474,487) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(474,478) PsiElement(else)('else')(474,478) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(478,479) - PsiElement(\\n, \\r\\n)('\n')(478,479) - PsiWhiteSpace(' ')(479,483) + PsiWhiteSpace('\n ')(478,483) ElixirStabImpl(STAB)(483,486) ElixirStabBodyImpl(STAB_BODY)(483,486) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(483,486) @@ -412,22 +383,19 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(486,487) PsiElement(\\n, \\r\\n)('\n')(486,487) PsiWhiteSpace(' ')(487,489) - ElixirBlockItemImpl(BLOCK_ITEM)(489,504) + ElixirBlockItemImpl(BLOCK_ITEM)(489,503) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(489,493) PsiElement(else)('else')(489,493) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(493,494) - PsiElement(\\n, \\r\\n)('\n')(493,494) - PsiWhiteSpace(' ')(494,498) + PsiWhiteSpace('\n ')(493,498) ElixirStabImpl(STAB)(498,503) ElixirStabBodyImpl(STAB_BODY)(498,503) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(498,503) ElixirIdentifierImpl(IDENTIFIER)(498,503) PsiElement(identifier)('three')(498,503) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(503,504) - PsiElement(\\n, \\r\\n)('\n')(503,504) + PsiWhiteSpace('\n')(503,504) PsiElement(end)('end')(504,507) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(507,509) - PsiElement(\\n, \\r\\n)('\n')(507,508) + PsiWhiteSpace('\n')(507,508) + ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(508,509) PsiElement(\\n, \\r\\n)('\n')(508,509) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(509,566) ElixirIdentifierImpl(IDENTIFIER)(509,519) @@ -435,9 +403,7 @@ Elixir File(0,566) PsiWhiteSpace(' ')(519,520) ElixirDoBlockImpl(DO_BLOCK)(520,566) PsiElement(do)('do')(520,522) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(522,523) - PsiElement(\\n, \\r\\n)('\n')(522,523) - PsiWhiteSpace(' ')(523,525) + PsiWhiteSpace('\n ')(522,525) ElixirStabImpl(STAB)(525,528) ElixirStabBodyImpl(STAB_BODY)(525,528) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(525,528) @@ -446,13 +412,11 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(528,529) PsiElement(\\n, \\r\\n)('\n')(528,529) PsiWhiteSpace(' ')(529,531) - ElixirBlockListImpl(BLOCK_LIST)(531,563) + ElixirBlockListImpl(BLOCK_LIST)(531,562) ElixirBlockItemImpl(BLOCK_ITEM)(531,546) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(531,537) PsiElement(rescue)('rescue')(531,537) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(537,538) - PsiElement(\\n, \\r\\n)('\n')(537,538) - PsiWhiteSpace(' ')(538,542) + PsiWhiteSpace('\n ')(537,542) ElixirStabImpl(STAB)(542,545) ElixirStabBodyImpl(STAB_BODY)(542,545) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(542,545) @@ -461,17 +425,14 @@ Elixir File(0,566) ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(545,546) PsiElement(\\n, \\r\\n)('\n')(545,546) PsiWhiteSpace(' ')(546,548) - ElixirBlockItemImpl(BLOCK_ITEM)(548,563) + ElixirBlockItemImpl(BLOCK_ITEM)(548,562) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(548,552) PsiElement(else)('else')(548,552) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(552,553) - PsiElement(\\n, \\r\\n)('\n')(552,553) - PsiWhiteSpace(' ')(553,557) + PsiWhiteSpace('\n ')(552,557) ElixirStabImpl(STAB)(557,562) ElixirStabBodyImpl(STAB_BODY)(557,562) UNMATCHED_UNQUALIFIED_NO_ARGUMENTS_CALL(557,562) ElixirIdentifierImpl(IDENTIFIER)(557,562) PsiElement(identifier)('three')(557,562) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(562,563) - PsiElement(\\n, \\r\\n)('\n')(562,563) - PsiElement(end)('end')(563,566) \ No newline at end of file + PsiWhiteSpace('\n')(562,563) + PsiElement(end)('end')(563,566) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsRescueBlock.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsRescueBlock.txt index bbd97840d..c6de62760 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsRescueBlock.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnqualifiedNoArgumentsRescueBlock.txt @@ -37,13 +37,10 @@ Elixir File(0,77) PsiWhiteSpace(' ')(61,62) ElixirDoBlockImpl(DO_BLOCK)(62,77) PsiElement(do)('do')(62,64) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(64,65) - PsiElement(\\n, \\r\\n)('\n')(64,65) - PsiWhiteSpace(' ')(65,67) - ElixirBlockListImpl(BLOCK_LIST)(67,74) - ElixirBlockItemImpl(BLOCK_ITEM)(67,74) + PsiWhiteSpace('\n ')(64,67) + ElixirBlockListImpl(BLOCK_LIST)(67,73) + ElixirBlockItemImpl(BLOCK_ITEM)(67,73) ElixirBlockIdentifierImpl(BLOCK_IDENTIFIER)(67,73) PsiElement(rescue)('rescue')(67,73) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(73,74) - PsiElement(\\n, \\r\\n)('\n')(73,74) - PsiElement(end)('end')(74,77) \ No newline at end of file + PsiWhiteSpace('\n')(73,74) + PsiElement(end)('end')(74,77) diff --git a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnquoteSplicingBlock.txt b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnquoteSplicingBlock.txt index 3430a1844..d2364cd2a 100644 --- a/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnquoteSplicingBlock.txt +++ b/testData/org/elixir_lang/parser_definition/unmatched_expression_parsing_test_case/UnquoteSplicingBlock.txt @@ -5,9 +5,7 @@ Elixir File(0,34) PsiWhiteSpace(' ')(3,4) ElixirDoBlockImpl(DO_BLOCK)(4,34) PsiElement(do)('do')(4,6) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(6,7) - PsiElement(\\n, \\r\\n)('\n')(6,7) - PsiWhiteSpace(' ')(7,9) + PsiWhiteSpace('\n ')(6,9) ElixirStabImpl(STAB)(9,30) ElixirStabBodyImpl(STAB_BODY)(9,30) UNMATCHED_UNQUALIFIED_PARENTHESES_CALL(9,30) @@ -20,6 +18,5 @@ Elixir File(0,34) ElixirIdentifierImpl(IDENTIFIER)(26,29) PsiElement(identifier)('two')(26,29) PsiElement())(')')(29,30) - ElixirEndOfExpressionImpl(END_OF_EXPRESSION)(30,31) - PsiElement(\\n, \\r\\n)('\n')(30,31) - PsiElement(end)('end')(31,34) \ No newline at end of file + PsiWhiteSpace('\n')(30,31) + PsiElement(end)('end')(31,34) diff --git a/tests/org/elixir_lang/beam/BeamTest.java b/tests/org/elixir_lang/beam/BeamTest.java index 02eb9b9d7..e2cd17edb 100644 --- a/tests/org/elixir_lang/beam/BeamTest.java +++ b/tests/org/elixir_lang/beam/BeamTest.java @@ -6,6 +6,8 @@ import org.elixir_lang.beam.chunk.Atoms; import org.elixir_lang.beam.chunk.CallDefinitions; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -18,8 +20,7 @@ import static org.junit.Assert.*; public class BeamTest { - @NotNull - @SuppressWarnings("NullableProblems") + @Nullable private String ebinDirectory; @Test @@ -113,4 +114,9 @@ public void setEbinDirectory() { this.ebinDirectory = ebinDirectory; } + + @After + public void cleanEbinDirectory() { + this.ebinDirectory = null; + } } diff --git a/tests/org/elixir_lang/elixir_flex_lexer/BaseIntegerBaseTest.java b/tests/org/elixir_lang/elixir_flex_lexer/BaseIntegerBaseTest.java index 892c2e0b4..49a258c5b 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/BaseIntegerBaseTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/BaseIntegerBaseTest.java @@ -37,7 +37,7 @@ protected void start(@NotNull CharSequence charSequence) { } @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList(new Object[][]{ diff --git a/tests/org/elixir_lang/elixir_flex_lexer/BinaryIntegerTest.java b/tests/org/elixir_lang/elixir_flex_lexer/BinaryIntegerTest.java index 07e80d7de..b143733fe 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/BinaryIntegerTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/BinaryIntegerTest.java @@ -52,7 +52,7 @@ public static Collection generateData() { { "&", ElixirTypes.CAPTURE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE }, { "'", ElixirTypes.CHAR_LIST_PROMOTER, ElixirFlexLexer.GROUP }, { "'''", ElixirTypes.CHAR_LIST_HEREDOC_PROMOTER, ElixirFlexLexer.GROUP_HEREDOC_START }, - { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL }, + { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE }, { ")", ElixirTypes.CLOSING_PARENTHESIS, ElixirFlexLexer.YYINITIAL }, { "*", ElixirTypes.MULTIPLICATION_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE }, { "+", ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION }, diff --git a/tests/org/elixir_lang/elixir_flex_lexer/BracketCallTest.java b/tests/org/elixir_lang/elixir_flex_lexer/BracketCallTest.java index e6e88f105..de3d1d8e5 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/BracketCallTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/BracketCallTest.java @@ -153,7 +153,7 @@ public static Collection generateData() { { "after", Arrays.asList( - new TokenTypeState(ElixirTypes.AFTER, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), + new TokenTypeState(ElixirTypes.AFTER, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), new TokenTypeState(ElixirTypes.OPENING_BRACKET, ElixirFlexLexer.YYINITIAL) ) }, @@ -183,7 +183,7 @@ public static Collection generateData() { { "catch", Arrays.asList( - new TokenTypeState(ElixirTypes.CATCH, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), + new TokenTypeState(ElixirTypes.CATCH, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), new TokenTypeState(ElixirTypes.OPENING_BRACKET, ElixirFlexLexer.YYINITIAL) ) }, @@ -198,7 +198,7 @@ public static Collection generateData() { { "do", Arrays.asList( - new TokenTypeState(ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), + new TokenTypeState(ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), new TokenTypeState(ElixirTypes.OPENING_BRACKET, ElixirFlexLexer.YYINITIAL) ) }, @@ -213,7 +213,7 @@ public static Collection generateData() { { "else", Arrays.asList( - new TokenTypeState(ElixirTypes.ELSE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), + new TokenTypeState(ElixirTypes.ELSE, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), new TokenTypeState(ElixirTypes.OPENING_BRACKET, ElixirFlexLexer.YYINITIAL) ) }, @@ -295,7 +295,7 @@ public static Collection generateData() { { "rescue", Arrays.asList( - new TokenTypeState(ElixirTypes.RESCUE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), + new TokenTypeState(ElixirTypes.RESCUE, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), new TokenTypeState(ElixirTypes.OPENING_BRACKET, ElixirFlexLexer.YYINITIAL) ) }, @@ -484,7 +484,7 @@ public static Collection generateData() { { "->", Arrays.asList( - new TokenTypeState(ElixirTypes.STAB_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), + new TokenTypeState(ElixirTypes.STAB_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), new TokenTypeState(ElixirTypes.OPENING_BRACKET, ElixirFlexLexer.YYINITIAL) ) }, diff --git a/tests/org/elixir_lang/elixir_flex_lexer/DecimalIntegerTest.java b/tests/org/elixir_lang/elixir_flex_lexer/DecimalIntegerTest.java index 924733fc6..2a1bee7b2 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/DecimalIntegerTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/DecimalIntegerTest.java @@ -52,7 +52,7 @@ public static Collection generateData() { { "&", ElixirTypes.CAPTURE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "'", ElixirTypes.CHAR_LIST_PROMOTER, ElixirFlexLexer.GROUP, true }, { "'''", ElixirTypes.CHAR_LIST_HEREDOC_PROMOTER, ElixirFlexLexer.GROUP_HEREDOC_START, true }, - { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL, true }, + { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE, true }, { ")", ElixirTypes.CLOSING_PARENTHESIS, ElixirFlexLexer.YYINITIAL, true }, { "*", ElixirTypes.MULTIPLICATION_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "+", ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION, true }, diff --git a/tests/org/elixir_lang/elixir_flex_lexer/DotOperationTest.java b/tests/org/elixir_lang/elixir_flex_lexer/DotOperationTest.java index 06f57b3a5..8e2937570 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/DotOperationTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/DotOperationTest.java @@ -50,7 +50,7 @@ public void andOperatorParentheses() throws IOException { lexer.advance(); - assertEquals(ElixirFlexLexer.YYINITIAL, lexer.getState()); + assertEquals(ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE, lexer.getState()); lexer.advance(); @@ -76,7 +76,7 @@ public void andOperatorParenthesis() throws IOException { lexer.advance(); - assertEquals(ElixirFlexLexer.YYINITIAL, lexer.getState()); + assertEquals(ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE, lexer.getState()); lexer.advance(); diff --git a/tests/org/elixir_lang/elixir_flex_lexer/DotRelativeIdentifierParenthesesCallTest.java b/tests/org/elixir_lang/elixir_flex_lexer/DotRelativeIdentifierParenthesesCallTest.java index 2631e1a0f..5c95e23fe 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/DotRelativeIdentifierParenthesesCallTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/DotRelativeIdentifierParenthesesCallTest.java @@ -49,7 +49,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.AND_SYMBOL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -57,7 +57,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.AND_SYMBOL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -65,7 +65,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -73,7 +73,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -81,7 +81,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -89,7 +89,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -97,7 +97,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -105,7 +105,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -113,7 +113,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -121,7 +121,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -129,7 +129,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, /* NOTE: not parsed as ASSOCIATION_OPERATOR because => is not captured as an operator in the @@ -139,7 +139,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.MATCH_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -154,7 +154,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.AT_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -164,7 +164,7 @@ public static Collection generateData() { new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -172,7 +172,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.CAPTURE_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -180,7 +180,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.AFTER, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -188,7 +188,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -196,7 +196,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.AND_WORD_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -204,7 +204,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -212,7 +212,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.CATCH, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -220,7 +220,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -228,7 +228,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.DO, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -236,7 +236,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -244,7 +244,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.ELSE, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -252,7 +252,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -260,7 +260,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.END, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -268,7 +268,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -276,7 +276,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IN_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -284,7 +284,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -292,7 +292,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -300,7 +300,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -308,7 +308,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.OR_WORD_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -316,7 +316,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -324,7 +324,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.RESCUE, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -332,7 +332,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -340,7 +340,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.COMPARISON_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -348,7 +348,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.COMPARISON_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -356,7 +356,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.COMPARISON_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -364,7 +364,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -372,7 +372,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -380,7 +380,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.THREE_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -388,7 +388,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.OR_SYMBOL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -396,7 +396,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.OR_SYMBOL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -404,7 +404,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.UNARY_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -412,7 +412,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.UNARY_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -420,7 +420,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.UNARY_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -428,7 +428,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IN_MATCH_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -436,7 +436,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IN_MATCH_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -447,7 +447,7 @@ public static Collection generateData() { new TokenTypeState(ElixirTypes.STRUCT_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.OPENING_CURLY, ElixirFlexLexer.YYINITIAL), new TokenTypeState(ElixirTypes.CLOSING_CURLY, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -455,7 +455,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.MATCH_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -463,7 +463,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.MULTIPLICATION_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -471,7 +471,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.DIVISION_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -479,7 +479,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.PIPE_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -487,7 +487,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -495,7 +495,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -503,7 +503,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -511,7 +511,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -519,7 +519,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.STAB_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -527,7 +527,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.STRUCT_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -537,7 +537,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.OPENING_CURLY, ElixirFlexLexer.YYINITIAL), new TokenTypeState(ElixirTypes.CLOSING_CURLY, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -545,7 +545,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -553,7 +553,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, /* "." would actually be parsed as ".." with the leading "." in reset */ @@ -562,7 +562,7 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.CALL_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) } } @@ -594,8 +594,6 @@ public void identifierCall() throws IOException { lastState = tokenTypeState.state; } - - assertEquals(lastState, ElixirFlexLexer.YYINITIAL); } @Override diff --git a/tests/org/elixir_lang/elixir_flex_lexer/HexadecimalIntegerTest.java b/tests/org/elixir_lang/elixir_flex_lexer/HexadecimalIntegerTest.java index 123acc33c..e06505279 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/HexadecimalIntegerTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/HexadecimalIntegerTest.java @@ -52,7 +52,7 @@ public static Collection generateData() { { "&", ElixirTypes.CAPTURE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE }, { "'", ElixirTypes.CHAR_LIST_PROMOTER, ElixirFlexLexer.GROUP }, { "'''", ElixirTypes.CHAR_LIST_HEREDOC_PROMOTER, ElixirFlexLexer.GROUP_HEREDOC_START }, - { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL }, + { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE }, { ")", ElixirTypes.CLOSING_PARENTHESIS, ElixirFlexLexer.YYINITIAL }, { "*", ElixirTypes.MULTIPLICATION_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE }, { "+", ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION }, diff --git a/tests/org/elixir_lang/elixir_flex_lexer/InterpolationTest.java b/tests/org/elixir_lang/elixir_flex_lexer/InterpolationTest.java index 2581c4bae..66bd11127 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/InterpolationTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/InterpolationTest.java @@ -44,14 +44,14 @@ public static Collection generateData() { { "&&&", ElixirTypes.AND_SYMBOL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { "'", ElixirTypes.CHAR_LIST_PROMOTER, ElixirFlexLexer.GROUP, true }, { "'''", ElixirTypes.CHAR_LIST_HEREDOC_PROMOTER, ElixirFlexLexer.GROUP_HEREDOC_START, true }, - { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL, true }, + { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE, true }, { ")", ElixirTypes.CLOSING_PARENTHESIS, ElixirFlexLexer.YYINITIAL, true }, { "+", ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION, true}, { "++", ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { ",", ElixirTypes.COMMA, ElixirFlexLexer.SIGN_OPERATION_MAYBE, true }, { "-", ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION, true}, { "--", ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, - { "->", ElixirTypes.STAB_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "->", ElixirTypes.STAB_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { ".", ElixirTypes.DOT_OPERATOR, ElixirFlexLexer.DOT_OPERATION, true }, { "..", ElixirTypes.RANGE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { "...", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, @@ -113,22 +113,22 @@ public static Collection generateData() { { "\t", TokenType.WHITE_SPACE, ElixirFlexLexer.YYINITIAL, true }, { "^", ElixirTypes.UNARY_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { "_identifier", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "after", ElixirTypes.AFTER, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "after", ElixirTypes.AFTER, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "afterwards", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "and", ElixirTypes.AND_WORD_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { "androids", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true}, - { "catch", ElixirTypes.CATCH, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "catch", ElixirTypes.CATCH, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "catchall", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "defmodule", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "do", ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "do", ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "done", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "else", ElixirTypes.ELSE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "else", ElixirTypes.ELSE, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "elsewhere", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "end", ElixirTypes.END, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "ending", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "false", ElixirTypes.FALSE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "falsehood", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "fn", ElixirTypes.FN, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "fn", ElixirTypes.FN, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "fnctn", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "identifier!", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "identifier", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, @@ -142,7 +142,7 @@ public static Collection generateData() { { "notifiers", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true}, { "or", ElixirTypes.OR_WORD_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "order", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "rescue", ElixirTypes.RESCUE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "rescue", ElixirTypes.RESCUE, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "rescuer", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "true", ElixirTypes.TRUE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "truest", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, diff --git a/tests/org/elixir_lang/elixir_flex_lexer/OctalIntegerTest.java b/tests/org/elixir_lang/elixir_flex_lexer/OctalIntegerTest.java index 8236ad5fb..0c6aee243 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/OctalIntegerTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/OctalIntegerTest.java @@ -52,7 +52,7 @@ public static Collection generateData() { { "&", ElixirTypes.CAPTURE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE }, { "'", ElixirTypes.CHAR_LIST_PROMOTER, ElixirFlexLexer.GROUP }, { "'''", ElixirTypes.CHAR_LIST_HEREDOC_PROMOTER, ElixirFlexLexer.GROUP_HEREDOC_START }, - { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL }, + { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE }, { ")", ElixirTypes.CLOSING_PARENTHESIS, ElixirFlexLexer.YYINITIAL }, { "*", ElixirTypes.MULTIPLICATION_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE }, { "+", ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION }, diff --git a/tests/org/elixir_lang/elixir_flex_lexer/ParenthesesCallTest.java b/tests/org/elixir_lang/elixir_flex_lexer/ParenthesesCallTest.java index 002353e90..6d27a77aa 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/ParenthesesCallTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/ParenthesesCallTest.java @@ -40,7 +40,7 @@ public ParenthesesCallTest(CharSequence identifierCharSequence, List generateData() { return Arrays.asList(new Object[][]{ @@ -48,84 +48,84 @@ public static Collection generateData() { "&&", Arrays.asList( new TokenTypeState(ElixirTypes.AND_SYMBOL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "&&&", Arrays.asList( new TokenTypeState(ElixirTypes.AND_SYMBOL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "<<<", Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "<<~", Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "<|>", Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "<~>", Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { ">>>", Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "~>>", Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "<~", Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "|>", Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "~>", Arrays.asList( new TokenTypeState(ElixirTypes.ARROW_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "=>", Arrays.asList( new TokenTypeState(ElixirTypes.ASSOCIATION_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -139,7 +139,7 @@ public static Collection generateData() { "@", Arrays.asList( new TokenTypeState(ElixirTypes.AT_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -147,21 +147,21 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.OPENING_BIT, ElixirFlexLexer.YYINITIAL), new TokenTypeState(ElixirTypes.CLOSING_BIT, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "&", Arrays.asList( new TokenTypeState(ElixirTypes.CAPTURE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "after", Arrays.asList( - new TokenTypeState(ElixirTypes.AFTER, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.AFTER, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -169,14 +169,14 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "and", Arrays.asList( new TokenTypeState(ElixirTypes.AND_WORD_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -184,14 +184,14 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "catch", Arrays.asList( - new TokenTypeState(ElixirTypes.CATCH, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.CATCH, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -199,14 +199,14 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "do", Arrays.asList( - new TokenTypeState(ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -214,14 +214,14 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "else", Arrays.asList( - new TokenTypeState(ElixirTypes.ELSE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.ELSE, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -229,14 +229,14 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "end", Arrays.asList( new TokenTypeState(ElixirTypes.END, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -244,14 +244,14 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "in", Arrays.asList( new TokenTypeState(ElixirTypes.IN_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -259,14 +259,14 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "not", Arrays.asList( new TokenTypeState(ElixirTypes.NOT_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -274,14 +274,14 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "or", Arrays.asList( new TokenTypeState(ElixirTypes.OR_WORD_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -289,14 +289,14 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "rescue", Arrays.asList( - new TokenTypeState(ElixirTypes.RESCUE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.RESCUE, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -304,98 +304,98 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.CALL, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "!==", Arrays.asList( new TokenTypeState(ElixirTypes.COMPARISON_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "===", Arrays.asList( new TokenTypeState(ElixirTypes.COMPARISON_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "!=", Arrays.asList( new TokenTypeState(ElixirTypes.COMPARISON_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "+", Arrays.asList( new TokenTypeState(ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "-", Arrays.asList( new TokenTypeState(ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "^^^", Arrays.asList( new TokenTypeState(ElixirTypes.THREE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "||", Arrays.asList( new TokenTypeState(ElixirTypes.OR_SYMBOL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "|||", Arrays.asList( new TokenTypeState(ElixirTypes.OR_SYMBOL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "~~~", Arrays.asList( new TokenTypeState(ElixirTypes.UNARY_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "!", Arrays.asList( new TokenTypeState(ElixirTypes.UNARY_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "^", Arrays.asList( new TokenTypeState(ElixirTypes.UNARY_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "<-", Arrays.asList( new TokenTypeState(ElixirTypes.IN_MATCH_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "\\\\", Arrays.asList( new TokenTypeState(ElixirTypes.IN_MATCH_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -404,77 +404,77 @@ public static Collection generateData() { new TokenTypeState(ElixirTypes.STRUCT_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), new TokenTypeState(ElixirTypes.OPENING_CURLY, ElixirFlexLexer.YYINITIAL), new TokenTypeState(ElixirTypes.CLOSING_CURLY, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "=", Arrays.asList( new TokenTypeState(ElixirTypes.MATCH_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "*", Arrays.asList( new TokenTypeState(ElixirTypes.MULTIPLICATION_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "/", Arrays.asList( new TokenTypeState(ElixirTypes.DIVISION_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "|", Arrays.asList( new TokenTypeState(ElixirTypes.PIPE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "<=", Arrays.asList( new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { ">=", Arrays.asList( new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "<", Arrays.asList( new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { ">", Arrays.asList( new TokenTypeState(ElixirTypes.RELATIONAL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "->", Arrays.asList( - new TokenTypeState(ElixirTypes.STAB_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.STAB_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "%", Arrays.asList( new TokenTypeState(ElixirTypes.STRUCT_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { @@ -482,35 +482,35 @@ public static Collection generateData() { Arrays.asList( new TokenTypeState(ElixirTypes.OPENING_CURLY, ElixirFlexLexer.YYINITIAL), new TokenTypeState(ElixirTypes.CLOSING_CURLY, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "++", Arrays.asList( new TokenTypeState(ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "--", Arrays.asList( new TokenTypeState(ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "..", Arrays.asList( new TokenTypeState(ElixirTypes.RANGE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) }, { "<>", Arrays.asList( new TokenTypeState(ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL) + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE) ) } } @@ -525,19 +525,13 @@ public static Collection generateData() { public void identifierCall() { start(identifierCharSequence); - int lastState = -1; - for (TokenTypeState tokenTypeState: tokenTypeStates) { assertEquals(tokenTypeState.tokenType, lexer.getTokenType()); lexer.advance(); assertEquals(tokenTypeState.state, lexer.getState()); - - lastState = tokenTypeState.state; } - - assertEquals(lastState, ElixirFlexLexer.YYINITIAL); } @Override diff --git a/tests/org/elixir_lang/elixir_flex_lexer/SigilPromoterTest.java b/tests/org/elixir_lang/elixir_flex_lexer/SigilPromoterTest.java index 32b76af71..351f858a0 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/SigilPromoterTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/SigilPromoterTest.java @@ -52,11 +52,11 @@ public static Collection generateData() { new TokenTypeState(TokenType.WHITE_SPACE, ElixirFlexLexer.YYINITIAL), new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(TokenType.WHITE_SPACE, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL), + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE), new TokenTypeState(ElixirTypes.CLOSING_PARENTHESIS, ElixirFlexLexer.YYINITIAL), new TokenTypeState(TokenType.WHITE_SPACE, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_MAYBE), - new TokenTypeState(ElixirTypes.EOL, ElixirFlexLexer.SIGN_OPERATION_MAYBE), + new TokenTypeState(ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE), + new TokenTypeState(TokenType.WHITE_SPACE, ElixirFlexLexer.YYINITIAL), new TokenTypeState(ElixirTypes.END, ElixirFlexLexer.KEYWORD_PAIR_MAYBE) ) }, @@ -67,7 +67,7 @@ public static Collection generateData() { new TokenTypeState(TokenType.WHITE_SPACE, ElixirFlexLexer.YYINITIAL), new TokenTypeState(ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE), new TokenTypeState(TokenType.WHITE_SPACE, ElixirFlexLexer.YYINITIAL), - new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL), + new TokenTypeState(ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE), new TokenTypeState(ElixirTypes.TILDE, ElixirFlexLexer.SIGIL), new TokenTypeState(TokenType.BAD_CHARACTER, ElixirFlexLexer.SIGIL), // ) new TokenTypeState(TokenType.BAD_CHARACTER, ElixirFlexLexer.SIGIL), // space diff --git a/tests/org/elixir_lang/elixir_flex_lexer/SigilTest.java b/tests/org/elixir_lang/elixir_flex_lexer/SigilTest.java index 41799aeaa..b8f0f21cb 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/SigilTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/SigilTest.java @@ -38,7 +38,7 @@ protected void start(CharSequence charSequence) { } @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList(new Object[][]{ diff --git a/tests/org/elixir_lang/elixir_flex_lexer/UnknownBaseIntegerTest.java b/tests/org/elixir_lang/elixir_flex_lexer/UnknownBaseIntegerTest.java index 05c5c437d..1018ae129 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/UnknownBaseIntegerTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/UnknownBaseIntegerTest.java @@ -52,7 +52,7 @@ public static Collection generateData() { { "&", ElixirTypes.CAPTURE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE }, { "'", ElixirTypes.CHAR_LIST_PROMOTER, ElixirFlexLexer.GROUP }, { "'''", ElixirTypes.CHAR_LIST_HEREDOC_PROMOTER, ElixirFlexLexer.GROUP_HEREDOC_START }, - { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.YYINITIAL }, + { "(", ElixirTypes.OPENING_PARENTHESIS, ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE }, { ")", ElixirTypes.CLOSING_PARENTHESIS, ElixirFlexLexer.YYINITIAL }, { "*", ElixirTypes.MULTIPLICATION_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE }, { "+", ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION }, diff --git a/tests/org/elixir_lang/elixir_flex_lexer/YYInitialTest.java b/tests/org/elixir_lang/elixir_flex_lexer/YYInitialTest.java index 684da33d0..bbfe7e6c9 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/YYInitialTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/YYInitialTest.java @@ -10,6 +10,8 @@ import java.util.Arrays; import java.util.Collection; +import static org.elixir_lang.ElixirFlexLexer.MULTILINE_WHITE_SPACE_MAYBE; + /** * Created by luke.imhoff on 9/1/14. */ @@ -55,14 +57,14 @@ public static Collection generateData() { { "&&&", ElixirTypes.AND_SYMBOL_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { "'", ElixirTypes.CHAR_LIST_PROMOTER, ElixirFlexLexer.GROUP, true }, { "'''", ElixirTypes.CHAR_LIST_HEREDOC_PROMOTER, ElixirFlexLexer.GROUP_HEREDOC_START, true }, - { "(", ElixirTypes.OPENING_PARENTHESIS, INITIAL_STATE, true }, + { "(", ElixirTypes.OPENING_PARENTHESIS, MULTILINE_WHITE_SPACE_MAYBE, true }, { ")", ElixirTypes.CLOSING_PARENTHESIS, INITIAL_STATE, true }, { "+", ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION, true}, { "++", ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { ",", ElixirTypes.COMMA, ElixirFlexLexer.SIGN_OPERATION_MAYBE, true }, { "-", ElixirTypes.DUAL_OPERATOR, ElixirFlexLexer.DUAL_OPERATION, true}, { "--", ElixirTypes.TWO_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, - { "->", ElixirTypes.STAB_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "->", ElixirTypes.STAB_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { ".", ElixirTypes.DOT_OPERATOR, ElixirFlexLexer.DOT_OPERATION, true }, { "..", ElixirTypes.RANGE_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { "...", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, @@ -123,22 +125,22 @@ public static Collection generateData() { { "]", ElixirTypes.CLOSING_BRACKET, INITIAL_STATE, true }, { "^", ElixirTypes.UNARY_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { "_identifier", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "after", ElixirTypes.AFTER, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "after", ElixirTypes.AFTER, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "afterwards", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "and", ElixirTypes.AND_WORD_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true}, { "androids", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true}, - { "catch", ElixirTypes.CATCH, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "catch", ElixirTypes.CATCH, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "catchall", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "defmodule", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "do", ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "do", ElixirTypes.DO, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "done", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "else", ElixirTypes.ELSE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "else", ElixirTypes.ELSE, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "elsewhere", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "end", ElixirTypes.END, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "ending", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "false", ElixirTypes.FALSE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "falsehood", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "fn", ElixirTypes.FN, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "fn", ElixirTypes.FN, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "fnctn", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "identifier!", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "identifier", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, @@ -152,7 +154,7 @@ public static Collection generateData() { { "notifiers", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true}, { "or", ElixirTypes.OR_WORD_OPERATOR, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "order", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, - { "rescue", ElixirTypes.RESCUE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, + { "rescue", ElixirTypes.RESCUE, ElixirFlexLexer.KEYWORD_PAIR_OR_MULTILINE_WHITE_SPACE_MAYBE, true }, { "rescuer", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, { "true", ElixirTypes.TRUE, ElixirFlexLexer.KEYWORD_PAIR_MAYBE, true }, { "truest", ElixirTypes.IDENTIFIER_TOKEN, ElixirFlexLexer.CALL_OR_KEYWORD_PAIR_MAYBE, true }, diff --git a/tests/org/elixir_lang/elixir_flex_lexer/atom_start/FragmentTest.java b/tests/org/elixir_lang/elixir_flex_lexer/atom_start/FragmentTest.java index b01e42c79..e52b108bb 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/atom_start/FragmentTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/atom_start/FragmentTest.java @@ -40,7 +40,7 @@ protected void start(@NotNull CharSequence charSequence) { } @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList(new Object[][] { diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingBraceTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingBraceTest.java index 0d709e9e6..4a8e47c41 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingBraceTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingBraceTest.java @@ -32,7 +32,7 @@ protected char promoter() { @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Test.generateData( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingBracketTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingBracketTest.java index 4afa29395..1746c67b1 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingBracketTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingBracketTest.java @@ -32,7 +32,7 @@ protected char promoter() { @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Test.generateData( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingChevronTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingChevronTest.java index 3d2ba39f6..47f48b9bf 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingChevronTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingChevronTest.java @@ -32,7 +32,7 @@ protected char promoter() { @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Test.generateData( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingParenthesisTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingParenthesisTest.java index 7a9417417..ad2d1a29a 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingParenthesisTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ClosingParenthesisTest.java @@ -31,7 +31,7 @@ protected char promoter() { } @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Test.generateData( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ForwardSlashTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ForwardSlashTest.java index 363ac4ad8..575344d66 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ForwardSlashTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/ForwardSlashTest.java @@ -33,7 +33,7 @@ protected char promoter() { @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Test.generateData( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/PipeTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/PipeTest.java index 394887864..2f1229e21 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/PipeTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group/sigil/PipeTest.java @@ -32,7 +32,7 @@ protected char promoter() { } @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Test.generateData( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/CharListTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/CharListTest.java index 87d875a07..f8ee01668 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/CharListTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/CharListTest.java @@ -30,7 +30,7 @@ public CharListTest(CharSequence charSequence, IElementType tokenType, int lexic */ @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/CustomTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/CustomTest.java index 54b351d54..9bef3a0eb 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/CustomTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/CustomTest.java @@ -30,7 +30,7 @@ public CustomTest(CharSequence charSequence, IElementType tokenType, int lexical */ @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/RegexTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/RegexTest.java index 439390bad..589873da9 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/RegexTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/RegexTest.java @@ -30,7 +30,7 @@ public RegexTest(CharSequence charSequence, IElementType tokenType, int lexicalS */ @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/StringTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/StringTest.java index 75229a24a..ae3f43326 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/StringTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/StringTest.java @@ -30,7 +30,7 @@ public StringTest(CharSequence charSequence, IElementType tokenType, int lexical */ @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/WordsTest.java b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/WordsTest.java index 4938d1dff..44c0c2d5e 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/WordsTest.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/group_heredoc_line_start/sigil/WordsTest.java @@ -30,7 +30,7 @@ public WordsTest(CharSequence charSequence, IElementType tokenType, int lexicalS */ @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList( diff --git a/tests/org/elixir_lang/elixir_flex_lexer/sigil_modifiers/group/Test.java b/tests/org/elixir_lang/elixir_flex_lexer/sigil_modifiers/group/Test.java index 9c718ef96..36d596efd 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/sigil_modifiers/group/Test.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/sigil_modifiers/group/Test.java @@ -32,7 +32,7 @@ public Test(CharSequence charSequence, IElementType tokenType, int lexicalState) */ @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList(new Object[][]{ diff --git a/tests/org/elixir_lang/elixir_flex_lexer/sigil_modifiers/group_heredoc_end/Test.java b/tests/org/elixir_lang/elixir_flex_lexer/sigil_modifiers/group_heredoc_end/Test.java index e1465931f..db7820c24 100644 --- a/tests/org/elixir_lang/elixir_flex_lexer/sigil_modifiers/group_heredoc_end/Test.java +++ b/tests/org/elixir_lang/elixir_flex_lexer/sigil_modifiers/group_heredoc_end/Test.java @@ -31,7 +31,7 @@ public Test(CharSequence charSequence, IElementType tokenType, int lexicalState) */ @Parameterized.Parameters( - name = "\"{0}\" parses as {1} token and advances to state {2}" + name = "{index} \"{0}\" parses as {1} token and advances to state {2}" ) public static Collection generateData() { return Arrays.asList(new Object[][]{ diff --git a/tests/org/elixir_lang/parser_definition/Issue580.java b/tests/org/elixir_lang/parser_definition/Issue580.java new file mode 100644 index 000000000..362444c93 --- /dev/null +++ b/tests/org/elixir_lang/parser_definition/Issue580.java @@ -0,0 +1,44 @@ +package org.elixir_lang.parser_definition; + +public class Issue580 extends ParsingTestCase { + public void testFn1() { + assertParsedAndQuotedCorrectly(); + } + + public void testFn2() { + assertParsedAndQuotedCorrectly(); + } + + public void testFn3() { + assertParsedAndQuotedCorrectly(); + } + + public void testFn4() { + assertParsedAndQuotedCorrectly(); + } + + public void testFn5() { + assertParsedAndQuotedCorrectly(); + } + + public void testFn6() { + assertParsedAndQuotedCorrectly(); + } + + public void testFn7() { + assertParsedAndQuotedCorrectly(); + } + + public void testFn8() { + assertParsedAndQuotedCorrectly(); + } + + public void testFnStructNoParenthesesManyArguments() { + assertParsedAndQuotedCorrectly(); + } + + @Override + protected String getTestDataPath() { + return super.getTestDataPath() + "/issue_580"; + } +} diff --git a/tests/org/elixir_lang/reference/callable/IntramoduleTest.java b/tests/org/elixir_lang/reference/callable/IntramoduleTest.java index ffe2d5305..c98dd5f2b 100644 --- a/tests/org/elixir_lang/reference/callable/IntramoduleTest.java +++ b/tests/org/elixir_lang/reference/callable/IntramoduleTest.java @@ -19,7 +19,6 @@ public void testAmbiguousBackReference() { PsiElement ambiguous = myFixture .getFile() .findElementAt(myFixture.getCaretOffset()) - .getParent() .getPrevSibling(); assertInstanceOf(ambiguous.getFirstChild(), ElixirIdentifier.class); @@ -43,7 +42,6 @@ public void testAmbiguousForwardReference() { PsiElement ambiguous = myFixture .getFile() .findElementAt(myFixture.getCaretOffset()) - .getParent() .getPrevSibling(); assertInstanceOf(ambiguous.getFirstChild(), ElixirIdentifier.class); @@ -67,7 +65,6 @@ public void testAmbiguousRecursiveReference() { PsiElement ambiguous = myFixture .getFile() .findElementAt(myFixture.getCaretOffset()) - .getParent() .getPrevSibling(); assertInstanceOf(ambiguous.getFirstChild(), ElixirIdentifier.class); diff --git a/tests/org/elixir_lang/reference/callable/Issue429Test.java b/tests/org/elixir_lang/reference/callable/Issue429Test.java index 1ce7d01e7..1e89a0d6a 100644 --- a/tests/org/elixir_lang/reference/callable/Issue429Test.java +++ b/tests/org/elixir_lang/reference/callable/Issue429Test.java @@ -1,18 +1,11 @@ package org.elixir_lang.reference.callable; -import com.intellij.codeInsight.completion.CompletionType; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiPolyVariantReference; -import com.intellij.psi.ResolveResult; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.SearchScope; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; -import org.elixir_lang.psi.ElixirAlias; import org.elixir_lang.psi.call.Call; -import java.util.Arrays; -import java.util.List; - public class Issue429Test extends LightCodeInsightFixtureTestCase { /* * Tests @@ -23,10 +16,11 @@ public void testUseScope() { PsiElement callable = myFixture .getFile() .findElementAt(myFixture.getCaretOffset()) - .getParent() .getPrevSibling() .getLastChild() .getLastChild() + .getLastChild() + .getLastChild() .getLastChild(); assertInstanceOf(callable, Call.class); diff --git a/tests/org/elixir_lang/reference/module/AsTest.java b/tests/org/elixir_lang/reference/module/AsTest.java index 99949a177..951a671c0 100644 --- a/tests/org/elixir_lang/reference/module/AsTest.java +++ b/tests/org/elixir_lang/reference/module/AsTest.java @@ -1,6 +1,5 @@ package org.elixir_lang.reference.module; -import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiPolyVariantReference; import com.intellij.psi.ResolveResult;