From 7f16d69e25dff256d74f5924152d36ec53e7515e Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 17 Dec 2018 14:07:22 +0100 Subject: [PATCH] remove PsiMetaOwner inheritance from PsiAnnotation it confuses implementers (e.g. in Kotlin plugin) and hopefully isn't needed nowadays --- java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java | 3 +-- .../com/intellij/psi/impl/compiled/ClsAnnotationImpl.java | 7 ------- .../intellij/psi/impl/compiled/ClsAnnotationValueImpl.java | 7 ------- .../psi/impl/source/tree/java/PsiAnnotationImpl.java | 7 ------- .../psi/impl/auxiliary/annotation/GrAnnotationImpl.java | 7 ------- .../groovy/lang/psi/impl/synthetic/GrLightAnnotation.java | 6 ------ 6 files changed, 1 insertion(+), 36 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java index edb887a2e6d0..bf030cfc238c 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java @@ -3,7 +3,6 @@ package com.intellij.psi; import com.intellij.lang.jvm.JvmAnnotation; import com.intellij.lang.jvm.annotation.JvmAnnotationAttribute; -import com.intellij.psi.meta.PsiMetaOwner; import com.intellij.util.ArrayFactory; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -17,7 +16,7 @@ import java.util.List; * * @author ven */ -public interface PsiAnnotation extends PsiAnnotationMemberValue, PsiMetaOwner, JvmAnnotation { +public interface PsiAnnotation extends PsiAnnotationMemberValue, JvmAnnotation { /** * The empty array of PSI annotations which can be reused to avoid unnecessary allocations. */ diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java index 21c064095a63..b5528b9190d6 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java @@ -21,10 +21,8 @@ import com.intellij.pom.Navigatable; import com.intellij.psi.*; import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.impl.java.stubs.PsiAnnotationStub; -import com.intellij.psi.impl.meta.MetaRegistry; import com.intellij.psi.impl.source.SourceTreeToPsiMap; import com.intellij.psi.impl.source.tree.TreeElement; -import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -131,11 +129,6 @@ public class ClsAnnotationImpl extends ClsRepositoryPsiElement imp } } - @Override - public PsiMetaData getMetaData() { - return MetaRegistry.getMetaBase(this); - } - @Nullable @Override public PsiAnnotationOwner getOwner() { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java index cd63a087e8f7..68b1bc74ecc3 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java @@ -9,7 +9,6 @@ import com.intellij.psi.*; import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.impl.light.LightClassReference; import com.intellij.psi.impl.source.tree.java.PsiAnnotationImpl; -import com.intellij.psi.meta.PsiMetaData; import com.intellij.util.PairFunction; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -112,12 +111,6 @@ public class GrAnnotationImpl extends GrStubElementBase implem return (T)PsiImplUtil.setDeclaredAttributeValue(this, attributeName, value, ANNOTATION_CREATOR); } - @Override - @Nullable - public PsiMetaData getMetaData() { - return null; - } - @Override @NotNull public GrCodeReferenceElement getClassReference() { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightAnnotation.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightAnnotation.java index 82447c8bd4ce..0fcec4dce8d4 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightAnnotation.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightAnnotation.java @@ -7,7 +7,6 @@ import com.intellij.psi.*; import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.impl.light.LightClassReference; import com.intellij.psi.impl.light.LightElement; -import com.intellij.psi.meta.PsiMetaData; import com.intellij.util.containers.ContainerUtilRt; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -149,11 +148,6 @@ public class GrLightAnnotation extends LightElement implements GrAnnotation { return myOwner; } - @Override - public PsiMetaData getMetaData() { - return null; - } - public void addAttribute(PsiNameValuePair pair) { if (pair instanceof GrAnnotationNameValuePair) { myAnnotationArgList.addAttribute((GrAnnotationNameValuePair)pair);