mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
remove PsiMetaOwner inheritance from PsiAnnotation
it confuses implementers (e.g. in Kotlin plugin) and hopefully isn't needed nowadays
This commit is contained in:
@@ -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.
|
||||
*/
|
||||
|
||||
@@ -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<PsiAnnotationStub
|
||||
return buffer.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PsiMetaData getMetaData() {
|
||||
return MetaRegistry.getMetaBase(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PsiAnnotationOwner getOwner() {
|
||||
return (PsiAnnotationOwner)getParent();//todo
|
||||
|
||||
@@ -18,10 +18,8 @@ package com.intellij.psi.impl.compiled;
|
||||
import com.intellij.pom.Navigatable;
|
||||
import com.intellij.psi.*;
|
||||
import com.intellij.psi.impl.PsiImplUtil;
|
||||
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 org.jetbrains.annotations.NonNls;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
@@ -120,9 +118,4 @@ abstract class ClsAnnotationValueImpl extends ClsElementImpl implements PsiAnnot
|
||||
appendMirrorText(0, buffer);
|
||||
return buffer.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PsiMetaData getMetaData() {
|
||||
return MetaRegistry.getMetaBase(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,11 +22,9 @@ import com.intellij.psi.*;
|
||||
import com.intellij.psi.impl.PsiImplUtil;
|
||||
import com.intellij.psi.impl.java.stubs.JavaStubElementTypes;
|
||||
import com.intellij.psi.impl.java.stubs.PsiAnnotationStub;
|
||||
import com.intellij.psi.impl.meta.MetaRegistry;
|
||||
import com.intellij.psi.impl.source.JavaStubPsiElement;
|
||||
import com.intellij.psi.impl.source.PsiClassReferenceType;
|
||||
import com.intellij.psi.impl.source.tree.JavaSharedImplUtil;
|
||||
import com.intellij.psi.meta.PsiMetaData;
|
||||
import com.intellij.psi.util.PsiTreeUtil;
|
||||
import com.intellij.util.PairFunction;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
@@ -117,11 +115,6 @@ public class PsiAnnotationImpl extends JavaStubPsiElement<PsiAnnotationStub> imp
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PsiMetaData getMetaData() {
|
||||
return MetaRegistry.getMetaBase(this);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public PsiAnnotationOwner getOwner() {
|
||||
|
||||
-7
@@ -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<GrAnnotationStub> implem
|
||||
return (T)PsiImplUtil.setDeclaredAttributeValue(this, attributeName, value, ANNOTATION_CREATOR);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public PsiMetaData getMetaData() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@NotNull
|
||||
public GrCodeReferenceElement getClassReference() {
|
||||
|
||||
-6
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user