[psi] remove unused super interface from java psi

given that the interface itself is not used externally,
the change is binary compatible

^KT-64320 fixed
This commit is contained in:
Anna Kozlova
2023-12-13 22:02:01 +01:00
committed by Space Team
parent cf57b44a1e
commit 033f330703
5 changed files with 11 additions and 17 deletions
@@ -20,7 +20,6 @@ import com.intellij.lang.Language;
import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.PsiModifiableCodeBlock;
import com.intellij.psi.impl.source.tree.CompositeElement; import com.intellij.psi.impl.source.tree.CompositeElement;
import com.intellij.psi.impl.source.tree.LazyParseablePsiElement; import com.intellij.psi.impl.source.tree.LazyParseablePsiElement;
import com.intellij.psi.util.PsiUtilCore; import com.intellij.psi.util.PsiUtilCore;
@@ -40,13 +39,13 @@ import java.util.List;
import static org.jetbrains.kotlin.KtNodeTypes.BLOCK; import static org.jetbrains.kotlin.KtNodeTypes.BLOCK;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public class KtBlockExpression extends LazyParseablePsiElement implements KtElement, KtExpression, KtStatementExpression, PsiModifiableCodeBlock { public class KtBlockExpression extends LazyParseablePsiElement implements KtElement, KtExpression, KtStatementExpression {
public KtBlockExpression(@Nullable CharSequence text) { public KtBlockExpression(@Nullable CharSequence text) {
super(BLOCK, text); super(BLOCK, text);
} }
@Override @SuppressWarnings({"unused", "MethodMayBeStatic"}) //keep for compatibility with potential plugins
public boolean shouldChangeModificationCount(PsiElement place) { public boolean shouldChangeModificationCount(PsiElement place) {
// To prevent OutOfBlockModification increase from JavaCodeBlockModificationListener // To prevent OutOfBlockModification increase from JavaCodeBlockModificationListener
return false; return false;
@@ -45,8 +45,7 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) :
KtAnnotated, KtAnnotated,
KtElement, KtElement,
PsiClassOwner, PsiClassOwner,
PsiNamedElement, PsiNamedElement {
PsiModifiableCodeBlock {
@Volatile @Volatile
private var isScript: Boolean? = null private var isScript: Boolean? = null
@@ -295,7 +294,8 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) :
override fun getPsiOrParent(): KtElement = this override fun getPsiOrParent(): KtElement = this
override fun shouldChangeModificationCount(place: PsiElement): Boolean { @Suppress("unused") //keep for compatibility with potential plugins
fun shouldChangeModificationCount(@Suppress("UNUSED_PARAMETER") place: PsiElement): Boolean {
// Modification count for Kotlin files is tracked entirely by KotlinCodeBlockModificationListener // Modification count for Kotlin files is tracked entirely by KotlinCodeBlockModificationListener
return false return false
} }
@@ -19,8 +19,6 @@ package org.jetbrains.kotlin.psi;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiModifiableCodeBlock;
import com.intellij.psi.impl.source.tree.LazyParseablePsiElement; import com.intellij.psi.impl.source.tree.LazyParseablePsiElement;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -30,7 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt;
import java.util.List; import java.util.List;
public class KtLambdaExpression extends LazyParseablePsiElement implements KtExpression, PsiModifiableCodeBlock { public class KtLambdaExpression extends LazyParseablePsiElement implements KtExpression {
public KtLambdaExpression(CharSequence text) { public KtLambdaExpression(CharSequence text) {
super(KtNodeTypes.LAMBDA_EXPRESSION, text); super(KtNodeTypes.LAMBDA_EXPRESSION, text);
} }
@@ -107,7 +105,7 @@ public class KtLambdaExpression extends LazyParseablePsiElement implements KtExp
return this; return this;
} }
@Override @SuppressWarnings({"unused", "MethodMayBeStatic"}) //keep for compatibility with potential plugins
public boolean shouldChangeModificationCount(PsiElement place) { public boolean shouldChangeModificationCount(PsiElement place) {
return false; return false;
} }
@@ -20,7 +20,6 @@ import com.intellij.lang.ASTNode;
import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.ItemPresentationProviders; import com.intellij.navigation.ItemPresentationProviders;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiModifiableCodeBlock;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -35,7 +34,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
public class KtNamedFunction extends KtTypeParameterListOwnerStub<KotlinFunctionStub> public class KtNamedFunction extends KtTypeParameterListOwnerStub<KotlinFunctionStub>
implements KtFunction, KtDeclarationWithInitializer, PsiModifiableCodeBlock { implements KtFunction, KtDeclarationWithInitializer {
public KtNamedFunction(@NotNull ASTNode node) { public KtNamedFunction(@NotNull ASTNode node) {
super(node); super(node);
} }
@@ -263,7 +262,7 @@ public class KtNamedFunction extends KtTypeParameterListOwnerStub<KotlinFunction
return getParent() instanceof KtFile; return getParent() instanceof KtFile;
} }
@Override @SuppressWarnings({"unused", "MethodMayBeStatic"}) //keep for compatibility with potential plugins
public boolean shouldChangeModificationCount(PsiElement place) { public boolean shouldChangeModificationCount(PsiElement place) {
// Suppress Java check for out-of-block // Suppress Java check for out-of-block
return false; return false;
@@ -21,11 +21,9 @@ import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.ItemPresentationProviders; import com.intellij.navigation.ItemPresentationProviders;
import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiModifiableCodeBlock;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet; import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.AstLoadingFilter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.KtNodeTypes; import org.jetbrains.kotlin.KtNodeTypes;
@@ -41,7 +39,7 @@ import static org.jetbrains.kotlin.KtNodeTypes.PROPERTY_DELEGATE;
import static org.jetbrains.kotlin.lexer.KtTokens.EQ; import static org.jetbrains.kotlin.lexer.KtTokens.EQ;
public class KtProperty extends KtTypeParameterListOwnerStub<KotlinPropertyStub> public class KtProperty extends KtTypeParameterListOwnerStub<KotlinPropertyStub>
implements KtVariableDeclaration, PsiModifiableCodeBlock { implements KtVariableDeclaration {
private static final Logger LOG = Logger.getInstance(KtProperty.class); private static final Logger LOG = Logger.getInstance(KtProperty.class);
@@ -345,7 +343,7 @@ public class KtProperty extends KtTypeParameterListOwnerStub<KotlinPropertyStub>
return ItemPresentationProviders.getItemPresentation(this); return ItemPresentationProviders.getItemPresentation(this);
} }
@Override @SuppressWarnings({"unused", "MethodMayBeStatic"}) //keep for compatibility with potential plugins
public boolean shouldChangeModificationCount(PsiElement place) { public boolean shouldChangeModificationCount(PsiElement place) {
// Suppress Java check for out-of-block // Suppress Java check for out-of-block
return false; return false;