mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
cleanup
This commit is contained in:
@@ -104,6 +104,7 @@ public class RegExpBackrefImpl extends RegExpElementImpl implements RegExpBackre
|
||||
return RegExpBackrefImpl.this.resolve();
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
@@ -118,6 +118,7 @@ public class RegExpPropertyImpl extends RegExpElementImpl implements RegExpPrope
|
||||
return false;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final ASTNode categoryNode = getCategoryNode();
|
||||
if (categoryNode != null && categoryNode.getText().startsWith("In") && !categoryNode.getText().startsWith("Intelli")) {
|
||||
|
||||
@@ -141,11 +141,11 @@ public class CompileContextExProxy implements CompileContextEx {
|
||||
return myDelegate.isRebuild();
|
||||
}
|
||||
|
||||
public <T> T getUserData(final Key<T> key) {
|
||||
public <T> T getUserData(@NotNull final Key<T> key) {
|
||||
return myDelegate.getUserData(key);
|
||||
}
|
||||
|
||||
public <T> void putUserData(final Key<T> key, final T value) {
|
||||
public <T> void putUserData(@NotNull final Key<T> key, final T value) {
|
||||
myDelegate.putUserData(key, value);
|
||||
}
|
||||
|
||||
|
||||
@@ -89,7 +89,7 @@ public class CompositeScope extends UserDataHolderBase implements CompileScope{
|
||||
return modules.toArray(new Module[modules.size()]);
|
||||
}
|
||||
|
||||
public <T> T getUserData(Key<T> key) {
|
||||
public <T> T getUserData(@NotNull Key<T> key) {
|
||||
for (CompileScope compileScope : myScopes) {
|
||||
T userData = compileScope.getUserData(key);
|
||||
if (userData != null) {
|
||||
|
||||
@@ -66,7 +66,7 @@ public class TrackDependenciesScope extends UserDataHolderBase implements Compil
|
||||
}
|
||||
}
|
||||
|
||||
public <T> T getUserData(final Key<T> key) {
|
||||
public <T> T getUserData(@NotNull final Key<T> key) {
|
||||
T userData = myDelegate.getUserData(key);
|
||||
if (userData != null) {
|
||||
return userData;
|
||||
|
||||
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.Computable;
|
||||
import com.intellij.openapi.util.Key;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.pom.Navigatable;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class DummyCompileContext implements CompileContext {
|
||||
@@ -99,11 +100,11 @@ public class DummyCompileContext implements CompileContext {
|
||||
return null;
|
||||
}
|
||||
|
||||
public <T> T getUserData(Key<T> key) {
|
||||
public <T> T getUserData(@NotNull Key<T> key) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public <T> void putUserData(Key<T> key, T value) {
|
||||
public <T> void putUserData(@NotNull Key<T> key, T value) {
|
||||
}
|
||||
|
||||
public boolean isMake() {
|
||||
@@ -113,4 +114,4 @@ public class DummyCompileContext implements CompileContext {
|
||||
public boolean isRebuild() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,7 +98,7 @@ public abstract class FacetEditorContextBase extends UserDataHolderBase implemen
|
||||
public abstract ArtifactsStructureConfigurableContext getArtifactsStructureContext();
|
||||
|
||||
@Nullable
|
||||
public <T> T getUserData(final Key<T> key) {
|
||||
public <T> T getUserData(@NotNull final Key<T> key) {
|
||||
T t = super.getUserData(key);
|
||||
if (t == null && myParentContext != null) {
|
||||
t = myParentContext.getUserData(key);
|
||||
|
||||
@@ -206,6 +206,7 @@ public class ClsJavaCodeReferenceElementImpl extends ClsElementImpl implements P
|
||||
|| getManager().areElementsEquivalent(resolve(), element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
throw new RuntimeException("Variants are not available for references to compiled code");
|
||||
}
|
||||
|
||||
@@ -145,6 +145,7 @@ public class ClsReferenceExpressionImpl extends ClsElementImpl implements PsiRef
|
||||
return myPatternExpression.isReferenceTo(element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return myPatternExpression.getVariants();
|
||||
}
|
||||
|
||||
@@ -146,6 +146,7 @@ public class ClsTypeParameterReferenceImpl extends ClsElementImpl implements Psi
|
||||
throw new IncorrectOperationException(CAN_NOT_MODIFY_MESSAGE);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
throw new RuntimeException("Variants are not available for references to compiled code");
|
||||
}
|
||||
|
||||
@@ -228,6 +228,7 @@ public class LightClassReference extends LightElement implements PsiJavaCodeRefe
|
||||
return getManager().areElementsEquivalent(resolve(), element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
throw new RuntimeException("Variants are not available for light references");
|
||||
}
|
||||
|
||||
@@ -48,6 +48,7 @@ public class LightClassReferenceExpression extends LightClassReference implement
|
||||
return getManager().areElementsEquivalent(resolve(), element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
throw new RuntimeException("Variants are not available for light references");
|
||||
}
|
||||
|
||||
@@ -144,6 +144,7 @@ public class LightMemberReference extends LightElement implements PsiJavaCodeRef
|
||||
return element instanceof PsiClass && element.getManager().areElementsEquivalent(resolve(), element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
throw new RuntimeException("Variants are not available for light references");
|
||||
}
|
||||
|
||||
@@ -114,6 +114,7 @@ public class LightPackageReference extends LightElement implements PsiJavaCodeRe
|
||||
return getManager().areElementsEquivalent(resolve(), element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
throw new RuntimeException("Variants are not available for light references");
|
||||
}
|
||||
|
||||
@@ -202,6 +202,7 @@ public class PsiEnumConstantImpl extends JavaStubPsiElement<PsiFieldStub> implem
|
||||
throw new IncorrectOperationException("Invalid operation");
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
+1
@@ -383,6 +383,7 @@ public class PsiImportStaticReferenceElementImpl extends CompositePsiElement imp
|
||||
PsiScopesUtil.resolveAndWalk(proc, this, null, true);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
// IMPLEMENT[dsl]
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
|
||||
@@ -694,6 +694,7 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
|
||||
myCachedTextSkipWhiteSpaceAndComments = null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final ElementFilter filter;
|
||||
switch (getKind()) {
|
||||
|
||||
@@ -86,6 +86,7 @@ public class PsiLabelReference implements PsiReference{
|
||||
return resolve() == element;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants(){
|
||||
final List result = new ArrayList();
|
||||
PsiElement context = myStatement;
|
||||
|
||||
@@ -116,6 +116,7 @@ public class PsiDocMethodOrFieldRef extends CompositePsiElement implements PsiDo
|
||||
}
|
||||
|
||||
return new MyReference(method) {
|
||||
@NotNull
|
||||
public PsiElement[] getVariants() {
|
||||
final List<PsiMethod> lst = new ArrayList<PsiMethod>();
|
||||
for (PsiMethod method : methods) {
|
||||
@@ -240,6 +241,7 @@ public class PsiDocMethodOrFieldRef extends CompositePsiElement implements PsiDo
|
||||
return myReferencee == null ? JavaResolveResult.EMPTY_ARRAY : new JavaResolveResult[]{new CandidateInfo(myReferencee, PsiSubstitutor.EMPTY)};
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public PsiElement[] getVariants(){
|
||||
final List<PsiModifierListOwner> vars = new ArrayList<PsiModifierListOwner>();
|
||||
final PsiElement scope = getScope();
|
||||
|
||||
@@ -100,6 +100,7 @@ public class PsiDocParamRef extends CompositePsiElement implements PsiDocTagValu
|
||||
return getManager().areElementsEquivalent(resolve(), element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final PsiElement firstChild = getFirstChild();
|
||||
if (firstChild instanceof PsiDocToken && ((PsiDocToken)firstChild).getTokenType().equals(JavaDocTokenType.DOC_TAG_VALUE_LT)) {
|
||||
|
||||
+2
@@ -23,6 +23,7 @@ import com.intellij.psi.xml.XmlAttribute;
|
||||
import com.intellij.psi.xml.XmlAttributeValue;
|
||||
import com.intellij.psi.xml.XmlTag;
|
||||
import com.intellij.util.IncorrectOperationException;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
@@ -93,6 +94,7 @@ public class MethodPropertyReference extends BasicAttributeValueReference {
|
||||
return super.handleElementRename(newElementName);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return JspSpiUtil.getMethodPropertyReferenceVariants(this, resolveClass(), myReadable);
|
||||
}
|
||||
|
||||
+2
-1
@@ -46,6 +46,7 @@ public class PsiPackageReference extends PsiPolyVariantReferenceBase<PsiElement>
|
||||
(PsiPackage)myReferenceSet.getReference(myIndex - 1).resolve();
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final PsiPackage psiPackage = getContext();
|
||||
if (psiPackage == null) return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
@@ -88,4 +89,4 @@ public class PsiPackageReference extends PsiPolyVariantReferenceBase<PsiElement>
|
||||
public PackageReferenceSet getReferenceSet() {
|
||||
return myReferenceSet;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,6 +185,7 @@ public class PsiNameValuePairImpl extends CompositePsiElement implements PsiName
|
||||
return element instanceof PsiMethod && element.equals(resolve());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
@@ -160,6 +160,7 @@ public class PsiNewExpressionImpl extends ExpressionPsiElement implements PsiNew
|
||||
return null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
@@ -48,6 +48,7 @@ public class WordCompletionTest extends CompletionTestCase {
|
||||
return true;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return new Object[]{"MySoftVariant"};
|
||||
}
|
||||
@@ -66,6 +67,7 @@ public class WordCompletionTest extends CompletionTestCase {
|
||||
return false;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return new Object[]{"MyHardVariant"};
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.UserDataHolderBase;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.util.PathUtil;
|
||||
import com.intellij.util.PathsList;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
@@ -125,11 +126,11 @@ public class ProjectRootsTraversing {
|
||||
myCurrentModuleManager = restored;
|
||||
}
|
||||
|
||||
public <T> T getUserData(Key<T> key) {
|
||||
public <T> T getUserData(@NotNull Key<T> key) {
|
||||
return myUserData.getUserData(key);
|
||||
}
|
||||
|
||||
public <T> void putUserData(Key<T> key, T value) {
|
||||
public <T> void putUserData(@NotNull Key<T> key, T value) {
|
||||
myUserData.putUserData(key, value);
|
||||
}
|
||||
|
||||
|
||||
@@ -118,6 +118,7 @@ public abstract class PsiReferenceBase<T extends PsiElement> implements PsiRefer
|
||||
return resolveTo;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return EMPTY_ARRAY;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
package com.intellij.psi;
|
||||
|
||||
import com.intellij.lang.Language;
|
||||
import com.intellij.openapi.fileTypes.FileTypes;
|
||||
import com.intellij.psi.tree.IElementType;
|
||||
import com.intellij.psi.tree.IFileElementType;
|
||||
|
||||
|
||||
@@ -254,11 +254,11 @@ public class PsiUtilBase {
|
||||
return null;
|
||||
}
|
||||
|
||||
public <T> T getUserData(Key<T> key) {
|
||||
public <T> T getUserData(@NotNull Key<T> key) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public <T> void putUserData(Key<T> key, T value) {
|
||||
public <T> void putUserData(@NotNull Key<T> key, T value) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ import com.intellij.codeInspection.InspectionsBundle;
|
||||
import com.intellij.openapi.application.ApplicationManager;
|
||||
import com.intellij.openapi.util.Key;
|
||||
import gnu.trove.THashMap;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -90,7 +91,7 @@ public abstract class RefEntityImpl implements RefEntity {
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public <T> T getUserData(Key<T> key){
|
||||
public <T> T getUserData(@NotNull Key<T> key){
|
||||
synchronized(this){
|
||||
if (myUserMap == null) return null;
|
||||
//noinspection unchecked
|
||||
@@ -106,7 +107,7 @@ public abstract class RefEntityImpl implements RefEntity {
|
||||
});
|
||||
}
|
||||
|
||||
public <T> void putUserData(Key<T> key, T value){
|
||||
public <T> void putUserData(@NotNull Key<T> key, T value){
|
||||
synchronized(this){
|
||||
if (myUserMap == null){
|
||||
if (value == null) return;
|
||||
|
||||
@@ -65,11 +65,11 @@ public class RangeMarkerWindow implements RangeMarkerEx {
|
||||
myHostMarker.setGreedyToRight(greedy);
|
||||
}
|
||||
|
||||
public <T> T getUserData(final Key<T> key) {
|
||||
public <T> T getUserData(@NotNull final Key<T> key) {
|
||||
return myHostMarker.getUserData(key);
|
||||
}
|
||||
|
||||
public <T> void putUserData(final Key<T> key, final T value) {
|
||||
public <T> void putUserData(@NotNull final Key<T> key, final T value) {
|
||||
myHostMarker.putUserData(key, value);
|
||||
}
|
||||
|
||||
@@ -91,4 +91,4 @@ public class RangeMarkerWindow implements RangeMarkerEx {
|
||||
public boolean isGreedyToLeft() {
|
||||
return myHostMarker.isGreedyToLeft();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,11 +145,11 @@ public class MockPsiManager extends PsiManagerEx {
|
||||
public void finishBatchFilesProcessingMode() {
|
||||
}
|
||||
|
||||
public <T> T getUserData(Key<T> key) {
|
||||
public <T> T getUserData(@NotNull Key<T> key) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public <T> void putUserData(Key<T> key, T value) {
|
||||
public <T> void putUserData(@NotNull Key<T> key, T value) {
|
||||
}
|
||||
|
||||
public boolean isDisposed() {
|
||||
@@ -250,4 +250,4 @@ public class MockPsiManager extends PsiManagerEx {
|
||||
public CacheManager getCacheManager() {
|
||||
return myCompositeCacheManager;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
@@ -127,6 +127,7 @@ public class PsiMultiReference implements PsiPolyVariantReference {
|
||||
return false;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
Set<Object> variants = new HashSet<Object>();
|
||||
for(PsiReference ref: myReferences) {
|
||||
|
||||
@@ -54,11 +54,11 @@ public class EmptyMarkupModel implements MarkupModelEx {
|
||||
return RangeHighlighter.EMPTY_ARRAY;
|
||||
}
|
||||
|
||||
public <T> T getUserData(Key<T> key) {
|
||||
public <T> T getUserData(@NotNull Key<T> key) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public <T> void putUserData(Key<T> key, T value) {
|
||||
public <T> void putUserData(@NotNull Key<T> key, T value) {
|
||||
}
|
||||
|
||||
public void dispose() {
|
||||
|
||||
@@ -156,12 +156,12 @@ public class MockDocument implements DocumentEx {
|
||||
}
|
||||
|
||||
@SuppressWarnings({"unchecked"})
|
||||
public <T> T getUserData(Key<T> key) {
|
||||
public <T> T getUserData(@NotNull Key<T> key) {
|
||||
return (T)myUserData.get(key);
|
||||
}
|
||||
|
||||
@SuppressWarnings({"unchecked"})
|
||||
public <T> void putUserData(Key<T> key, T value) {
|
||||
public <T> void putUserData(@NotNull Key<T> key, T value) {
|
||||
myUserData.put(key, value);
|
||||
}
|
||||
|
||||
|
||||
@@ -70,12 +70,12 @@ public class UserDataHolderBase implements UserDataHolderEx, Cloneable {
|
||||
}
|
||||
}
|
||||
|
||||
public <T> T getUserData(Key<T> key) {
|
||||
public <T> T getUserData(@NotNull Key<T> key) {
|
||||
final Map<Key, Object> map = myUserMap;
|
||||
return map == null ? null : (T)map.get(key);
|
||||
}
|
||||
|
||||
public <T> void putUserData(Key<T> key, T value) {
|
||||
public <T> void putUserData(@NotNull Key<T> key, T value) {
|
||||
Map<Key, Object> map = getOrCreateMap();
|
||||
|
||||
if (value == null) {
|
||||
|
||||
+2
@@ -26,6 +26,7 @@ import com.intellij.util.containers.ContainerUtil;
|
||||
import com.intellij.util.ui.EmptyIcon;
|
||||
import org.intellij.plugins.intelliLang.inject.InjectedLanguage;
|
||||
import org.intellij.plugins.intelliLang.util.StringLiteralReference;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
@@ -47,6 +48,7 @@ final class LanguageReference extends StringLiteralReference {
|
||||
return false;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final String[] ids = InjectedLanguage.getAvailableLanguageIDs();
|
||||
return ContainerUtil.map2Array(ids, LookupElement.class, new Function<String, LookupElement>() {
|
||||
|
||||
+2
-1
@@ -42,6 +42,7 @@ final class RegExpEnumReference extends StringLiteralReference {
|
||||
myPattern = pattern;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final Set<String> values = getEnumValues();
|
||||
if (values == null || values.size() == 0) {
|
||||
@@ -68,4 +69,4 @@ final class RegExpEnumReference extends StringLiteralReference {
|
||||
private Set<String> getEnumValues() {
|
||||
return RegExpUtil.getEnumValues(myValue.getProject(), myPattern);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,6 +51,7 @@ public class AntAttributeReference extends AntGenericReference {
|
||||
return null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final AntTypeDefinition def = getElement().getTypeDefinition();
|
||||
return (def == null) ? EMPTY_ARRAY : def.getAttributes();
|
||||
|
||||
@@ -117,6 +117,7 @@ public class AntElementNameReference extends AntGenericReference {
|
||||
return true;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
if (getAttribute() != null) {
|
||||
return EMPTY_ARRAY; // scriptdef or mactodef params will be handled by XML implementation
|
||||
|
||||
@@ -62,6 +62,7 @@ public class AntEntityReference implements PsiReference {
|
||||
return myXmlRef.isReferenceTo(element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return EMPTY_ARRAY;
|
||||
}
|
||||
|
||||
+1
@@ -97,6 +97,7 @@ public class AntMacroDefParameterReference extends AntGenericReference {
|
||||
return null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@SuppressWarnings({"HardCodedStringLiteral"})
|
||||
public Object[] getVariants() {
|
||||
final Set<String> variants = StringSetSpinAllocator.alloc();
|
||||
|
||||
@@ -119,6 +119,7 @@ public class AntPropertyReference extends AntGenericReference {
|
||||
return AntBundle.message("unknown.property", getCanonicalText());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final AntElement currentElement = getElement();
|
||||
final Set<PsiElement> variants = PsiElementSetSpinAllocator.alloc();
|
||||
|
||||
@@ -77,6 +77,7 @@ public class AntRefIdReference extends AntGenericReference {
|
||||
}
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final Set<PsiElement> variants = PsiElementSetSpinAllocator.alloc();
|
||||
try {
|
||||
|
||||
@@ -153,6 +153,7 @@ public class AntTargetReference extends AntGenericReference {
|
||||
}
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final AntElement element = getElement();
|
||||
if (element instanceof AntAntImpl) {
|
||||
|
||||
+1
@@ -131,6 +131,7 @@ public class GrDocParameterReferenceImpl extends GroovyDocPsiElementImpl impleme
|
||||
return getManager().areElementsEquivalent(element, resolve());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final PsiElement owner = GrDocCommentUtil.findDocOwner(this);
|
||||
final PsiElement firstChild = getFirstChild();
|
||||
|
||||
+1
@@ -145,6 +145,7 @@ public class GrAnnotationNameValuePairImpl extends GroovyPsiElementImpl implemen
|
||||
return element instanceof PsiMethod && getManager().areElementsEquivalent(element, resolve());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
GrAnnotation anno = getAnnotation();
|
||||
if (anno != null) {
|
||||
|
||||
+1
@@ -160,6 +160,7 @@ public class GrConstructorInvocationImpl extends GroovyPsiElementImpl implements
|
||||
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
+1
@@ -56,6 +56,7 @@ public class MavenModulePsiReference extends MavenPsiReference implements LocalQ
|
||||
return getPsiFile(file);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
List<DomFileElement<MavenDomProjectModel>> files = MavenDomUtil.collectProjectModels(getProject());
|
||||
|
||||
|
||||
@@ -109,6 +109,7 @@ public class TestNGReferenceContributor extends PsiReferenceContributor {
|
||||
return null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final List<Object> list = new ArrayList<Object>();
|
||||
final PsiClass cls = PsiUtil.getTopLevelClass(getElement());
|
||||
@@ -159,6 +160,7 @@ public class TestNGReferenceContributor extends PsiReferenceContributor {
|
||||
return null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
List<Object> list = new ArrayList<Object>();
|
||||
PsiClass cls = PsiUtil.getTopLevelClass(getElement());
|
||||
@@ -189,6 +191,7 @@ public class TestNGReferenceContributor extends PsiReferenceContributor {
|
||||
return null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
List<Object> list = new ArrayList<Object>();
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ import com.intellij.psi.PsiPlainTextFile;
|
||||
import com.intellij.psi.PsiReference;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
* @author Eugene Zhuravlev
|
||||
@@ -75,6 +76,7 @@ public abstract class ReferenceInForm implements PsiReference {
|
||||
return resolve() == element;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
+3
-1
@@ -22,6 +22,7 @@ import org.intellij.lang.xpath.psi.QNameElement;
|
||||
|
||||
import com.intellij.lang.ASTNode;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
class PrefixReferenceImpl extends ReferenceBase implements PrefixReference {
|
||||
@@ -45,6 +46,7 @@ class PrefixReferenceImpl extends ReferenceBase implements PrefixReference {
|
||||
return element.equals(resolve());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
// handled in XPathCompletionData
|
||||
return EMPTY_ARRAY;
|
||||
@@ -69,4 +71,4 @@ class PrefixReferenceImpl extends ReferenceBase implements PrefixReference {
|
||||
final String prefix = getCanonicalText();
|
||||
return !namespaceContext.getKnownPrefixes(myProvider.getContextElement()).contains(prefix);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,6 +65,7 @@ public abstract class ReferenceBase implements PsiReference {
|
||||
return Comparing.equal(resolve(), element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public abstract Object[] getVariants();
|
||||
|
||||
public boolean isSoft() {
|
||||
|
||||
+1
@@ -156,6 +156,7 @@ public class XPathFunctionCallImpl extends XPathElementImpl implements XPathFunc
|
||||
}
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return EMPTY_ARRAY;
|
||||
}
|
||||
|
||||
@@ -110,6 +110,7 @@ public class XPathNodeTestImpl extends XPathElementImpl implements XPathNodeTest
|
||||
super(element, nameNode);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
// handled in XPathCompletionData
|
||||
return EMPTY_ARRAY;
|
||||
|
||||
+1
@@ -133,6 +133,7 @@ public class XPathVariableReferenceImpl extends XPathElementImpl implements XPat
|
||||
return false;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
+1
@@ -33,6 +33,7 @@ class AttributeReference extends SimpleAttributeReference {
|
||||
mySoft = soft;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ResolveUtil.collect(myMatcher.variantMatcher());
|
||||
}
|
||||
|
||||
+1
@@ -102,6 +102,7 @@ class ExternalResourceReference implements PsiReference, QuickFixProvider<Extern
|
||||
return element == resolve();
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return myResourceManager.getResourceUrls(null, false);
|
||||
}
|
||||
|
||||
+3
-1
@@ -64,6 +64,7 @@ class ModeReference extends SimpleAttributeReference implements PsiPolyVariantRe
|
||||
return myImplicitModeElement.getModeRange();
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final PsiFile containingFile = myAttribute.getContainingFile();
|
||||
if (containingFile instanceof XmlFile && XsltSupport.isXsltFile(containingFile)) {
|
||||
@@ -146,6 +147,7 @@ class ModeReference extends SimpleAttributeReference implements PsiPolyVariantRe
|
||||
super(attribute);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return getPrefixCompletions(myAttribute);
|
||||
}
|
||||
@@ -231,4 +233,4 @@ class ModeReference extends SimpleAttributeReference implements PsiPolyVariantRe
|
||||
return "Undefined mode ''{0}''";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
@@ -64,6 +64,7 @@ class SelfReference implements PsiReference {
|
||||
return false;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
@@ -353,11 +353,11 @@ public class DomFileElementImpl<T extends DomElement> implements DomFileElement<
|
||||
getRootElement().accept(visitor);
|
||||
}
|
||||
|
||||
public <T> T getUserData(Key<T> key) {
|
||||
public <T> T getUserData(@NotNull Key<T> key) {
|
||||
return (T)myUserData.get(key);
|
||||
}
|
||||
|
||||
public <T> void putUserData(Key<T> key, T value) {
|
||||
public <T> void putUserData(@NotNull Key<T> key, T value) {
|
||||
myUserData.put(key, value);
|
||||
}
|
||||
|
||||
|
||||
@@ -177,6 +177,7 @@ public class GenericDomValueReference<T> extends PsiReferenceBase<XmlElement> im
|
||||
return null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final Converter<T> converter = getConverter();
|
||||
if (converter instanceof EnumConverter || converter == ResolvingConverter.BOOLEAN_CONVERTER) {
|
||||
|
||||
@@ -172,6 +172,7 @@ public class GenericValueReferenceProvider extends PsiReferenceProvider {
|
||||
|
||||
if (ReflectionCache.isAssignable(Integer.class, clazz)) {
|
||||
return new PsiReference[]{new GenericDomValueReference<Integer>((GenericDomValue<Integer>)domValue) {
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return new Object[]{"0"};
|
||||
}
|
||||
|
||||
@@ -185,6 +185,7 @@ public abstract class DelimitedListConverter<T> extends ResolvingConverter<List<
|
||||
return resolveReference(convertString(value, myContext), myContext);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return getReferenceVariants(myContext, myGenericDomValue);
|
||||
}
|
||||
@@ -260,4 +261,4 @@ public abstract class DelimitedListConverter<T> extends ResolvingConverter<List<
|
||||
return superHandleElementRename.fun(newName);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -143,6 +143,7 @@ public abstract class QuotedValueConverter<T> extends ResolvingConverter<T> impl
|
||||
return multiResolveReference(convertString(value, myContext), myContext);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return getReferenceVariants(myContext, myGenericDomValue, getRangeInElement());
|
||||
}
|
||||
|
||||
+2
@@ -18,6 +18,7 @@ package com.intellij.psi.impl.source.resolve.reference.impl.providers;
|
||||
import com.intellij.openapi.util.TextRange;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
@@ -41,6 +42,7 @@ public class AttributeValueSelfReference extends BasicAttributeValueReference {
|
||||
return myElement;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
+2
@@ -136,6 +136,7 @@ public class DtdReferencesProvider extends PsiReferenceProvider {
|
||||
return myElement.getManager().areElementsEquivalent(element, resolve());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final XmlNSDescriptor rootTagNSDescriptor = getNsDescriptor();
|
||||
return rootTagNSDescriptor != null ?
|
||||
@@ -226,6 +227,7 @@ public class DtdReferencesProvider extends PsiReferenceProvider {
|
||||
return myElement.getManager().areElementsEquivalent(resolve(), element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
+1
@@ -157,6 +157,7 @@ public class IdRefReference extends BasicAttributeValueReference {
|
||||
return result[0];
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final List<String> result = new LinkedList<String>();
|
||||
|
||||
|
||||
+3
@@ -116,6 +116,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider {
|
||||
}
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
@@ -170,6 +171,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider {
|
||||
return myElement.getManager().areElementsEquivalent(resolve(), element);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
@@ -454,6 +456,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider {
|
||||
}
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final XmlTag tag = PsiTreeUtil.getParentOfType(myElement, XmlTag.class);
|
||||
if (tag == null) return null;
|
||||
|
||||
+1
@@ -88,6 +88,7 @@ public class URIReferenceProvider extends PsiReferenceProvider {
|
||||
return myReference.resolve();
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
}
|
||||
|
||||
@@ -169,6 +169,7 @@ public class TagNameReference implements PsiReference {
|
||||
return getElement().getManager().areElementsEquivalent(element, resolve());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants(){
|
||||
final PsiElement element = getElement();
|
||||
if(!myStartTagFlag){
|
||||
|
||||
@@ -420,6 +420,7 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
|
||||
return getManager().areElementsEquivalent(element, resolve());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final List<MutableLookupElement<String>> variants = new ArrayList<MutableLookupElement<String>>();
|
||||
|
||||
|
||||
@@ -196,6 +196,7 @@ class AnchorReference implements PsiReference, EmptyResolveMessageProvider {
|
||||
return myElement.getManager().areElementsEquivalent(element,resolve());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
final Map<String, XmlTag> idMap = getIdMap();
|
||||
if (idMap == null) return ArrayUtil.EMPTY_OBJECT_ARRAY;
|
||||
|
||||
Reference in New Issue
Block a user