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

Fix fragment element types class hierarchy.

Browse Source 
They must not extend `IStubFileElementType`.

#KT-55160 Fixed
This commit is contained in:
Vladimir Dolzhenko
2022-11-28 13:19:22 +01:00
committed by Space Team
parent e751b11b5e
commit af08e4121d
3 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockCodeFragmentType.java
+4 -9
View File
@@ -22,21 +22,16 @@ import com.intellij.lang.PsiBuilder;
import com.intellij.lang.PsiBuilderFactory; import com.intellij.lang.PsiBuilderFactory;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.tree.ICodeFragmentElementType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.parsing.KotlinParser; import org.jetbrains.kotlin.parsing.KotlinParser;
import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType;
public class KtBlockCodeFragmentType extends KtFileElementType { public class KtBlockCodeFragmentType extends ICodeFragmentElementType {
private static final String NAME = "kotlin.BLOCK_CODE_FRAGMENT"; private static final String NAME = "kotlin.BLOCK_CODE_FRAGMENT";
public KtBlockCodeFragmentType() { public KtBlockCodeFragmentType() {
super(NAME); super(NAME, KotlinLanguage.INSTANCE);
}
@NotNull
@Override
public String getExternalId() {
return NAME;
} }
@Override @Override
compiler/psi/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragmentType.java
+4 -9
View File
@@ -22,21 +22,16 @@ import com.intellij.lang.PsiBuilder;
import com.intellij.lang.PsiBuilderFactory; import com.intellij.lang.PsiBuilderFactory;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.tree.ICodeFragmentElementType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.parsing.KotlinParser; import org.jetbrains.kotlin.parsing.KotlinParser;
import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType;
public class KtExpressionCodeFragmentType extends KtFileElementType { public class KtExpressionCodeFragmentType extends ICodeFragmentElementType {
private static final String NAME = "kotlin.EXPRESSION_CODE_FRAGMENT"; private static final String NAME = "kotlin.EXPRESSION_CODE_FRAGMENT";
public KtExpressionCodeFragmentType() { public KtExpressionCodeFragmentType() {
super(NAME); super(NAME, KotlinLanguage.INSTANCE);
}
@NotNull
@Override
public String getExternalId() {
return NAME;
} }
@Override @Override
compiler/psi/src/org/jetbrains/kotlin/psi/KtTypeCodeFragmentType.java
+4 -9
View File
@@ -22,21 +22,16 @@ import com.intellij.lang.PsiBuilder;
import com.intellij.lang.PsiBuilderFactory; import com.intellij.lang.PsiBuilderFactory;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.tree.ICodeFragmentElementType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.parsing.KotlinParser; import org.jetbrains.kotlin.parsing.KotlinParser;
import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType;
public class KtTypeCodeFragmentType extends KtFileElementType { public class KtTypeCodeFragmentType extends ICodeFragmentElementType {
private static final String NAME = "kotlin.TYPE_CODE_FRAGMENT"; private static final String NAME = "kotlin.TYPE_CODE_FRAGMENT";
public KtTypeCodeFragmentType() { public KtTypeCodeFragmentType() {
super(NAME); super(NAME, KotlinLanguage.INSTANCE);
}
@NotNull
@Override
public String getExternalId() {
return NAME;
} }
@Override @Override