diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/RangeHighlighter.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/RangeHighlighter.java
index 099c27077f1f..a0a8372eff42 100644
--- a/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/RangeHighlighter.java
+++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/markup/RangeHighlighter.java
@@ -45,6 +45,7 @@ public interface RangeHighlighter extends RangeMarker {
    *
    * @return the highlighter target area.
    */
+  @NotNull
   HighlighterTargetArea getTargetArea();
 
   /**
diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/RangeHighlighterEx.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/RangeHighlighterEx.java
index abf776ae6b9b..aebfe0a1f329 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/RangeHighlighterEx.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/RangeHighlighterEx.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
 
 public interface RangeHighlighterEx extends RangeHighlighter, RangeMarkerEx {
   boolean isAfterEndOfLine();
-  void setAfterEndOfLine(boolean val);
+  void setAfterEndOfLine(boolean value);
 
   int getAffectedAreaStartOffset();
 
diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
index fe114feef7d1..ff7c244aeab0 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
@@ -97,6 +97,7 @@ class RangeHighlighterImpl extends RangeMarkerImpl implements RangeHighlighterEx
     return node == null ? -1 : node.myLayer;
   }
 
+  @NotNull
   @Override
   public HighlighterTargetArea getTargetArea() {
     return getData().getTargetArea();
@@ -209,8 +210,8 @@ class RangeHighlighterImpl extends RangeMarkerImpl implements RangeHighlighterEx
   }
 
   @Override
-  public void setAfterEndOfLine(boolean afterEndOfLine) {
-    getData().setAfterEndOfLine(afterEndOfLine);
+  public void setAfterEndOfLine(boolean value) {
+    getData().setAfterEndOfLine(value);
   }
 
   @Override