historical typo fixed: getDependences: usages 2

This commit is contained in:
Gregory.Shrago
2018-07-10 16:46:33 +03:00
parent 0cbf01a717
commit b1d522dbfc
20 changed files with 10 additions and 109 deletions
@@ -27,7 +27,6 @@ import com.intellij.psi.meta.PsiMetaData;
import com.intellij.psi.meta.PsiMetaOwner;
import com.intellij.psi.meta.PsiPresentableMetaData;
import com.intellij.psi.util.PropertyUtilBase;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -89,12 +88,6 @@ public class BeanPropertyElement extends FakePsiElement implements PsiMetaOwner,
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
@Nullable
public Icon getIcon(boolean flags) {
@@ -24,7 +24,6 @@ import com.intellij.psi.PsiManager;
import com.intellij.psi.meta.PsiMetaData;
import com.intellij.psi.meta.PsiMetaOwner;
import com.intellij.psi.meta.PsiPresentableMetaData;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -92,12 +91,6 @@ public abstract class RenameableFakePsiElement extends FakePsiElement implements
public void init(final PsiElement element) {
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
@Nullable
public final Icon getIcon(final boolean open) {
@@ -11,7 +11,6 @@ import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.psi.xml.XmlDocument;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ArrayUtil;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlNSDescriptor;
import org.jetbrains.annotations.NotNull;
@@ -83,12 +82,6 @@ public class JavaFxNamespaceDescriptor implements XmlNSDescriptor, Validator<Xml
myFile = ((XmlFile)document.getContainingFile());
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public void validate(@NotNull XmlDocument context, @NotNull ValidationHost host) {}
}
@@ -23,7 +23,6 @@ import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlAttributeValue;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ArrayUtil;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlElementsGroup;
@@ -226,12 +225,6 @@ public class JavaFxBuiltInTagDescriptor implements XmlElementDescriptor, Validat
public void init(PsiElement element) {
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public void validate(@NotNull XmlTag context, @NotNull ValidationHost host) {
final XmlTag referencedTag = getReferencedTag(context);
@@ -12,7 +12,6 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.*;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.XmlElementDescriptor;
@@ -300,12 +299,6 @@ public abstract class JavaFxClassTagDescriptorBase implements XmlElementDescript
public void init(PsiElement element) {
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public void validate(@NotNull XmlTag context, @NotNull ValidationHost host) {
final XmlTag parentTag = context.getParentTag();
@@ -292,12 +292,6 @@ public class JavaFxPropertyAttributeDescriptor extends BasicXmlAttributeDescript
public void init(PsiElement element) {
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public String toString() {
return (myPsiClass != null ? myPsiClass.getName() + "#" : "?#") + myName;
@@ -11,7 +11,6 @@ import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ArrayUtil;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlElementsGroup;
@@ -192,12 +191,6 @@ public class JavaFxPropertyTagDescriptor implements XmlElementDescriptor {
@Override
public void init(PsiElement element) {}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public String toString() {
return "<" + (myStatic ? "static " : "") + (myPsiClass != null ? myPsiClass.getName() + "#" : "?#") + myName + ">";
@@ -25,7 +25,6 @@ import com.intellij.psi.PsiReferenceBase;
import com.intellij.psi.meta.PsiMetaData;
import com.intellij.psi.meta.PsiMetaOwner;
import com.intellij.psi.meta.PsiPresentableMetaData;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import org.intellij.plugins.relaxNG.compact.RncTokenTypes;
import org.intellij.plugins.relaxNG.compact.psi.*;
@@ -173,11 +172,5 @@ public class RncDefineImpl extends RncElementImpl implements RncDefine, PsiMetaO
@Override
public void init(PsiElement element) {
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
}
}
@@ -359,9 +359,10 @@ public class RngElementDescriptor implements XmlElementDescriptor {
@Override
public Object[] getDependencies() {
if (myDeclaration != null) {
return ArrayUtil.append(this.getDependencies(), myDeclaration.getElement());
} else {
return this.getDependencies();
return ArrayUtil.append(myNsDescriptor.getDependencies(), myDeclaration.getElement());
}
else {
return myNsDescriptor.getDependencies();
}
}
@@ -190,7 +190,7 @@ public class RngXmlAttributeDescriptor extends BasicXmlAttributeDescriptor {
@NotNull
@Override
public Object[] getDependencies() {
return this.getDependencies();
return myElementDescriptor.getDependencies();
}
@Override
@@ -109,7 +109,7 @@ public class DelegatingRelaxedHtmlElementDescriptor implements XmlElementDescrip
@NotNull
@Override
public Object[] getDependencies() {
return this.getDependencies();
return myDelegate.getDependencies();
}
@Override
@@ -17,11 +17,9 @@ package com.intellij.psi.impl.source.html.dtd;
import com.intellij.psi.PsiElement;
import com.intellij.psi.xml.XmlElement;
import com.intellij.util.ArrayUtil;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.impl.BasicXmlAttributeDescriptor;
import com.intellij.xml.impl.XmlEnumerationDescriptor;
import org.jetbrains.annotations.NotNull;
/**
* @author Maxim.Mossienko
@@ -97,12 +95,6 @@ public class HtmlAttributeDescriptorImpl extends BasicXmlAttributeDescriptor {
delegate.init(element);
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public String toString() {
return delegate.toString();
@@ -198,7 +198,7 @@ public class HtmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl {
@NotNull
@Override
public Object[] getDependencies() {
return this.getDependencies();
return myDelegate.getDependencies();
}
@Override
@@ -169,7 +169,7 @@ public class HtmlNSDescriptorImpl implements XmlNSDescriptor, DumbAware, XmlNSTy
@NotNull
@Override
public Object[] getDependencies() {
return myDelegate == null ? ArrayUtil.EMPTY_OBJECT_ARRAY : this.getDependencies();
return myDelegate == null ? ArrayUtil.EMPTY_OBJECT_ARRAY : myDelegate.getDependencies();
}
@Override
@@ -32,7 +32,6 @@ import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlAttributeValue;
import com.intellij.psi.xml.XmlElementType;
import com.intellij.psi.xml.XmlTokenType;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import org.intellij.lang.regexp.DefaultRegExpPropertiesProvider;
import org.intellij.lang.regexp.RegExpLanguageHost;
@@ -179,12 +178,6 @@ public class XmlAttributeValueImpl extends XmlElementImpl implements XmlAttribut
public void init(final PsiElement element) {
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public ItemPresentation getPresentation() {
return new ItemPresentationWithSeparator() {
@@ -20,7 +20,6 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.xml.XmlElement;
import com.intellij.util.ArrayUtil;
import com.intellij.xml.XmlAttributeDescriptor;
import org.jetbrains.annotations.NotNull;
public class AnyXmlAttributeDescriptor implements XmlAttributeDescriptor {
private final String myAttributeName;
@@ -54,12 +53,6 @@ public class AnyXmlAttributeDescriptor implements XmlAttributeDescriptor {
public void init(PsiElement element){
}
@NotNull
@Override
public Object[] getDependencies(){
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
public String getQualifiedName() {
return myAttributeName;
}
@@ -19,12 +19,10 @@ package com.intellij.xml.impl.schema;
import com.intellij.psi.PsiElement;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ArrayUtil;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlElementsGroup;
import com.intellij.xml.XmlNSDescriptor;
import org.jetbrains.annotations.NotNull;
public class AnyXmlElementDescriptor implements XmlElementDescriptor {
private final XmlElementDescriptor myParentDescriptor;
@@ -64,12 +62,6 @@ public class AnyXmlElementDescriptor implements XmlElementDescriptor {
public void init(PsiElement element){
}
@NotNull
@Override
public Object[] getDependencies(){
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public String getQualifiedName() {
return myParentDescriptor.getQualifiedName();
@@ -22,12 +22,10 @@ package com.intellij.xml.impl.schema;
import com.intellij.psi.PsiElement;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ArrayUtil;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlElementsGroup;
import com.intellij.xml.XmlNSDescriptor;
import org.jetbrains.annotations.NotNull;
public class NullElementDescriptor implements XmlElementDescriptor {
private static final NullElementDescriptor INSTANCE = new NullElementDescriptor();
@@ -113,10 +111,4 @@ public class NullElementDescriptor implements XmlElementDescriptor {
@Override
public void init(PsiElement element) {
}
@NotNull
@Override
public Object[] getDependencies() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
}
@@ -25,7 +25,6 @@ import com.intellij.util.IncorrectOperationException;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.XmlElementDescriptor;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -64,12 +63,6 @@ public class XmlAttributeDescriptorImpl extends XsdEnumerationDescriptor impleme
myUse = myTag.getAttributeValue("use");
}
@NotNull
@Override
public Object[] getDependencies(){
return ArrayUtil.EMPTY_OBJECT_ARRAY;
}
@Override
public boolean isRequired() {
return REQUIRED_ATTR_VALUE.equals(myUse);
@@ -114,9 +114,9 @@ public class XmlNSDescriptorSequence implements XmlNSDescriptor{
@NotNull
@Override
public Object[] getDependencies(){
final List<Object> ret = new ArrayList<>();
List<Object> ret = new ArrayList<>();
for (XmlNSDescriptor descriptor : sequence) {
ContainerUtil.addAll(ret, this.getDependencies());
ContainerUtil.addAll(ret, descriptor.getDependencies());
}
return ret.toArray();
}