@NotNull location in weigher

java/java-impl/src/com/intellij/codeInsight/completion/NameEndMatchingDegreeWeigher.java

@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class NameEndMatchingDegreeWeigher extends CompletionWeigher {
 
-  public Integer weigh(@NotNull final LookupElement element, @Nullable final CompletionLocation location) {
+  public Integer weigh(@NotNull final LookupElement element, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferAbstractWeigher.java

@@ -18,15 +18,14 @@ package com.intellij.codeInsight.completion;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.psi.*;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author peter
 */
 public class PreferAbstractWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
-    if (location == null || location.getCompletionType() != CompletionType.SMART) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
+    if (location.getCompletionType() != CompletionType.SMART) {
       return null;
     }
 

java/java-impl/src/com/intellij/codeInsight/completion/PreferAccessibleWeigher.java

@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class PreferAccessibleWeigher extends CompletionWeigher {
 
-  public MyEnum weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public MyEnum weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferDefaultTypeWeigher.java

@@ -51,7 +51,7 @@ public class PreferDefaultTypeWeigher extends CompletionWeigher {
     expectedNoSelect
   }
 
-  public MyResult weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public MyResult weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferEnumConstantsWeigher.java

@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class PreferEnumConstantsWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferExpectedTypeWeigher.java

@@ -33,7 +33,7 @@ public class PreferExpectedTypeWeigher extends CompletionWeigher {
     ofDefaultType,
   }
 
-  public MyResult weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public MyResult weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferFieldsAndGettersWeigher.java

@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class PreferFieldsAndGettersWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferLessParametersWeigher.java

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class PreferLessParametersWeigher extends CompletionWeigher {
   @Override
-  public Integer weigh(@NotNull LookupElement element, @Nullable CompletionLocation location) {
+  public Integer weigh(@NotNull LookupElement element, @NotNull CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java

@@ -33,7 +33,7 @@ public class PreferLocalVariablesLiteralsAndAnnoMethodsWeigher extends Completio
     annoMethod,
   }
 
-  public MyResult weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public MyResult weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferNonGenericWeigher.java

@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class PreferNonGenericWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferShorterWeigher.java

@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class PreferShorterWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/PreferSimpleWeigher.java

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class PreferSimpleWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/RecursionWeigher.java

@@ -37,7 +37,7 @@ public class RecursionWeigher extends CompletionWeigher {
     delegation,
   }
 
-  public Result weigh(@NotNull final LookupElement element, @Nullable final CompletionLocation location) {
+  public Result weigh(@NotNull final LookupElement element, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/SameWordsWeigher.java

@@ -30,7 +30,7 @@ import java.util.List;
 */
 public class SameWordsWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/completion/StaticMembersWeigher.java

@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
  * @author peter
  */
 public class StaticMembersWeigher extends CompletionWeigher {
-  public Comparable weigh(@NotNull LookupElement element, @Nullable CompletionLocation loc) {
+  public Comparable weigh(@NotNull LookupElement element, @NotNull CompletionLocation loc) {
     if (loc == null) {
       return null;
     }

java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java

@@ -36,7 +36,7 @@ public class ExplicitlyImportedWeigher extends ProximityWeigher {
     }
   });
 
-  public Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location) {
+  public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
     final PsiElement position = location.getPosition();
     if (position == null){
       return null;

java/java-impl/src/com/intellij/psi/util/proximity/JavaInheritanceWeigher.java

@@ -35,7 +35,7 @@ public class JavaInheritanceWeigher extends ProximityWeigher {
     }
   });
 
-  public Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location) {
+  public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
     if (location.getPosition() == null){
       return null;
     }

java/java-impl/src/com/intellij/psi/util/proximity/KnownPackageWeigher.java

@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
 */
 public class KnownPackageWeigher extends ProximityWeigher {
 
-  public Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location) {
+  public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
     if (element instanceof PsiClass) {
       @NonNls final String qname = ((PsiClass)element).getQualifiedName();
       if (qname != null) {

java/java-impl/src/com/intellij/psi/util/proximity/SamePsiMemberWeigher.java

@@ -37,7 +37,7 @@ public class SamePsiMemberWeigher extends ProximityWeigher {
     }
   });
 
-  public Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location) {
+  public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
     if (location.getPosition() == null){
       return null;
     }

platform/lang-api/src/com/intellij/codeInsight/completion/CompletionWeigher.java

@@ -24,5 +24,5 @@ import org.jetbrains.annotations.NotNull;
  */
 public abstract class CompletionWeigher extends Weigher<LookupElement, CompletionLocation> {
 
-  public abstract Comparable weigh(@NotNull final LookupElement element, final CompletionLocation location);
+  public abstract Comparable weigh(@NotNull final LookupElement element, @NotNull final CompletionLocation location);
 }

platform/lang-api/src/com/intellij/psi/Weigher.java

@@ -42,5 +42,5 @@ public abstract class Weigher<T, Location> {
     return myDebugName == null ? super.toString() : myDebugName;
   }
 
-  @Nullable public abstract Comparable weigh(@NotNull T element, @Nullable Location location);
+  @Nullable public abstract Comparable weigh(@NotNull T element, @NotNull Location location);
 }

platform/lang-impl/src/com/intellij/codeInsight/completion/GroupingWeigher.java

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class GroupingWeigher extends CompletionWeigher {
   @Override
-  public Integer weigh(@NotNull LookupElement element, @Nullable CompletionLocation location) {
+  public Integer weigh(@NotNull LookupElement element, @NotNull CompletionLocation location) {
     if (location == null) {
       return null;
     }

platform/lang-impl/src/com/intellij/codeInsight/completion/LookupElementProximityWeigher.java

@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class LookupElementProximityWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

platform/lang-impl/src/com/intellij/codeInsight/completion/LookupStringWeigher.java

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class LookupStringWeigher extends CompletionWeigher {
   @Override
-  public String weigh(@NotNull LookupElement element, @Nullable CompletionLocation location) {
+  public String weigh(@NotNull LookupElement element, @NotNull CompletionLocation location) {
     if (location == null) {
       return null;
     }

platform/lang-impl/src/com/intellij/codeInsight/completion/NegativeStatisticsWeigher.java

@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class NegativeStatisticsWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

platform/lang-impl/src/com/intellij/codeInsight/completion/PrefixMatchingWeigher.java

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class PrefixMatchingWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

platform/lang-impl/src/com/intellij/codeInsight/completion/PriorityWeigher.java

@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class PriorityWeigher extends CompletionWeigher {
   @Override
-  public Double weigh(@NotNull LookupElement element, @Nullable CompletionLocation location) {
+  public Double weigh(@NotNull LookupElement element, @NotNull CompletionLocation location) {
     if (location == null) {
       return null;
     }

platform/lang-impl/src/com/intellij/codeInsight/completion/StatisticsWeigher.java

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
 */
 public class StatisticsWeigher extends CompletionWeigher {
 
-  public Comparable weigh(@NotNull final LookupElement item, @Nullable final CompletionLocation location) {
+  public Comparable weigh(@NotNull final LookupElement item, @NotNull final CompletionLocation location) {
     if (location == null) {
       return null;
     }

platform/lang-impl/src/com/intellij/psi/util/proximity/OpenedInEditorWeigher.java

@@ -37,7 +37,7 @@ public class OpenedInEditorWeigher extends ProximityWeigher {
     }
   });
 
-  public Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location) {
+  public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
     if (location.getProject() == null){
       return null;
     }

platform/lang-impl/src/com/intellij/psi/util/proximity/ProximityWeigher.java

@@ -25,5 +25,5 @@ import org.jetbrains.annotations.NotNull;
  */
 public abstract class ProximityWeigher extends Weigher<PsiElement, ProximityLocation> {
 
-  public abstract Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location);
+  public abstract Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location);
 }

platform/lang-impl/src/com/intellij/psi/util/proximity/SameDirectoryWeigher.java

@@ -37,7 +37,7 @@ public class SameDirectoryWeigher extends ProximityWeigher {
     }
   });
 
-  public Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location) {
+  public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
     if (location.getPosition() == null){
       return null;
     }

platform/lang-impl/src/com/intellij/psi/util/proximity/SameLogicalRootWeigher.java

@@ -37,7 +37,7 @@ public class SameLogicalRootWeigher extends ProximityWeigher {
     }
   });
 
-  public Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location) {
+  public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
     if (location.getPosition() == null){
       return null;
     }

platform/lang-impl/src/com/intellij/psi/util/proximity/SameModuleWeigher.java

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
 */
 public class SameModuleWeigher extends ProximityWeigher {
 
-  public Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location) {
+  public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
     return location.getPositionModule() == ModuleUtil.findModuleForPsiElement(element);
   }
 }

platform/lang-impl/src/com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java

@@ -31,7 +31,7 @@ import java.util.List;
 */
 public class SdkOrLibraryWeigher extends ProximityWeigher {
 
-  public Comparable weigh(@NotNull final PsiElement element, final ProximityLocation location) {
+  public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
     if (location.getProject() == null){
       return null;
     }