This commit is contained in:
Alexey Kudravtsev
2012-06-06 13:33:57 +04:00
parent f51c0eab3f
commit b92d9f69f7
45 changed files with 82 additions and 68 deletions
@@ -108,7 +108,7 @@ public class BasicExpressionCompletionContributor {
}
PsiScopesUtil.treeWalkUp(new BaseScopeProcessor() {
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiLocalVariable) {
if (!matcher.prefixMatches(((PsiLocalVariable)element).getName())) {
return true;
@@ -389,7 +389,7 @@ public class JavaCompletionUtil {
public static PsiType getQualifiedMemberReferenceType(@Nullable PsiType qualifierType, @NotNull final PsiMember member) {
final Ref<PsiSubstitutor> subst = Ref.create(PsiSubstitutor.EMPTY);
class MyProcessor extends BaseScopeProcessor implements NameHint, ElementClassHint {
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element == member) {
subst.set(state.get(PsiSubstitutor.KEY));
}
@@ -407,7 +407,7 @@ public class JavaCompletionUtil {
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
return hintKey == NameHint.KEY || hintKey == ElementClassHint.KEY ? (T)this : null;
}
}
@@ -31,6 +31,7 @@ import com.intellij.psi.ResolveState;
import com.intellij.psi.scope.BaseScopeProcessor;
import com.intellij.psi.scope.ElementClassHint;
import com.intellij.psi.scope.JavaScopeProcessorEvent;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
@@ -63,7 +64,7 @@ public class VariablesProcessor
}
/** Always return true since we wanna get all vars in scope */
public boolean execute(PsiElement pe, ResolveState state){
public boolean execute(@NotNull PsiElement pe, ResolveState state){
if(pe instanceof PsiVariable){
final PsiVariable pvar = (PsiVariable)pe;
final String pvar_name = pvar.getName();
@@ -90,7 +91,7 @@ public class VariablesProcessor
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (hintKey == ElementClassHint.KEY) {
return (T)this;
}
@@ -193,7 +193,7 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme
}
}
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
//noinspection SuspiciousMethodCalls
if (myNonInitializedFields.contains(element)) {
return true;
@@ -294,7 +294,7 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (hintKey == ElementClassHint.KEY) {
return (T)this;
}
@@ -514,7 +514,7 @@ public class CreateFromUsageUtils {
final List<PsiVariable> list = new ArrayList<PsiVariable>();
VariablesProcessor varproc = new VariablesProcessor("", true, list){
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if(!(element instanceof PsiField) ||
JavaPsiFacade.getInstance(element.getProject()).getResolveHelper().isAccessible((PsiField)element, expression, null)) {
return super.execute(element, state);
@@ -160,7 +160,7 @@ public class RenameWrongRefFix implements IntentionAction {
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiNamedElement
&& element instanceof PsiModifierListOwner
&& myFilterMethods == element instanceof PsiMethod) {
@@ -162,7 +162,7 @@ public class MacroUtil {
final List<PsiVariable> list = new ArrayList<PsiVariable>();
VariablesProcessor varproc = new VariablesProcessor(prefix, true, list) {
public boolean execute(PsiElement pe, ResolveState state) {
public boolean execute(@NotNull PsiElement pe, ResolveState state) {
if (pe instanceof PsiVariable) {
//exclude variables that are initialized in 'place'
final PsiExpression initializer = ((PsiVariable)pe).getInitializer();
@@ -21,6 +21,7 @@ import com.intellij.psi.scope.BaseScopeProcessor;
import com.intellij.psi.util.MethodSignature;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.Map;
@@ -41,7 +42,7 @@ public class AddAllMembersProcessor extends BaseScopeProcessor {
myPsiClass = psiClass;
}
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
PsiMember member = (PsiMember)element;
if (!isInteresting(element)) return true;
if (myPsiClass.isInterface() && isObjectMember(element)) return true;
@@ -247,7 +247,7 @@ public abstract class AbstractQualifiedReference<T extends AbstractQualifiedRefe
private final Set<ResolveResult> myResults = new LinkedHashSet<ResolveResult>();
@Override
public boolean execute(final PsiElement element, final ResolveState state) {
public boolean execute(@NotNull final PsiElement element, final ResolveState state) {
if (isFound()) return false;
process(element);
return true;
@@ -110,12 +110,12 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer
}
processorToUse = new PsiScopeProcessor() {
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
return !(element instanceof PsiClass || element instanceof PsiPackage) || processor.execute(element, state);
}
@Override
public <V> V getHint(Key<V> hintKey) {
public <V> V getHint(@NotNull Key<V> hintKey) {
return processor.getHint(hintKey);
}
@@ -24,6 +24,7 @@ import com.intellij.psi.scope.BaseScopeProcessor;
import com.intellij.psi.scope.ElementClassHint;
import com.intellij.psi.scope.JavaScopeProcessorEvent;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import java.util.List;
@@ -52,7 +53,7 @@ public abstract class VariablesProcessor extends BaseScopeProcessor implements E
/** Always return true since we wanna get all vars in scope */
@Override
public boolean execute(PsiElement pe, ResolveState state){
public boolean execute(@NotNull PsiElement pe, ResolveState state){
if(pe instanceof PsiVariable){
final PsiVariable pvar = (PsiVariable)pe;
if(!myStaticSensitiveFlag || !myStaticScopeFlag || pvar.hasModifierProperty(PsiModifier.STATIC)){
@@ -79,7 +80,7 @@ public abstract class VariablesProcessor extends BaseScopeProcessor implements E
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (hintKey == ElementClassHint.KEY) {
return (T)this;
}
@@ -40,6 +40,7 @@ import com.intellij.util.VisibilityUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashSet;
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
@@ -512,7 +513,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
return type.isAssignableFrom(varType);
}
public boolean execute(PsiElement pe, ResolveState state) {
public boolean execute(@NotNull PsiElement pe, ResolveState state) {
super.execute(pe, state);
return size() < 2;
}
@@ -233,7 +233,7 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava
}
@Override
public <T> T getHint(final Key<T> hintKey) {
public <T> T getHint(@NotNull final Key<T> hintKey) {
return myDelegate.getHint(hintKey);
}
@@ -250,7 +250,7 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava
}
@Override
public boolean execute(final PsiElement element, final ResolveState state) {
public boolean execute(@NotNull final PsiElement element, final ResolveState state) {
if (element instanceof PsiModifierListOwner && ((PsiModifierListOwner)element).hasModifierProperty(PsiModifier.STATIC)) {
if (element instanceof PsiNamedElement && myIsProcessingOnDemand) {
final String name = ((PsiNamedElement)element).getName();
@@ -25,6 +25,7 @@ import com.intellij.psi.infos.ClassCandidateInfo;
import com.intellij.psi.scope.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import java.util.Iterator;
import java.util.List;
@@ -210,7 +211,7 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (!(element instanceof PsiClass)) return true;
final PsiClass aClass = (PsiClass)element;
final String name = aClass.getName();
@@ -308,7 +309,7 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (hintKey == ElementClassHint.KEY || hintKey == NameHint.KEY) {
//noinspection unchecked
return (T)this;
@@ -21,6 +21,7 @@ import com.intellij.psi.infos.CandidateInfo;
import com.intellij.psi.scope.BaseScopeProcessor;
import com.intellij.psi.scope.NameHint;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.ListIterator;
@@ -38,7 +39,7 @@ public class StaticImportResolveProcessor extends BaseScopeProcessor implements
}
@Override
public boolean execute(final PsiElement candidate, final ResolveState state) {
public boolean execute(@NotNull final PsiElement candidate, final ResolveState state) {
if (candidate instanceof PsiMember && ((PsiModifierListOwner)candidate).hasModifierProperty(PsiModifier.STATIC)) {
if (candidate instanceof PsiField) {
if (checkDomination((PsiMember)candidate, myFieldResults)) return true;
@@ -90,7 +91,7 @@ public class StaticImportResolveProcessor extends BaseScopeProcessor implements
}
@Override
public <T> T getHint(final Key<T> hintKey) {
public <T> T getHint(@NotNull final Key<T> hintKey) {
if (hintKey == NameHint.KEY) {
//noinspection unchecked
return (T)this;
@@ -34,7 +34,7 @@ public class SymbolCollectingProcessor extends BaseScopeProcessor implements Ele
private PsiElement myCurrentFileContext = null;
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (hintKey == ElementClassHint.KEY) {
//noinspection unchecked
return (T)this;
@@ -50,7 +50,7 @@ public class SymbolCollectingProcessor extends BaseScopeProcessor implements Ele
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiNamedElement) {
PsiNamedElement named = (PsiNamedElement)element;
String name = named.getName();
@@ -29,6 +29,7 @@ import com.intellij.psi.scope.conflictResolvers.JavaVariableConflictResolver;
import com.intellij.psi.scope.processor.ConflictFilterProcessor;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
/**
* @author ik, dsl
@@ -91,7 +92,7 @@ public class VariableResolverProcessor extends ConflictFilterProcessor implement
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (!(element instanceof PsiField) && (myName == null || PsiUtil.checkName(element, myName, myPlace))) {
super.execute(element, state);
return myResults.isEmpty();
@@ -101,7 +102,7 @@ public class VariableResolverProcessor extends ConflictFilterProcessor implement
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (hintKey == ElementClassHint.KEY) {
return (T)this;
}
@@ -102,7 +102,7 @@ public class PsiCodeBlockImpl extends LazyParseablePsiElement implements PsiCode
final Ref<Boolean> conflict = new Ref<Boolean>(Boolean.FALSE);
PsiScopesUtil.walkChildrenScopes(this, new BaseScopeProcessor() {
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiLocalVariable) {
final PsiLocalVariable variable = (PsiLocalVariable)element;
final String name = variable.getName();
@@ -48,7 +48,7 @@ public class ConflictFilterProcessor extends FilterScopeProcessor<CandidateInfo>
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (myCachedResult != null && myCachedResult.length == 1 && myCachedResult[0].isAccessible()) {
return false;
}
@@ -103,7 +103,7 @@ public class ConflictFilterProcessor extends FilterScopeProcessor<CandidateInfo>
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (hintKey == NameHint.KEY) {
//noinspection unchecked
return myName != null ? (T)this : null;
@@ -23,6 +23,7 @@ import com.intellij.psi.filters.ElementFilter;
import com.intellij.psi.scope.BaseScopeProcessor;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
@@ -66,7 +67,7 @@ public class FilterScopeProcessor<T> extends BaseScopeProcessor {
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (myFilter.isAcceptable(element, myCurrentDeclarationHolder)) {
if (myProcessor != null) {
return myProcessor.execute(element, state);
@@ -82,7 +83,7 @@ public class FilterScopeProcessor<T> extends BaseScopeProcessor {
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (myProcessor != null) {
return myProcessor.getHint(hintKey);
}
@@ -21,6 +21,7 @@ import com.intellij.psi.scope.JavaScopeProcessorEvent;
import com.intellij.psi.scope.PsiConflictResolver;
import com.intellij.psi.scope.conflictResolvers.JavaMethodsConflictResolver;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
public class MethodResolverProcessor extends MethodCandidatesProcessor {
private boolean myStopAcceptingCandidates = false;
@@ -51,7 +52,7 @@ public class MethodResolverProcessor extends MethodCandidatesProcessor {
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
return !myStopAcceptingCandidates && super.execute(element, state);
}
}
@@ -26,6 +26,7 @@ import com.intellij.psi.scope.JavaScopeProcessorEvent;
import com.intellij.psi.scope.PsiConflictResolver;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
/**
* Created by IntelliJ IDEA.
@@ -116,7 +117,7 @@ public abstract class MethodsProcessor extends ConflictFilterProcessor implement
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (hintKey == ElementClassHint.KEY) {
return (T)this;
}
@@ -18,6 +18,7 @@ package com.intellij.psi.scope;
import com.intellij.openapi.util.Key;
import com.intellij.psi.PsiElement;
import com.intellij.psi.ResolveState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface PsiScopeProcessor {
@@ -30,10 +31,10 @@ public interface PsiScopeProcessor {
* @param state current state of resolver.
* @return false to stop processing.
*/
boolean execute(PsiElement element, ResolveState state);
boolean execute(@NotNull PsiElement element, ResolveState state);
@Nullable
<T> T getHint(Key<T> hintKey);
<T> T getHint(@NotNull Key<T> hintKey);
void handleEvent(Event event, @Nullable Object associated);
}
@@ -16,10 +16,11 @@
package com.intellij.psi.scope;
import com.intellij.openapi.util.Key;
import org.jetbrains.annotations.NotNull;
public abstract class BaseScopeProcessor implements PsiScopeProcessor {
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
return null;
}
@@ -3,6 +3,7 @@ package com.intellij.psi.scope;
import com.intellij.openapi.util.Key;
import com.intellij.psi.PsiElement;
import com.intellij.psi.ResolveState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -16,13 +17,13 @@ public abstract class DelegatingScopeProcessor implements PsiScopeProcessor {
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
return myDelegate.execute(element, state);
}
@Override
@Nullable
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
return myDelegate.getHint(hintKey);
}
@@ -2053,7 +2053,7 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator {
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (myBorderPassed) {
return false;
}
@@ -235,7 +235,7 @@ public class GroovyDslFileIndex extends ScalarIndexExtension<String> {
final DelegatingScopeProcessor nameChecker = new DelegatingScopeProcessor(processor) {
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()) {
return processor.execute(element, state);
}
@@ -151,7 +151,7 @@ public class GroovyConstructorNamedArgumentProvider extends GroovyNamedArgumentP
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiMethod || element instanceof PsiField) {
String propertyName;
PsiType type;
@@ -186,7 +186,7 @@ public class GroovyConstructorNamedArgumentProvider extends GroovyNamedArgumentP
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if ((NameHint.KEY == hintKey && myNameHint != null) || ClassHint.KEY == hintKey || ElementClassHint.KEY == hintKey) {
//noinspection unchecked
return (T) this;
@@ -115,12 +115,12 @@ public class GroovyCompletionContributor extends CompletionContributor {
final PsiManager manager = file.getManager();
PsiScopeProcessor processor = new PsiScopeProcessor() {
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
return !manager.areElementsEquivalent(element, member);
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
return null;
}
@@ -146,7 +146,7 @@ public class GroovyFileImpl extends GroovyFileBaseImpl implements GroovyFile {
final String expectedName = ResolveUtil.getNameHint(processor);
PsiScopeProcessor importProcessor = !processClasses || expectedName == null ? processor : new DelegatingScopeProcessor(processor) {
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
return isImplicitlyImported(element, expectedName) || super.execute(element, state);
}
};
@@ -245,7 +245,7 @@ public class GroovyFileImpl extends GroovyFileBaseImpl implements GroovyFile {
final DelegatingScopeProcessor packageSkipper = new DelegatingScopeProcessor(processor) {
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiPackage) return true;
return super.execute(element, state);
}
@@ -276,7 +276,7 @@ public class GroovyFileImpl extends GroovyFileBaseImpl implements GroovyFile {
PsiPackage aPackage = facade.findPackage(packageName);
if (aPackage != null && !aPackage.processDeclarations(new DelegatingScopeProcessor(processor) {
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiPackage) return true;
return super.execute(element, state);
}
@@ -395,7 +395,7 @@ public class CompleteReferenceExpression {
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()) return true;
PsiNamedElement namedElement = (PsiNamedElement)element;
@@ -400,12 +400,12 @@ public class GroovyScriptClass extends LightElement implements GrMemberOwner, Sy
final PsiClass scriptClass = getSuperClass();
//noinspection RedundantIfStatement
if (scriptClass != null && !scriptClass.processDeclarations(new BaseScopeProcessor() {
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
return !(element instanceof PsiNamedElement) || ResolveUtil.processElement(processor, (PsiNamedElement)element, state);
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
return processor.getHint(hintKey);
}
}, state, lastParent, place)) {
@@ -105,7 +105,7 @@ public class GdkMethodUtil {
@NotNull PsiClass categoryClass) {
final DelegatingScopeProcessor delegate = new DelegatingScopeProcessor(processor) {
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiMethod) {
if (!((PsiMethod)element).hasModifierProperty(PsiModifier.STATIC)) return true;
final PsiParameter[] parameters = ((PsiMethod)element).getParameterList().getParameters();
@@ -69,7 +69,7 @@ public class MixinMemberContributor extends NonCodeMembersContributor {
for (PsiClass mixin : mixins) {
if (!mixin.processDeclarations(new DelegatingScopeProcessor(processor) {
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (isCategoryMethod(element, qualifierType, state.get(PsiSubstitutor.KEY))) {
return super.execute(GrGdkMethodImpl.createGdkMethod((PsiMethod)element, false), state);
}
@@ -116,7 +116,7 @@ public abstract class NonCodeMembersContributor {
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (!wantMore) {
return false;
}
@@ -61,7 +61,7 @@ public class GrCollectionTypeMembersProvider extends NonCodeMembersContributor {
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiField) {
final PsiType type = ((PsiField)element).getType();
final String typeText;
@@ -79,7 +79,7 @@ public class GrCollectionTypeMembersProvider extends NonCodeMembersContributor {
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if (hintKey == NameHint.KEY) return processor.getHint(hintKey);
if (hintKey == ClassHint.KEY || hintKey == ElementClassHint.KEY) return (T)this;
return null;
@@ -56,7 +56,7 @@ public class AccessorResolverProcessor extends MethodResolverProcessor {
};
}
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (mySearchForGetter) {
if (element instanceof PsiMethod && GroovyPropertyUtils.isSimplePropertyGetter((PsiMethod)element, myPropertyName)) {
return addAccessor((PsiMethod)element, state);
@@ -34,7 +34,7 @@ public class CompletionProcessor extends ResolverProcessor {
super(name, resolveTargets, place, PsiType.EMPTY_ARRAY);
}
public boolean execute(PsiElement element, ResolveState substitutor) {
public boolean execute(@NotNull PsiElement element, ResolveState substitutor) {
if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()) {
return true;
}
@@ -86,7 +86,7 @@ public class MethodResolverProcessor extends ResolverProcessor {
}
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (myStopExecuting) {
return false;
}
@@ -36,7 +36,7 @@ public class PropertyResolverProcessor extends ResolverProcessor {
}
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof GrReferenceExpression && ((GrReferenceExpression)element).getQualifier() != null) {
return true;
}
@@ -68,7 +68,7 @@ public class ResolverProcessor implements PsiScopeProcessor, NameHint, ClassHint
myTypeArguments = typeArguments;
}
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiLocalVariableImpl) { //todo a better hack
return true; // the debugger creates a Java code block context and our expressions to evaluate resolve there
}
@@ -159,7 +159,7 @@ public class ResolverProcessor implements PsiScopeProcessor, NameHint, ClassHint
}
@SuppressWarnings({"unchecked"})
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
if ((NameHint.KEY == hintKey && myName != null) || ClassHint.KEY == hintKey || ElementClassHint.KEY == hintKey) {
return (T) this;
}
@@ -39,6 +39,7 @@ import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashSet;
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.GroovyFileType;
import org.jetbrains.plugins.groovy.lang.GrReferenceAdjuster;
@@ -615,7 +616,7 @@ public class GrChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
return type.isAssignableFrom(varType);
}
public boolean execute(PsiElement pe, ResolveState state) {
public boolean execute(@NotNull PsiElement pe, ResolveState state) {
super.execute(pe, state);
return size() < 2;
}
@@ -562,13 +562,13 @@ public class GenerationUtil {
final PsiManager manager = PsiManager.getInstance(context.project);
return ResolveUtil.processAllDeclarations(declared, new PsiScopeProcessor() {
@Override
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (manager.areElementsEquivalent(element, member)) return false;
return true;
}
@Override
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
return null;
}
@@ -274,7 +274,7 @@ public class JavaI18nUtil extends I18nUtil {
private static void addAvailableMethodsOfType(final PsiClassType type, final PsiLiteralExpression context, final Collection<String> result) {
PsiScopesUtil.treeWalkUp(new PsiScopeProcessor() {
public boolean execute(PsiElement element, ResolveState state) {
public boolean execute(@NotNull PsiElement element, ResolveState state) {
if (element instanceof PsiMethod) {
PsiMethod method = (PsiMethod)element;
PsiType returnType = method.getReturnType();
@@ -286,7 +286,7 @@ public class JavaI18nUtil extends I18nUtil {
return true;
}
public <T> T getHint(Key<T> hintKey) {
public <T> T getHint(@NotNull Key<T> hintKey) {
return null;
}
@@ -152,7 +152,7 @@ public class RncNameImpl extends RncElementImpl implements RncName, PsiReference
myKind = kind;
}
public boolean execute(PsiElement element, ResolveState substitutor) {
public boolean execute(@NotNull PsiElement element, ResolveState substitutor) {
final ASTNode node = element.getNode();
if (node == null) return true;