diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
index 1c3d5e0defd9..7a4ca788a22a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
@@ -628,7 +628,7 @@ public class HighlightControlFlowUtil {
       final String name = variable.getName();
       String description = JavaErrorMessages.message("assignment.to.final.variable", name);
       final HighlightInfo highlightInfo =
-        HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(expression).descriptionAndTooltip(description).create();
+        HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(reference.getTextRange()).descriptionAndTooltip(description).create();
       final PsiClass innerClass = getInnerClassVariableReferencedFrom(variable, expression);
       if (innerClass == null || variable instanceof PsiField) {
         IntentionAction fix = QUICK_FIX_FACTORY.createModifierListFix(variable, PsiModifier.FINAL, false, false);
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AssignToFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AssignToFinal.java
index 2049abc9a56b..94c279faa10e 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AssignToFinal.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AssignToFinal.java
@@ -8,24 +8,24 @@ public class a21  {
   }
   void f1(int i) {
     final int j = 4;
-    <error descr="Cannot assign a value to final variable 'j'">j = 3</error>;
+    <error descr="Cannot assign a value to final variable 'j'">j</error> = 3;
     
   }
   void f2(final int i) {
     final int j = 4;
-    <error descr="Cannot assign a value to final variable 'i'">i = 3</error>;
+    <error descr="Cannot assign a value to final variable 'i'">i</error> = 3;
     
   }
   void f3( int ip) {
-    <error descr="Cannot assign a value to final variable 'fi'">fi = 3</error>;
-    for (final int i = 0; i<3; <error descr="Cannot assign a value to final variable 'i'">i++</error>) {
+    <error descr="Cannot assign a value to final variable 'fi'">fi</error> = 3;
+    for (final int i = 0; i<3; <error descr="Cannot assign a value to final variable 'i'">i</error>++) {
       int k = 4;  
     }
     final int i1 = 0;
-    <error descr="Cannot assign a value to final variable 'i1'">i1++</error>;
-    <error descr="Cannot assign a value to final variable 'i1'">--i1</error>;
+    <error descr="Cannot assign a value to final variable 'i1'">i1</error>++;
+    --<error descr="Cannot assign a value to final variable 'i1'">i1</error>;
     int i2 = -i1 + ~i1;
-    final int j = (<error descr="Cannot assign a value to final variable 'j'">j=0</error>) == 1 || j==0 ? 9 : j;
+    final int j = (<error descr="Cannot assign a value to final variable 'j'">j</error>=0) == 1 || j==0 ? 9 : j;
   }
 
   static final boolean DEBUG = false;
@@ -35,13 +35,13 @@ public class a21  {
 }
 class B extends a21 {
   public B() {
-    <error descr="Cannot assign a value to final variable 'fi'">fi = 0</error>;
+    <error descr="Cannot assign a value to final variable 'fi'">fi</error> = 0;
   }
   void f() {
      final Integer i;
      new Runnable() {
          public void run() {
-             <error descr="Cannot assign a value to final variable 'i'">i = new Integer(4)</error>;
+             <error descr="Cannot assign a value to final variable 'i'">i</error> = new Integer(4);
          }
      };
   }
@@ -53,7 +53,7 @@ class a21_2 {
     i = 0;
     new Runnable() {
       public void run() {
-        <error descr="Cannot assign a value to final variable 'i'">i = 0</error>;
+        <error descr="Cannot assign a value to final variable 'i'">i</error> = 0;
       }
     };
   }
@@ -66,7 +66,7 @@ class Foo {
     this.next = null;
 
     if (previous != null) {
-      <error descr="Cannot assign a value to final variable 'next'">previous.next = this</error>;
+      <error descr="Cannot assign a value to final variable 'next'">previous.next</error> = this;
     }
   }
 }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MultiCatch.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MultiCatch.java
index 94e944837f80..83b2d4976ffd 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MultiCatch.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MultiCatch.java
@@ -54,7 +54,7 @@ abstract class C {
     try { f(); } catch (E1 | E2 e) { } catch (<error descr="Exception 'C.E2' has already been caught">E2</error> e) { }
 
     try { f(); } catch (E1 | E2 e) { <error descr="Incompatible types. Found: 'C.E1 | C.E2', required: 'C.E2'">E2 ee = e;</error> }
-    try { f(); } catch (E1 | E2 e) { <error descr="Cannot assign a value to final variable 'e'">e = new E1()</error>; }
+    try { f(); } catch (E1 | E2 e) { <error descr="Cannot assign a value to final variable 'e'">e</error> = new E1(); }
     try { f(); } catch (E1 | E2 e) { <error descr="Incompatible types. Found: 'C.E', required: 'C.E1 | C.E2'">e = new E()</error>; }
 
     try { g(); }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/TryWithResources.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/TryWithResources.java
index c0f8eb7cc342..b21f42ccaf4c 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/TryWithResources.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/TryWithResources.java
@@ -54,7 +54,7 @@ class C {
   void m3(int p) throws Exception {
     try (MyResource r = new MyResource()) {
       r.doSomething();
-      <error descr="Cannot assign a value to final variable 'r'">r = null</error>;
+      <error descr="Cannot assign a value to final variable 'r'">r</error> = null;
       int <error descr="Variable 'r' is already defined in the scope">r</error> = 0;
     }
     catch (E e) {