MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

CompletionContributor: cleanup, notnull

Browse Source
This commit is contained in:
peter
2014-06-25 00:03:38 +02:00
parent 0c1548665c
commit 74dad1078b
40 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class MethodsChainsCompletionContributor extends CompletionContributor {
private final static int FILTER_RATIO = 10;
@Override
public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet result) {
if (parameters.getInvocationCount() >= INVOCATIONS_THRESHOLD &&
ClassFilesIndexFeaturesHolder.getInstance(parameters.getPosition().getProject())
.enableFeatureIfNeed(ClassFilesIndexFeature.METHOD_CHAINS_COMPLETION)) {
java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class JavaClassNameCompletionContributor extends CompletionContributor {
psiElement(PsiReferenceList.class).withParent(PsiTypeParameter.class));
@Override
public void fillCompletionVariants(CompletionParameters parameters, final CompletionResultSet _result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull final CompletionResultSet _result) {
if (parameters.getCompletionType() == CompletionType.CLASS_NAME ||
parameters.isExtendedCompletion() && mayContainClassName(parameters)) {
addAllClasses(parameters, _result);
java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class JavaClassReferenceCompletionContributor extends CompletionContribut
}
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
PsiElement position = parameters.getPosition();
JavaClassReference reference = findJavaClassReference(position.getContainingFile(), parameters.getOffset());
if (reference == null) {
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+1 -1
View File
@@ -196,7 +196,7 @@ public class JavaCompletionContributor extends CompletionContributor {
}
@Override
public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet _result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet _result) {
if (parameters.getCompletionType() != CompletionType.BASIC) {
return;
}
java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java
+1 -1
View File
@@ -140,7 +140,7 @@ public class JavaDocCompletionContributor extends CompletionContributor {
}
@Override
public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet result) {
PsiElement position = parameters.getPosition();
if (PsiJavaPatterns.psiElement(JavaDocTokenType.DOC_COMMENT_DATA).accepts(position)) {
java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
+2 -1
View File
@@ -39,6 +39,7 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.PlatformIcons;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
@@ -63,7 +64,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
static final int MAX_SCOPE_SIZE_TO_SEARCH_UNRESOLVED = 50000;
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
if (parameters.getCompletionType() != CompletionType.BASIC && parameters.getCompletionType() != CompletionType.SMART) {
return;
}
java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java
+2 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.ResolveResult;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
@@ -28,7 +29,7 @@ import java.util.ArrayList;
public class JavaMethodMergingContributor extends CompletionContributor {
@Override
public AutoCompletionDecision handleAutoCompletionPossibility(AutoCompletionContext context) {
public AutoCompletionDecision handleAutoCompletionPossibility(@NotNull AutoCompletionContext context) {
final CompletionParameters parameters = context.getParameters();
if (parameters.getCompletionType() != CompletionType.SMART && parameters.getCompletionType() != CompletionType.BASIC) {
return null;
java/java-impl/src/com/intellij/codeInsight/completion/JavaNoVariantsDelegator.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.psi.filters.ElementFilter;
import com.intellij.psi.search.PsiShortNamesCache;
import com.intellij.util.CollectConsumer;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
@@ -42,7 +43,7 @@ import static com.intellij.patterns.PsiJavaPatterns.psiElement;
public class JavaNoVariantsDelegator extends CompletionContributor {
@Override
public void fillCompletionVariants(final CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull CompletionResultSet result) {
LinkedHashSet<CompletionResult> plainResults = result.runRemainingContributors(parameters, true);
final boolean empty = containsOnlyPackages(plainResults) || suggestMetaAnnotations(parameters);
java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java
+1 -1
View File
@@ -352,7 +352,7 @@ public class JavaSmartCompletionContributor extends CompletionContributor {
}
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
super.fillCompletionVariants(parameters, JavaCompletionSorting.addJavaSorting(parameters, result));
}
java/java-impl/src/com/intellij/codeInsight/completion/RefactoringCompletionContributor.java
+2 -1
View File
@@ -24,13 +24,14 @@ import com.intellij.openapi.module.ModuleUtil;
import com.intellij.psi.PsiClass;
import com.intellij.refactoring.ui.ClassNameReferenceEditor;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NotNull;
/**
* @author peter
*/
public class RefactoringCompletionContributor extends CompletionContributor {
@Override
public void fillCompletionVariants(CompletionParameters parameters, final CompletionResultSet resultSet) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull final CompletionResultSet resultSet) {
if (parameters.getOriginalFile().getUserData(ClassNameReferenceEditor.CLASS_NAME_REFERENCE_FRAGMENT) == null) {
return;
}
java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.lang.StdLanguages;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NotNull;
/**
* @author peter
@@ -28,7 +29,7 @@ import com.intellij.util.Consumer;
public class XmlBasicToClassNameDelegator extends CompletionContributor {
@Override
public void fillCompletionVariants(CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull final CompletionResultSet result) {
PsiElement position = parameters.getPosition();
PsiFile file = position.getContainingFile();
if (parameters.getCompletionType() != CompletionType.BASIC ||
java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicCompletionContributor.java
+2 -1
View File
@@ -25,6 +25,7 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import gnu.trove.THashSet;
import gnu.trove.TObjectHashingStrategy;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
import java.util.List;
@@ -46,7 +47,7 @@ public class MagicCompletionContributor extends CompletionContributor {
private static final int PRIORITY = 100;
@Override
public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet result) {
//if (parameters.getCompletionType() != CompletionType.SMART) return;
PsiElement pos = parameters.getPosition();
MagicConstantInspection.AllowedValues allowedValues = null;
java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.groovy
+3 -1
View File
@@ -26,6 +26,8 @@ import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.testFramework.PsiTestUtil
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase
import org.jetbrains.annotations.NotNull
/**
* @author peter
*/
@@ -94,7 +96,7 @@ public class HeavyNormalCompletionTest extends JavaCodeInsightFixtureTestCase {
static class CacheVerifyingContributor extends CompletionContributor {
@Override
void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
PsiClass psiClass = PsiTreeUtil.getParentOfType(parameters.position, PsiClass)
for (ci in OverrideImplementExploreUtil.getMethodsToOverrideImplement(psiClass, true)) {
assert ci.element.valid
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
+1 -1
View File
@@ -561,7 +561,7 @@ public interface Test {
static class LongContributor extends CompletionContributor {
@Override
void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
result.runRemainingContributors(parameters, true)
Thread.sleep 500
}
platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java
+9 -12
View File
@@ -128,7 +128,8 @@ public abstract class CompletionContributor {
private final MultiMap<CompletionType, Pair<ElementPattern<? extends PsiElement>, CompletionProvider<CompletionParameters>>> myMap =
new MultiMap<CompletionType, Pair<ElementPattern<? extends PsiElement>, CompletionProvider<CompletionParameters>>>();
public final void extend(@Nullable CompletionType type, final ElementPattern<? extends PsiElement> place, CompletionProvider<CompletionParameters> provider) {
public final void extend(@Nullable CompletionType type,
@NotNull final ElementPattern<? extends PsiElement> place, CompletionProvider<CompletionParameters> provider) {
myMap.putValue(type, new Pair<ElementPattern<? extends PsiElement>, CompletionProvider<CompletionParameters>>(place, provider));
}
@@ -144,11 +145,8 @@ public abstract class CompletionContributor {
* is of your favourite kind. This method is run inside a read action. If you do any long activity non-related to PSI in it, please
* ensure you call {@link com.intellij.openapi.progress.ProgressManager#checkCanceled()} often enough so that the completion process
* can be cancelled smoothly when the user begins to type in the editor.
*
* @param parameters
* @param result
*/
public void fillCompletionVariants(final CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull CompletionResultSet result) {
for (final Pair<ElementPattern<? extends PsiElement>, CompletionProvider<CompletionParameters>> pair : myMap.get(parameters.getCompletionType())) {
final ProcessingContext context = new ProcessingContext();
if (pair.first.accepts(parameters.getPosition(), context)) {
@@ -171,7 +169,6 @@ public abstract class CompletionContributor {
/**
* Invoked before completion is started. Is used mainly for determining custom offsets in editor, and to change default dummy identifier.
* @param context
*/
public void beforeCompletion(@NotNull CompletionInitializationContext context) {
}
@@ -188,8 +185,6 @@ public abstract class CompletionContributor {
/**
*
* @param parameters
* @param editor
* @return hint text to be shown if no variants are found, typically "No suggestions"
*/
@Nullable
@@ -201,7 +196,7 @@ public abstract class CompletionContributor {
* Called when the completion is finished quickly, lookup hasn't been shown and gives possibility to autoinsert some item (typically - the only one).
*/
@Nullable
public AutoCompletionDecision handleAutoCompletionPossibility(AutoCompletionContext context) {
public AutoCompletionDecision handleAutoCompletionPossibility(@NotNull AutoCompletionContext context) {
return null;
}
@@ -226,15 +221,16 @@ public abstract class CompletionContributor {
}
/**
* @param actionId
* @return String representation of action shortcut. Useful while advertising something
* @see #advertise(CompletionParameters)
*/
protected static String getActionShortcut(@NonNls final String actionId) {
@NotNull
protected static String getActionShortcut(@NonNls @NotNull final String actionId) {
return KeymapUtil.getFirstKeyboardShortcutText(ActionManager.getInstance().getAction(actionId));
}
public static List<CompletionContributor> forParameters(final CompletionParameters parameters) {
@NotNull
public static List<CompletionContributor> forParameters(@NotNull final CompletionParameters parameters) {
return ApplicationManager.getApplication().runReadAction(new Computable<List<CompletionContributor>>() {
@Override
public List<CompletionContributor> compute() {
@@ -243,6 +239,7 @@ public abstract class CompletionContributor {
});
}
@NotNull
public static List<CompletionContributor> forLanguage(@NotNull Language language) {
return MyExtensionPointManager.INSTANCE.forKey(language);
}
platform/lang-impl/src/com/intellij/codeInsight/completion/ComboEditorCompletionContributor.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.editor.Document;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.ui.StringComboboxEditor;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -30,7 +31,7 @@ import javax.swing.*;
public class ComboEditorCompletionContributor extends CompletionContributor{
@Override
public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet result) {
if (parameters.getInvocationCount() == 0) {
return;
}
platform/lang-impl/src/com/intellij/codeInsight/completion/DefaultCompletionContributor.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class DefaultCompletionContributor extends CompletionContributor {
}
@Override
public AutoCompletionDecision handleAutoCompletionPossibility(AutoCompletionContext context) {
public AutoCompletionDecision handleAutoCompletionPossibility(@NotNull AutoCompletionContext context) {
final LookupElement[] items = context.getItems();
if (items.length == 1) {
final LookupElement item = items[0];
platform/lang-impl/src/com/intellij/codeInsight/completion/LegacyCompletionContributor.java
+2 -1
View File
@@ -26,6 +26,7 @@ import com.intellij.psi.PsiReference;
import com.intellij.psi.ReferenceRange;
import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference;
import com.intellij.util.PairConsumer;
import org.jetbrains.annotations.NotNull;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -38,7 +39,7 @@ public class LegacyCompletionContributor extends CompletionContributor {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.LegacyCompletionContributor");
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet _result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet _result) {
if (parameters.getCompletionType() != CompletionType.BASIC) {
return;
}
platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java
+2 -1
View File
@@ -30,6 +30,7 @@ import com.intellij.psi.*;
import com.intellij.psi.impl.cache.impl.id.IdTableBuilding;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
@@ -45,7 +46,7 @@ import static com.intellij.patterns.PlatformPatterns.psiElement;
public class WordCompletionContributor extends CompletionContributor implements DumbAware {
@Override
public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet result) {
if (parameters.getCompletionType() == CompletionType.BASIC && shouldPerformWordCompletion(parameters)) {
addWordCompletionVariants(result, parameters, Collections.<String>emptySet());
}
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/CompletionContributorForInplaceRename.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateState;
import com.intellij.openapi.editor.Editor;
import org.jetbrains.annotations.NotNull;
/**
* User: anna
@@ -29,7 +30,7 @@ import com.intellij.openapi.editor.Editor;
public class CompletionContributorForInplaceRename extends CompletionContributor {
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
final Editor editor = parameters.getEditor();
final TemplateState state = TemplateManagerImpl.getTemplateState(editor);
if (state != null) {
platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionContributor.java
+2 -1
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
@@ -57,7 +58,7 @@ public class TextFieldWithAutoCompletionContributor<T> extends CompletionContrib
@Override
public void fillCompletionVariants(final CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull CompletionResultSet result) {
PsiFile file = parameters.getOriginalFile();
final TextFieldWithAutoCompletionListProvider<T> provider = file.getUserData(KEY);
platform/lang-impl/src/com/intellij/util/CompletionContributorForTextField.java
+2 -1
View File
@@ -7,6 +7,7 @@ import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.DumbService;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiPlainTextFile;
import org.jetbrains.annotations.NotNull;
/**
* @author sergey.evdokimov
@@ -14,7 +15,7 @@ import com.intellij.psi.PsiPlainTextFile;
public class CompletionContributorForTextField extends CompletionContributor implements DumbAware {
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
PsiFile file = parameters.getOriginalFile();
if (!(file instanceof PsiPlainTextFile)) return;
platform/vcs-impl/src/com/intellij/openapi/vcs/CommitCompletionContributor.java
+2 -1
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.vcs.ui.CommitMessage;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.ui.TextFieldWithAutoCompletionListProvider;
import org.jetbrains.annotations.NotNull;
/**
* @author Dmitry Avdeev
@@ -36,7 +37,7 @@ import com.intellij.ui.TextFieldWithAutoCompletionListProvider;
public class CommitCompletionContributor extends CompletionContributor {
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
PsiFile file = parameters.getOriginalFile();
Document document = PsiDocumentManager.getInstance(file.getProject()).getDocument(file);
if (document != null) {
plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellCompletionContributor.java
+1 -1
View File
@@ -34,7 +34,7 @@ import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
*/
public class GroovyShellCompletionContributor extends CompletionContributor {
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
PsiFile file = parameters.getOriginalFile();
if (!(file instanceof GroovyShellCodeFragment)) return;
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMethodMergingContributor.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiParameter;
import com.intellij.psi.PsiType;
import com.intellij.psi.ResolveResult;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
@@ -32,7 +33,7 @@ import java.util.ArrayList;
*/
public class GrMethodMergingContributor extends CompletionContributor {
@Override
public AutoCompletionDecision handleAutoCompletionPossibility(AutoCompletionContext context) {
public AutoCompletionDecision handleAutoCompletionPossibility(@NotNull AutoCompletionContext context) {
final CompletionParameters parameters = context.getParameters();
if (parameters.getCompletionType() != CompletionType.SMART && parameters.getCompletionType() != CompletionType.BASIC) {
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class GroovyCompletionContributor extends CompletionContributor {
}
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
if (!AFTER_NUMBER_LITERAL.accepts(parameters.getPosition())) {
super.fillCompletionVariants(parameters, result);
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class GroovyNoVariantsDelegator extends CompletionContributor {
}
@Override
public void fillCompletionVariants(final CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull CompletionResultSet result) {
LinkedHashSet<CompletionResult> plainResults = result.runRemainingContributors(parameters, true);
final boolean empty = JavaNoVariantsDelegator.containsOnlyPackages(plainResults) || suggestMetaAnnotations(parameters);
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java
+1 -1
View File
@@ -377,7 +377,7 @@ public class GroovySmartCompletionContributor extends CompletionContributor {
}
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
super.fillCompletionVariants(parameters, result);
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenDependenciesCompletionProvider.java
+2 -1
View File
@@ -17,6 +17,7 @@ import com.intellij.psi.xml.XmlTokenType;
import com.intellij.util.xml.DomElement;
import com.intellij.util.xml.DomFileElement;
import com.intellij.util.xml.DomManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.dom.converters.MavenDependencyCompletionUtil;
import org.jetbrains.idea.maven.dom.model.MavenDomDependency;
import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel;
@@ -28,7 +29,7 @@ import org.jetbrains.idea.maven.indices.MavenProjectIndicesManager;
public class MavenDependenciesCompletionProvider extends CompletionContributor {
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
PsiElement xmlText = parameters.getPosition().getParent();
if (!(xmlText instanceof XmlText)) return;
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java
+2 -1
View File
@@ -16,6 +16,7 @@ import com.intellij.util.Consumer;
import com.intellij.util.xml.DomElement;
import com.intellij.util.xml.DomFileDescription;
import com.intellij.util.xml.DomManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.dom.MavenDomProjectModelDescription;
import org.jetbrains.idea.maven.dom.MavenDomUtil;
import org.jetbrains.idea.maven.dom.converters.MavenDependencyCompletionUtil;
@@ -31,7 +32,7 @@ public class MavenPomXmlCompletionTagListenerContributor extends CompletionContr
private final Set<String> myHandledTags = ImmutableSet.of("dependency");
@Override
public void fillCompletionVariants(CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull final CompletionResultSet result) {
if (TemplateManager.getInstance(parameters.getOriginalFile().getProject()).getActiveTemplate(parameters.getEditor()) != null) {
return; // Don't brake the template.
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenSmartCompletionContributor.java
+1 -1
View File
@@ -39,7 +39,7 @@ import java.util.Collections;
public class MavenSmartCompletionContributor extends CompletionContributor {
@Override
public void fillCompletionVariants(final CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull CompletionResultSet result) {
if (parameters.getCompletionType() != CompletionType.SMART) return;
Collection<?> variants = getVariants(parameters);
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenVersionCompletionContributor.java
+1 -1
View File
@@ -46,7 +46,7 @@ import java.util.Set;
public class MavenVersionCompletionContributor extends CompletionContributor {
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
if (parameters.getCompletionType() != CompletionType.BASIC) return;
PsiElement element = parameters.getPosition();
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyCompletionContributor.java
+2 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiNamedElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.dom.MavenDomUtil;
import org.jetbrains.idea.maven.project.MavenProject;
import org.jetbrains.idea.maven.project.MavenProjectsManager;
@@ -33,7 +34,7 @@ import java.util.Collection;
public class MavenPropertyCompletionContributor extends CompletionContributor {
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
PsiFile psiFile = parameters.getOriginalFile();
Project project = psiFile.getProject();
plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlCompletionContributor.java
+1 -1
View File
@@ -177,7 +177,7 @@ public class JqlCompletionContributor extends CompletionContributor {
}
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
LOG.debug(DebugUtil.psiToString(parameters.getOriginalFile(), true));
super.fillCompletionVariants(parameters, result);
}
plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/codeinsight/YouTrackCompletionContributor.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class YouTrackCompletionContributor extends CompletionContributor {
private static final InsertHandler<LookupElement> INSERT_HANDLER = new MyInsertHandler();
@Override
public void fillCompletionVariants(final CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull CompletionResultSet result) {
if (LOG.isDebugEnabled()) {
LOG.debug(DebugUtil.psiToString(parameters.getOriginalFile(), true));
}
python/src/com/jetbrains/python/codeInsight/completion/PyClassNameCompletionContributor.java
+2 -1
View File
@@ -41,6 +41,7 @@ import com.jetbrains.python.psi.stubs.PyClassNameIndex;
import com.jetbrains.python.psi.stubs.PyFunctionNameIndex;
import com.jetbrains.python.psi.stubs.PyVariableNameIndex;
import com.jetbrains.python.psi.types.PyModuleType;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
@@ -50,7 +51,7 @@ import java.util.Collection;
public class PyClassNameCompletionContributor extends CompletionContributor {
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
if (parameters.isExtendedCompletion()) {
final PsiElement element = parameters.getPosition();
final PsiElement parent = element.getParent();
python/src/com/jetbrains/python/codeInsight/completion/PySpecialMethodNamesCompletionContributor.java
+1 -1
View File
@@ -40,7 +40,7 @@ import static com.intellij.patterns.PlatformPatterns.psiElement;
*/
public class PySpecialMethodNamesCompletionContributor extends CompletionContributor {
@Override
public AutoCompletionDecision handleAutoCompletionPossibility(AutoCompletionContext context) {
public AutoCompletionDecision handleAutoCompletionPossibility(@NotNull AutoCompletionContext context) {
// auto-insert the obvious only case; else show other cases.
final LookupElement[] items = context.getItems();
if (items.length == 1) {
xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.util.ProcessingContext;
import com.intellij.util.containers.HashSet;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.util.XmlUtil;
import org.jetbrains.annotations.NotNull;
/**
* @author peter
@@ -35,7 +36,7 @@ public class DomCompletionContributor extends CompletionContributor{
private final GenericValueReferenceProvider myProvider = new GenericValueReferenceProvider();
@Override
public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet result) {
if (parameters.getCompletionType() != CompletionType.BASIC) return;
if (domKnowsBetter(parameters, result)) {
xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class XmlCompletionContributor extends CompletionContributor {
}
@Override
public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet result) {
super.fillCompletionVariants(parameters, result);
if (result.isStopped()) {
return;
xml/impl/src/com/intellij/codeInsight/completion/XmlNoVariantsDelegator.java
+3 -1
View File
@@ -15,6 +15,8 @@
*/
package com.intellij.codeInsight.completion;
import org.jetbrains.annotations.NotNull;
/**
* @author Dmitry Avdeev
* Date: 12/19/11
@@ -22,7 +24,7 @@ package com.intellij.codeInsight.completion;
public class XmlNoVariantsDelegator extends CompletionContributor {
@Override
public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) {
public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet result) {
final boolean empty = result.runRemainingContributors(parameters, true).isEmpty();
if (!empty && parameters.getInvocationCount() == 0) {