KT-621 Remove .foo() pattern matching from when (Rename method and correct grammar)
This commit is contained in:
@@ -120,6 +120,11 @@ import static org.jetbrains.jet.lexer.JetTokens.*;
|
||||
myBuilder.advanceLexer();
|
||||
}
|
||||
|
||||
protected void advanceAtSet(final TokenSet set) {
|
||||
assert _atSet(set);
|
||||
myBuilder.advanceLexer();
|
||||
}
|
||||
|
||||
protected IElementType tt() {
|
||||
return myBuilder.getTokenType();
|
||||
}
|
||||
|
||||
@@ -275,7 +275,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
|
||||
|
||||
precedence.parseHigherPrecedence(this);
|
||||
|
||||
while (!breakedWithNewLine() && atSet(precedence.getOperations())) {
|
||||
while (!interruptedWithNewLine() && atSet(precedence.getOperations())) {
|
||||
IElementType operation = tt();
|
||||
|
||||
parseOperationReference();
|
||||
@@ -331,7 +331,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
|
||||
PsiBuilder.Marker expression = mark();
|
||||
parseAtomicExpression();
|
||||
while (true) {
|
||||
if (breakedWithNewLine()) {
|
||||
if (interruptedWithNewLine()) {
|
||||
break;
|
||||
}
|
||||
else if (at(LBRACKET)) {
|
||||
@@ -1708,7 +1708,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
|
||||
return myJetParsing.create(builder);
|
||||
}
|
||||
|
||||
private boolean breakedWithNewLine() {
|
||||
private boolean interruptedWithNewLine() {
|
||||
return !ALLOW_NEWLINE_OPERATIONS.contains(tt()) && myBuilder.newlineBeforeCurrentToken();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,6 @@ whenEntry
|
||||
|
||||
whenCondition
|
||||
: expression
|
||||
: ("." | "?.") postfixUnaryExpression typeArguments? valueArguments?
|
||||
: ("in" | "!in") expression
|
||||
: ("is" | "!is") isRHS
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user