azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No duplicate "Expecting ')'" when parsing accessor

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-15 17:49:34 +03:00
parent 00fbf41bd8
commit 617fe9b49d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
+6 -2
View File
@@ -1320,8 +1320,12 @@ public class JetParsing extends AbstractJetParsing {
setterParameter.done(VALUE_PARAMETER); setterParameter.done(VALUE_PARAMETER);
parameterList.done(VALUE_PARAMETER_LIST); parameterList.done(VALUE_PARAMETER_LIST);
} }
if (!at(RPAR)) errorUntil("Expecting ')'", TokenSet.create(RPAR, COLON, LBRACE, RBRACE, EQ, EOL_OR_SEMICOLON)); if (!at(RPAR)) {
expect(RPAR, "Expecting ')'", TokenSet.create(RPAR, COLON, LBRACE, EQ)); errorUntil("Expecting ')'", TokenSet.create(RPAR, COLON, LBRACE, RBRACE, EQ, EOL_OR_SEMICOLON));
}
if (at(RPAR)) {
advance();
}
myBuilder.restoreNewlinesState(); myBuilder.restoreNewlinesState();
if (at(COLON)) { if (at(COLON)) {
compiler/testData/psi/recovery/IncompleteAccessor1.txt
+1 -1
View File
@@ -25,7 +25,7 @@ JetFile: IncompleteAccessor1.kt
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
PsiErrorElement:Expecting ')' PsiErrorElement:Expecting ')'
<empty list> <empty list>
PsiErrorElement:Expecting ')' PsiErrorElement:Expecting function body
<empty list> <empty list>
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')