From 74dad1078b7c0729ca87af9470980d7abea2a4d0 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 24 Jun 2014 19:49:53 +0200 Subject: [PATCH] CompletionContributor: cleanup, notnull --- .../MethodsChainsCompletionContributor.java | 2 +- .../JavaClassNameCompletionContributor.java | 2 +- ...vaClassReferenceCompletionContributor.java | 2 +- .../completion/JavaCompletionContributor.java | 2 +- .../JavaDocCompletionContributor.java | 2 +- .../JavaMemberNameCompletionContributor.java | 3 ++- .../JavaMethodMergingContributor.java | 3 ++- .../completion/JavaNoVariantsDelegator.java | 3 ++- .../JavaSmartCompletionContributor.java | 2 +- .../RefactoringCompletionContributor.java | 3 ++- .../XmlBasicToClassNameDelegator.java | 3 ++- .../MagicCompletionContributor.java | 3 ++- .../HeavyNormalCompletionTest.groovy | 4 +++- .../completion/JavaAutoPopupTest.groovy | 2 +- .../completion/CompletionContributor.java | 21 ++++++++----------- .../ComboEditorCompletionContributor.java | 3 ++- .../DefaultCompletionContributor.java | 2 +- .../LegacyCompletionContributor.java | 3 ++- .../completion/WordCompletionContributor.java | 3 ++- ...CompletionContributorForInplaceRename.java | 3 ++- ...extFieldWithAutoCompletionContributor.java | 3 ++- .../CompletionContributorForTextField.java | 3 ++- .../vcs/CommitCompletionContributor.java | 3 ++- .../GroovyShellCompletionContributor.java | 2 +- .../GrMethodMergingContributor.java | 3 ++- .../GroovyCompletionContributor.java | 2 +- .../completion/GroovyNoVariantsDelegator.java | 2 +- .../GroovySmartCompletionContributor.java | 2 +- .../MavenDependenciesCompletionProvider.java | 3 ++- ...omXmlCompletionTagListenerContributor.java | 3 ++- .../MavenSmartCompletionContributor.java | 2 +- .../MavenVersionCompletionContributor.java | 2 +- .../MavenPropertyCompletionContributor.java | 3 ++- .../codeinsight/JqlCompletionContributor.java | 2 +- .../YouTrackCompletionContributor.java | 2 +- .../PyClassNameCompletionContributor.java | 3 ++- ...ecialMethodNamesCompletionContributor.java | 2 +- .../xml/impl/DomCompletionContributor.java | 3 ++- .../completion/XmlCompletionContributor.java | 2 +- .../completion/XmlNoVariantsDelegator.java | 4 +++- 40 files changed, 71 insertions(+), 51 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java index 5a8539629fb5..d96d6dfe0f83 100644 --- a/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java +++ b/java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java @@ -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)) { diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java index 66dbe098e5ce..2fc06a2dabd5 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java @@ -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); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java index e84eb2646ec0..f6871faea16e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java @@ -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) { diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java index 20615a027a42..47cf86819c0f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java @@ -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; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java index 7e7e0955b560..49379c2c4f3e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java @@ -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)) { diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java index a484e4b1f4f9..a1d4a6f8ac81 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java @@ -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; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java index 74bdc7ccc0a5..b409014c1fe8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java @@ -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; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaNoVariantsDelegator.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaNoVariantsDelegator.java index a174ef437acf..f36f567199a0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaNoVariantsDelegator.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaNoVariantsDelegator.java @@ -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 plainResults = result.runRemainingContributors(parameters, true); final boolean empty = containsOnlyPackages(plainResults) || suggestMetaAnnotations(parameters); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java index 37dc0829f969..61d8abe18368 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java @@ -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)); } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/RefactoringCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/RefactoringCompletionContributor.java index 62dbd0df8f79..9264599a4e1b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/RefactoringCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/RefactoringCompletionContributor.java @@ -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; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java b/java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java index a57303044485..310cf1444e88 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java @@ -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 || diff --git a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicCompletionContributor.java b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicCompletionContributor.java index 4f9fa882be6e..8150b618f8dc 100644 --- a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicCompletionContributor.java @@ -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; diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.groovy index 45a3f818df3f..5d0bcd4eaa8c 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.groovy @@ -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 diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy index 32dfc92200a8..8a54c9594144 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy @@ -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 } diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java index 831e056e7efb..06edc72a06f8 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java @@ -128,7 +128,8 @@ public abstract class CompletionContributor { private final MultiMap, CompletionProvider>> myMap = new MultiMap, CompletionProvider>>(); - public final void extend(@Nullable CompletionType type, final ElementPattern place, CompletionProvider provider) { + public final void extend(@Nullable CompletionType type, + @NotNull final ElementPattern place, CompletionProvider provider) { myMap.putValue(type, new Pair, CompletionProvider>(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, CompletionProvider> 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 forParameters(final CompletionParameters parameters) { + @NotNull + public static List forParameters(@NotNull final CompletionParameters parameters) { return ApplicationManager.getApplication().runReadAction(new Computable>() { @Override public List compute() { @@ -243,6 +239,7 @@ public abstract class CompletionContributor { }); } + @NotNull public static List forLanguage(@NotNull Language language) { return MyExtensionPointManager.INSTANCE.forKey(language); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/ComboEditorCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/ComboEditorCompletionContributor.java index ac685230486b..cd309b722d6a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/ComboEditorCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/ComboEditorCompletionContributor.java @@ -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; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/DefaultCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/DefaultCompletionContributor.java index cc69a9aeb611..fe495d3e6f3a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/DefaultCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/DefaultCompletionContributor.java @@ -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]; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/LegacyCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/LegacyCompletionContributor.java index 1104bb83d826..b8b58bf5bd1f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/LegacyCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/LegacyCompletionContributor.java @@ -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; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java index 5d1ef95ffb4c..7dc1cd40dfad 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/WordCompletionContributor.java @@ -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.emptySet()); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/CompletionContributorForInplaceRename.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/CompletionContributorForInplaceRename.java index 2c59c10fb486..04bfd2a4a06f 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/CompletionContributorForInplaceRename.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/CompletionContributorForInplaceRename.java @@ -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) { diff --git a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionContributor.java b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionContributor.java index 2debdbe82fe6..27ddc4e1b1b2 100644 --- a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionContributor.java @@ -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 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 provider = file.getUserData(KEY); diff --git a/platform/lang-impl/src/com/intellij/util/CompletionContributorForTextField.java b/platform/lang-impl/src/com/intellij/util/CompletionContributorForTextField.java index d220e1fd7cdf..50eadaa0a2c4 100644 --- a/platform/lang-impl/src/com/intellij/util/CompletionContributorForTextField.java +++ b/platform/lang-impl/src/com/intellij/util/CompletionContributorForTextField.java @@ -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; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/CommitCompletionContributor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/CommitCompletionContributor.java index 5bcb5fbf165d..0b09f753168f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/CommitCompletionContributor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/CommitCompletionContributor.java @@ -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) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellCompletionContributor.java index 709c5e396483..b1a3a00418fd 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellCompletionContributor.java @@ -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; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMethodMergingContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMethodMergingContributor.java index 9fced9dac8bd..e84361b0f57d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMethodMergingContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMethodMergingContributor.java @@ -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) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java index e02f73314eb5..4c0c342030fb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java @@ -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); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java index 6985f16cbc31..745f353ccf5b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java @@ -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 plainResults = result.runRemainingContributors(parameters, true); final boolean empty = JavaNoVariantsDelegator.containsOnlyPackages(plainResults) || suggestMetaAnnotations(parameters); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java index 68d418c1f381..4b5459ff432e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java @@ -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); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenDependenciesCompletionProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenDependenciesCompletionProvider.java index 985d406d6c1b..68905ea2c3db 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenDependenciesCompletionProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenDependenciesCompletionProvider.java @@ -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; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java index 8fde37fbdf79..9e28f2e60598 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenPomXmlCompletionTagListenerContributor.java @@ -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 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. } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenSmartCompletionContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenSmartCompletionContributor.java index f56ec2685bd3..6284009779fe 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenSmartCompletionContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenSmartCompletionContributor.java @@ -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); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenVersionCompletionContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenVersionCompletionContributor.java index 9c8884676db4..f02c7ab5f92c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenVersionCompletionContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/completion/MavenVersionCompletionContributor.java @@ -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(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyCompletionContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyCompletionContributor.java index 2a3d6871b4b6..d37c9ae16370 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyCompletionContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyCompletionContributor.java @@ -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(); diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlCompletionContributor.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlCompletionContributor.java index e243402b14c0..fd4975f83d95 100644 --- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlCompletionContributor.java +++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/codeinsight/JqlCompletionContributor.java @@ -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); } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/codeinsight/YouTrackCompletionContributor.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/codeinsight/YouTrackCompletionContributor.java index 67b95abdb4aa..81326b9a1fe3 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/codeinsight/YouTrackCompletionContributor.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/codeinsight/YouTrackCompletionContributor.java @@ -34,7 +34,7 @@ public class YouTrackCompletionContributor extends CompletionContributor { private static final InsertHandler 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)); } diff --git a/python/src/com/jetbrains/python/codeInsight/completion/PyClassNameCompletionContributor.java b/python/src/com/jetbrains/python/codeInsight/completion/PyClassNameCompletionContributor.java index 24318f85ad04..3b2e8283cee5 100644 --- a/python/src/com/jetbrains/python/codeInsight/completion/PyClassNameCompletionContributor.java +++ b/python/src/com/jetbrains/python/codeInsight/completion/PyClassNameCompletionContributor.java @@ -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(); diff --git a/python/src/com/jetbrains/python/codeInsight/completion/PySpecialMethodNamesCompletionContributor.java b/python/src/com/jetbrains/python/codeInsight/completion/PySpecialMethodNamesCompletionContributor.java index db0e4537db38..bc3de2d28cfe 100644 --- a/python/src/com/jetbrains/python/codeInsight/completion/PySpecialMethodNamesCompletionContributor.java +++ b/python/src/com/jetbrains/python/codeInsight/completion/PySpecialMethodNamesCompletionContributor.java @@ -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) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java index e0478c90a3d3..63b5d217018c 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java @@ -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)) { diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java index 86a2155124dd..cc066a921447 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java @@ -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; diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlNoVariantsDelegator.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlNoVariantsDelegator.java index 9166b67ab532..da991ac048f3 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlNoVariantsDelegator.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlNoVariantsDelegator.java @@ -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) {