cleanup

platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java

@@ -446,7 +446,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
     return forceHighlightParents;
   }
 
-  protected HighlightInfoHolder createInfoHolder(final PsiFile file) {
+  protected HighlightInfoHolder createInfoHolder(@NotNull PsiFile file) {
     final HighlightInfoFilter[] filters = HighlightInfoFilter.EXTENSION_POINT_NAME.getExtensions();
     return new CustomHighlightInfoHolder(file, getColorsScheme(), filters);
   }

platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java

@@ -68,6 +68,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
     return ServiceManager.getService(TargetElementUtil.class);
   }
 
+  @Override
   public int getAllAccepted() {
     int result = REFERENCED_ELEMENT_ACCEPTED | ELEMENT_NAME_ACCEPTED | LOOKUP_ITEM_ACCEPTED;
     for (TargetElementUtilExtender each : Extensions.getExtensions(TargetElementUtilExtender.EP_NAME)) {
@@ -76,6 +77,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
     return result;
   }
 
+  @Override
   public int getDefinitionSearchFlags() {
     int result = getAllAccepted();
     for (TargetElementUtilExtender each : Extensions.getExtensions(TargetElementUtilExtender.EP_NAME)) {
@@ -84,6 +86,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
     return result;
   }
 
+  @Override
   public int getReferenceSearchFlags() {
     int result = getAllAccepted();
     for (TargetElementUtilExtender each : Extensions.getExtensions(TargetElementUtilExtender.EP_NAME)) {
@@ -93,7 +96,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
   }
 
   @Nullable
-  public static PsiReference findReference(Editor editor) {
+  public static PsiReference findReference(@NotNull Editor editor) {
     int offset = editor.getCaretModel().getOffset();
     PsiReference result = findReference(editor, offset);
     if (result == null) {
@@ -156,11 +159,8 @@ public class TargetElementUtil extends TargetElementUtilBase {
   }
 
   public static boolean inVirtualSpace(@NotNull Editor editor, int offset) {
-    if (offset == editor.getCaretModel().getOffset()) {
-      return EditorUtil.inVirtualSpace(editor, editor.getCaretModel().getLogicalPosition());
-    }
-
-    return false;
+    return offset == editor.getCaretModel().getOffset()
+           && EditorUtil.inVirtualSpace(editor, editor.getCaretModel().getLogicalPosition());
   }
 
   @Nullable
@@ -178,6 +178,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
     return null;
   }
 
+  @Override
   @Nullable
   public PsiElement findTargetElement(@NotNull Editor editor, int flags, int offset) {
     PsiElement result = doFindTargetElement(editor, flags, offset);
@@ -257,6 +258,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
     return true;
   }
 
+  @Override
   @Nullable
   public PsiElement adjustElement(final Editor editor, final int flags, @Nullable PsiElement element, @Nullable PsiElement contextElement) {
     PsiElement langElement = element == null ? contextElement : element;
@@ -267,6 +269,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
     return element;
   }
 
+  @Override
   @Nullable
   public PsiElement adjustReference(@NotNull PsiReference ref) {
     PsiElement element = ref.getElement();
@@ -274,6 +277,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
     return evaluator != null ? evaluator.adjustReference(ref) : null;
   }
 
+  @Override
   @Nullable
   public PsiElement getNamedElement(@Nullable final PsiElement element, final int offsetInElement) {
     if (element == null) return null;
@@ -376,6 +380,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
     }
   }
 
+  @Override
   @NotNull
   public Collection<PsiElement> getTargetCandidates(@NotNull PsiReference reference) {
     PsiElement refElement = reference.getElement();
@@ -405,6 +410,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
     return Collections.emptyList();
   }
 
+  @Override
   public PsiElement getGotoDeclarationTarget(final PsiElement element, final PsiElement navElement) {
     TargetElementEvaluatorEx2 evaluator = element != null ? getElementEvaluatorsEx2(element.getLanguage()) : null;
     if (evaluator != null) {
@@ -414,16 +420,19 @@ public class TargetElementUtil extends TargetElementUtilBase {
     return navElement;
   }
 
+  @Override
   public boolean includeSelfInGotoImplementation(@NotNull final PsiElement element) {
     TargetElementEvaluator evaluator = targetElementEvaluator.forLanguage(element.getLanguage());
     return evaluator == null || evaluator.includeSelfInGotoImplementation(element);
   }
 
+  @Override
   public boolean acceptImplementationForReference(@Nullable PsiReference reference, @Nullable PsiElement element) {
     TargetElementEvaluatorEx2 evaluator = element != null ? getElementEvaluatorsEx2(element.getLanguage()) : null;
     return evaluator == null || evaluator.acceptImplementationForReference(reference, element);
   }
 
+  @Override
   @NotNull
   public SearchScope getSearchScope(Editor editor, @NotNull PsiElement element) {
     TargetElementEvaluatorEx2 evaluator = getElementEvaluatorsEx2(element.getLanguage());