Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GRAM: improve parser recovery in function arguments #7019

Merged
merged 1 commit into from Mar 31, 2021
Merged

GRAM: improve parser recovery in function arguments #7019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/grammars/RustParser.bnf
View file
Open in desktop
Expand Up @@ -1302,7 +1302,13 @@ private IndexArg ::= '[' Expr ']'
CallExpr ::= Expr !<<isCompleteBlockExpr>> ValueArgumentList {
elementTypeFactory = "org.rust.lang.core.stubs.StubImplementationsKt.factory"
}
ValueArgumentList ::= '(' <<comma_separated_list AnyExpr>>? ')' { pin = 1 }
ValueArgumentList ::= '(' ValueArgument_with_recover* ')' { pin = 1 }

private ValueArgument_with_recover ::= !')' AnyExpr (',' | &')') {
pin = 1
recoverWhile = ValueArgument_recover
}
private ValueArgument_recover ::= !(Expr_first | ')' | '}' | Item_first | let | ';')

DotExpr ::= Expr '.' MethodOrField {
elementTypeFactory = "org.rust.lang.core.stubs.StubImplementationsKt.factory"
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/rust/lang/core/parser/RustParserDefinition.kt
View file
Open in desktop
Expand Up @@ -92,6 +92,6 @@ class RustParserDefinition : ParserDefinition {
/**
* Should be increased after any change of parser rules
*/
const val PARSER_VERSION: Int = LEXER_VERSION + 24
const val PARSER_VERSION: Int = LEXER_VERSION + 25
}
}
2 changes: 0 additions & 2 deletions src/test/kotlin/org/rust/ide/typing/assist/RsSmartEnterProcessorTest.kt
View file
Open in desktop
Expand Up @@ -27,12 +27,10 @@ class RsSmartEnterProcessorTest : RsTestBase() {
fun `test fix nested method call`() = doTest("""
fn double(x: i32) -> i32 {
/*caret*/double(double(x
double(x)
}
""", """
fn double(x: i32) -> i32 {
double(double(x));/*caret*/
double(x)
}
""")

Expand Down
2 changes: 2 additions & 0 deletions src/test/resources/org/rust/lang/core/parser/fixtures/complete/expr.rs
View file
Open in desktop
Expand Up @@ -70,6 +70,8 @@ fn test() -> u32 {

|| { 0; yield 0; };

foo(bar, true, "", 1, 1.1);

return (x = y) /* return */
+ 1
}
29 changes: 29 additions & 0 deletions src/test/resources/org/rust/lang/core/parser/fixtures/complete/expr.txt
View file
Open in desktop
Expand Up @@ -832,6 +832,35 @@ FILE
PsiElement(})('}')
PsiElement(;)(';')
PsiWhiteSpace('\n\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('bar')
PsiElement(,)(',')
PsiWhiteSpace(' ')
RsLitExprImpl(LIT_EXPR)
PsiElement(BOOL_LITERAL)('true')
PsiElement(,)(',')
PsiWhiteSpace(' ')
RsLitExprImpl(LIT_EXPR)
PsiElement(STRING_LITERAL)('""')
PsiElement(,)(',')
PsiWhiteSpace(' ')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('1')
PsiElement(,)(',')
PsiWhiteSpace(' ')
RsLitExprImpl(LIT_EXPR)
PsiElement(FLOAT_LITERAL)('1.1')
PsiElement())(')')
PsiElement(;)(';')
PsiWhiteSpace('\n\n ')
RsRetExprImpl(RET_EXPR)
PsiElement(return)('return')
PsiWhiteSpace(' ')
Expand Down
20 changes: 20 additions & 0 deletions src/test/resources/org/rust/lang/core/parser/fixtures/partial/exprs.rs
View file
Open in desktop
Expand Up @@ -11,4 +11,24 @@ fn foo() {
for a in b {}

let _ = 0.0.0e92;

foo1(1, , 2);
foo2(,, 2);
foo3(1,,);

foo4(1,;
foo5(;

foo6(1,
let _ = 0;
foo7(
let _ = 0;

{ foo8(1, };
{ foo9( };

foo10(1,
fn a() {}
foo11(
fn a() {}
}
207 changes: 207 additions & 0 deletions src/test/resources/org/rust/lang/core/parser/fixtures/partial/exprs.txt
View file
Open in desktop
Expand Up @@ -111,5 +111,212 @@ FILE
RsFieldLookupImpl(FIELD_LOOKUP)
PsiElement(INTEGER_LITERAL)('0e92')
PsiElement(;)(';')
PsiWhiteSpace('\n\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo1')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('1')
PsiElement(,)(',')
PsiWhiteSpace(' ')
PsiErrorElement:',' unexpected
PsiElement(,)(',')
PsiWhiteSpace(' ')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('2')
PsiElement())(')')
PsiElement(;)(';')
PsiWhiteSpace('\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo2')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
PsiErrorElement:<expr> expected, got ','
<empty list>
PsiElement(,)(',')
PsiElement(,)(',')
PsiWhiteSpace(' ')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('2')
PsiElement())(')')
PsiElement(;)(';')
PsiWhiteSpace('\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo3')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('1')
PsiElement(,)(',')
PsiErrorElement:',' unexpected
PsiElement(,)(',')
PsiElement())(')')
PsiElement(;)(';')
PsiWhiteSpace('\n\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo4')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('1')
PsiElement(,)(',')
PsiErrorElement:<expr> expected, got ';'
<empty list>
PsiElement(;)(';')
PsiWhiteSpace('\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo5')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
PsiErrorElement:<expr> expected, got ';'
<empty list>
PsiElement(;)(';')
PsiWhiteSpace('\n\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo6')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('1')
PsiElement(,)(',')
PsiErrorElement:<expr> expected, got 'let'
<empty list>
PsiWhiteSpace('\n ')
RsLetDeclImpl(LET_DECL)
PsiElement(let)('let')
PsiWhiteSpace(' ')
RsPatWildImpl(PAT_WILD)
PsiElement(_)('_')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('0')
PsiElement(;)(';')
PsiWhiteSpace('\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo7')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
PsiErrorElement:<expr> expected, got 'let'
<empty list>
PsiWhiteSpace('\n ')
RsLetDeclImpl(LET_DECL)
PsiElement(let)('let')
PsiWhiteSpace(' ')
RsPatWildImpl(PAT_WILD)
PsiElement(_)('_')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('0')
PsiElement(;)(';')
PsiWhiteSpace('\n\n ')
RsExprStmtImpl(EXPR_STMT)
RsBlockExprImpl(BLOCK_EXPR)
RsBlockImpl(BLOCK)
PsiElement({)('{')
PsiWhiteSpace(' ')
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo8')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('1')
PsiElement(,)(',')
PsiErrorElement:<expr> expected, got '}'
<empty list>
PsiWhiteSpace(' ')
PsiElement(})('}')
PsiElement(;)(';')
PsiWhiteSpace('\n ')
RsExprStmtImpl(EXPR_STMT)
RsBlockExprImpl(BLOCK_EXPR)
RsBlockImpl(BLOCK)
PsiElement({)('{')
PsiWhiteSpace(' ')
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo9')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
PsiErrorElement:<expr> expected, got '}'
<empty list>
PsiWhiteSpace(' ')
PsiElement(})('}')
PsiElement(;)(';')
PsiWhiteSpace('\n\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo10')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
RsLitExprImpl(LIT_EXPR)
PsiElement(INTEGER_LITERAL)('1')
PsiElement(,)(',')
PsiErrorElement:<expr> expected, got 'fn'
<empty list>
PsiWhiteSpace('\n ')
RsFunctionImpl(FUNCTION)
PsiElement(fn)('fn')
PsiWhiteSpace(' ')
PsiElement(identifier)('a')
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
PsiElement(()('(')
PsiElement())(')')
PsiWhiteSpace(' ')
RsBlockImpl(BLOCK)
PsiElement({)('{')
PsiElement(})('}')
PsiWhiteSpace('\n ')
RsExprStmtImpl(EXPR_STMT)
RsCallExprImpl(CALL_EXPR)
RsPathExprImpl(PATH_EXPR)
RsPathImpl(PATH)
PsiElement(identifier)('foo11')
RsValueArgumentListImpl(VALUE_ARGUMENT_LIST)
PsiElement(()('(')
PsiErrorElement:<expr> expected, got 'fn'
<empty list>
PsiWhiteSpace('\n ')
RsFunctionImpl(FUNCTION)
PsiElement(fn)('fn')
PsiWhiteSpace(' ')
PsiElement(identifier)('a')
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
PsiElement(()('(')
PsiElement())(')')
PsiWhiteSpace(' ')
RsBlockImpl(BLOCK)
PsiElement({)('{')
PsiElement(})('}')
PsiWhiteSpace('\n')
PsiElement(})('}')