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

Evaluator: Do not report parsing error on empty block/expression (KT-11938)

Browse Source
This commit is contained in:
Yan Zhulanow
2019-06-20 17:15:21 +09:00
parent 6d7d524b9b
commit 6686ed2e38
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockCodeFragmentType.java
+5
View File
@@ -22,6 +22,7 @@ import com.intellij.lang.PsiBuilder;
import com.intellij.lang.PsiBuilderFactory;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import kotlin.text.StringsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.parsing.KotlinParser;
import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType;
@@ -41,6 +42,10 @@ public class KtBlockCodeFragmentType extends KtFileElementType {
@Override
protected ASTNode doParseContents(@NotNull ASTNode chameleon, @NotNull PsiElement psi) {
if (StringsKt.isBlank(chameleon.getText())) {
return null;
}
Project project = psi.getProject();
Language languageForParser = getLanguageForParser(psi);
PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, chameleon.getChars());
compiler/psi/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragmentType.java
+5
View File
@@ -22,6 +22,7 @@ import com.intellij.lang.PsiBuilder;
import com.intellij.lang.PsiBuilderFactory;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import kotlin.text.StringsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.parsing.KotlinParser;
import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType;
@@ -41,6 +42,10 @@ public class KtExpressionCodeFragmentType extends KtFileElementType {
@Override
protected ASTNode doParseContents(@NotNull ASTNode chameleon, @NotNull PsiElement psi) {
if (StringsKt.isBlank(chameleon.getText())) {
return null;
}
Project project = psi.getProject();
Language languageForParser = getLanguageForParser(psi);
PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, chameleon.getChars());