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

Make myExpressionParsing final (Parser)

Browse Source
This commit is contained in:
Ivan Kochurkin
2022-08-01 14:59:20 +02:00
committed by teamcity
parent daeb41b411
commit c0fe14a091
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/parsing/KotlinParsing.java
+20 -22
View File
@@ -106,32 +106,14 @@ public class KotlinParsing extends AbstractKotlinParsing {
private final static TokenSet CLASS_INTERFACE_SET = TokenSet.create(CLASS_KEYWORD, INTERFACE_KEYWORD); private final static TokenSet CLASS_INTERFACE_SET = TokenSet.create(CLASS_KEYWORD, INTERFACE_KEYWORD);
static KotlinParsing createForTopLevel(SemanticWhitespaceAwarePsiBuilder builder) { static KotlinParsing createForTopLevel(SemanticWhitespaceAwarePsiBuilder builder) {
KotlinParsing kotlinParsing = new KotlinParsing(builder); return new KotlinParsing(builder, true);
kotlinParsing.myExpressionParsing = new KotlinExpressionParsing(builder, kotlinParsing);
return kotlinParsing;
} }
private static KotlinParsing createForByClause(SemanticWhitespaceAwarePsiBuilder builder) { private static KotlinParsing createForByClause(SemanticWhitespaceAwarePsiBuilder builder) {
SemanticWhitespaceAwarePsiBuilderForByClause builderForByClause = new SemanticWhitespaceAwarePsiBuilderForByClause(builder); return new KotlinParsing(new SemanticWhitespaceAwarePsiBuilderForByClause(builder), false);
KotlinParsing kotlinParsing = new KotlinParsing(builderForByClause);
kotlinParsing.myExpressionParsing = new KotlinExpressionParsing(builderForByClause, kotlinParsing) {
@Override
protected boolean parseCallWithClosure() {
if (builderForByClause.getStackSize() > 0) {
return super.parseCallWithClosure();
}
return false;
}
@Override
protected KotlinParsing create(SemanticWhitespaceAwarePsiBuilder builder) {
return createForByClause(builder);
}
};
return kotlinParsing;
} }
private KotlinExpressionParsing myExpressionParsing; private final KotlinExpressionParsing myExpressionParsing;
private final FirstBefore lastDotAfterReceiverLParPattern = new FirstBefore( private final FirstBefore lastDotAfterReceiverLParPattern = new FirstBefore(
new AtSet(RECEIVER_TYPE_TERMINATORS), new AtSet(RECEIVER_TYPE_TERMINATORS),
@@ -160,8 +142,24 @@ public class KotlinParsing extends AbstractKotlinParsing {
} }
}); });
private KotlinParsing(SemanticWhitespaceAwarePsiBuilder builder) { private KotlinParsing(SemanticWhitespaceAwarePsiBuilder builder, boolean isTopLevel) {
super(builder); super(builder);
myExpressionParsing = isTopLevel
? new KotlinExpressionParsing(builder, this)
: new KotlinExpressionParsing(builder, this) {
@Override
protected boolean parseCallWithClosure() {
if (((SemanticWhitespaceAwarePsiBuilderForByClause) builder).getStackSize() > 0) {
return super.parseCallWithClosure();
}
return false;
}
@Override
protected KotlinParsing create(SemanticWhitespaceAwarePsiBuilder builder) {
return createForByClause(builder);
}
};
} }
/* /*