No duplicate "Expecting ')'" when parsing accessor

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
@@ -1320,8 +1320,12 @@ public class JetParsing extends AbstractJetParsing {
setterParameter.done(VALUE_PARAMETER);
parameterList.done(VALUE_PARAMETER_LIST);
}
if (!at(RPAR)) errorUntil("Expecting ')'", TokenSet.create(RPAR, COLON, LBRACE, RBRACE, EQ, EOL_OR_SEMICOLON));
expect(RPAR, "Expecting ')'", TokenSet.create(RPAR, COLON, LBRACE, EQ));
if (!at(RPAR)) {
errorUntil("Expecting ')'", TokenSet.create(RPAR, COLON, LBRACE, RBRACE, EQ, EOL_OR_SEMICOLON));
}
if (at(RPAR)) {
advance();
}
myBuilder.restoreNewlinesState();
if (at(COLON)) {
@@ -25,7 +25,7 @@ JetFile: IncompleteAccessor1.kt
PsiElement(LPAR)('(')
PsiErrorElement:Expecting ')'
<empty list>
PsiErrorElement:Expecting ')'
PsiErrorElement:Expecting function body
<empty list>
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')