diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/NameEndMatchingDegreeWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/NameEndMatchingDegreeWeigher.java
index 552f59a0d1bc..f4b1bda9efdd 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/NameEndMatchingDegreeWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferAbstractWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferAbstractWeigher.java
index 654cca81e70d..7f121d4a2dea 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferAbstractWeigher.java
+++ b/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;
     }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferAccessibleWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferAccessibleWeigher.java
index 26267696b707..816f95b97f0e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferAccessibleWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferDefaultTypeWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferDefaultTypeWeigher.java
index 6be3da3eb998..0b66e21022c2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferDefaultTypeWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferEnumConstantsWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferEnumConstantsWeigher.java
index 4899ecbca614..325fdae2bf16 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferEnumConstantsWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferExpectedTypeWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferExpectedTypeWeigher.java
index 7dfd86d752e6..cb0ecbb0c436 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferExpectedTypeWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferFieldsAndGettersWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferFieldsAndGettersWeigher.java
index ff88db7d6a06..c92faccbb46c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferFieldsAndGettersWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferLessParametersWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferLessParametersWeigher.java
index 12ede7f6bc66..f1660146f188 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferLessParametersWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java
index ada9865b1ea1..389822564af9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferNonGenericWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferNonGenericWeigher.java
index 44f569e2aa1c..4a9c69361352 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferNonGenericWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferShorterWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferShorterWeigher.java
index f013297d217e..223559778dbd 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferShorterWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferSimpleWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferSimpleWeigher.java
index fb42e47b4b53..97339f0b33c7 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferSimpleWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/RecursionWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/RecursionWeigher.java
index 6e923c7bfdb8..8d481bec614a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/RecursionWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/SameWordsWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/SameWordsWeigher.java
index 24905775bd24..ca315e8df12c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/SameWordsWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/StaticMembersWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/StaticMembersWeigher.java
index ec71e9ce69a3..a152036ff12e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/StaticMembersWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java b/java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java
index 4ca80134626f..352a255c6dc7 100644
--- a/java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java
+++ b/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;
diff --git a/java/java-impl/src/com/intellij/psi/util/proximity/JavaInheritanceWeigher.java b/java/java-impl/src/com/intellij/psi/util/proximity/JavaInheritanceWeigher.java
index 68107f90207a..480494888d08 100644
--- a/java/java-impl/src/com/intellij/psi/util/proximity/JavaInheritanceWeigher.java
+++ b/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;
     }
diff --git a/java/java-impl/src/com/intellij/psi/util/proximity/KnownPackageWeigher.java b/java/java-impl/src/com/intellij/psi/util/proximity/KnownPackageWeigher.java
index 67489c362d63..fdc2e7dd629a 100644
--- a/java/java-impl/src/com/intellij/psi/util/proximity/KnownPackageWeigher.java
+++ b/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) {
diff --git a/java/java-impl/src/com/intellij/psi/util/proximity/SamePsiMemberWeigher.java b/java/java-impl/src/com/intellij/psi/util/proximity/SamePsiMemberWeigher.java
index b0cfce2217f0..4ce5b959612c 100644
--- a/java/java-impl/src/com/intellij/psi/util/proximity/SamePsiMemberWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionWeigher.java b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionWeigher.java
index 2634a6abeb04..a6148cb981b2 100644
--- a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionWeigher.java
+++ b/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);
 }
diff --git a/platform/lang-api/src/com/intellij/psi/Weigher.java b/platform/lang-api/src/com/intellij/psi/Weigher.java
index dd34b2b34b91..59058becfab5 100644
--- a/platform/lang-api/src/com/intellij/psi/Weigher.java
+++ b/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);
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/GroupingWeigher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/GroupingWeigher.java
index 754531e9db3a..10d7fda3fd4b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/GroupingWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/LookupElementProximityWeigher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/LookupElementProximityWeigher.java
index ac28794e8610..7632bebc0f42 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/LookupElementProximityWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/LookupStringWeigher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/LookupStringWeigher.java
index 90eb2e299d42..c16d0f6d71ba 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/LookupStringWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/NegativeStatisticsWeigher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/NegativeStatisticsWeigher.java
index 782215f7c8fd..681377a6cec2 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/NegativeStatisticsWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/PrefixMatchingWeigher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/PrefixMatchingWeigher.java
index e4dfa078e138..b08cbbf259a7 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/PrefixMatchingWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/PriorityWeigher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/PriorityWeigher.java
index e9ab0a873732..b4eabfb4cc1b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/PriorityWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/StatisticsWeigher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/StatisticsWeigher.java
index 44b06398c1ae..d62235ac3e1c 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/StatisticsWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/OpenedInEditorWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/OpenedInEditorWeigher.java
index 68af8afdfaf5..feea3e66329b 100644
--- a/platform/lang-impl/src/com/intellij/psi/util/proximity/OpenedInEditorWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/ProximityWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/ProximityWeigher.java
index 46e18b7be331..81ebdce8e98e 100644
--- a/platform/lang-impl/src/com/intellij/psi/util/proximity/ProximityWeigher.java
+++ b/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);
 }
diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameDirectoryWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/SameDirectoryWeigher.java
index 7da58fb9abb9..887497524889 100644
--- a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameDirectoryWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameLogicalRootWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/SameLogicalRootWeigher.java
index 41484b47e2cc..e8aa4ec891f4 100644
--- a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameLogicalRootWeigher.java
+++ b/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;
     }
diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameModuleWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/SameModuleWeigher.java
index 76193c59139e..9f4199d1530b 100644
--- a/platform/lang-impl/src/com/intellij/psi/util/proximity/SameModuleWeigher.java
+++ b/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);
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java
index da4e642dc6cb..5a9f10049f47 100644
--- a/platform/lang-impl/src/com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java
+++ b/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;
     }