diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
index 08451235915a..86fdab7daf63 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
@@ -2328,7 +2328,7 @@ public class JavaDocInfoGenerator {
     }
 
     @Override
-    public void visitLiteralExpression(PsiLiteralExpression expression) {
+    public void visitExpression(PsiExpression expression) {
       myBuffer.append(StringUtil.escapeXml(expression.getText()));
     }
 
diff --git a/java/java-tests/testData/codeInsight/javadocIG/constantFieldInitializer.html b/java/java-tests/testData/codeInsight/javadocIG/constantFieldInitializer.html
index b717a2f9fe12..65dcf7954506 100644
--- a/java/java-tests/testData/codeInsight/javadocIG/constantFieldInitializer.html
+++ b/java/java-tests/testData/codeInsight/javadocIG/constantFieldInitializer.html
@@ -1,2 +1,2 @@
-<html><head><base href="placeholder">    <style type="text/css">        #error {            background-color: #eeeeee;            margin-bottom: 10px;        }        p {            margin: 5px 0;        }    </style></head><body><small><b><a href="psi_element://Test"><code>Test</code></a></b></small><PRE>public static final int <b>field = 
+<html><head><base href="placeholder">    <style type="text/css">        #error {            background-color: #eeeeee;            margin-bottom: 10px;        }        p {            margin: 5px 0;        }    </style></head><body><small><b><a href="psi_element://Test"><code>Test</code></a></b></small><PRE>public static final int <b>field = 1 + 1
 Resolved value: 2</b></PRE></body></html>
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithLambda.html b/java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithLambda.html
new file mode 100644
index 000000000000..2363d968368c
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithLambda.html
@@ -0,0 +1 @@
+<html><head><base href="placeholder">    <style type="text/css">        #error {            background-color: #eeeeee;            margin-bottom: 10px;        }        p {            margin: 5px 0;        }    </style></head><body><small><b><a href="psi_element://A"><code>A</code></a></b></small><PRE>public static <font color=red>java.util.function.Consumer&lt;Integer&gt;</font> <b>F = i -&gt; System.out.println(i)</b></PRE></body></html>
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithLambda.java b/java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithLambda.java
new file mode 100644
index 000000000000..0cdf34380ef1
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithLambda.java
@@ -0,0 +1,3 @@
+class A {
+  public static java.util.function.Consumer<Integer> F = i -> System.out.println(i);
+}
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
index d47a613b1d3a..39e0a7267b92 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
@@ -162,6 +162,10 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase {
     doTestField();
   }
 
+  public void testFieldInitializedWithLambda() throws Exception {
+    doTestField();
+  }
+
   public void testEnumConstantOrdinal() throws Exception {
     PsiClass psiClass = getTestClass();
     PsiField field = psiClass.getFields() [0];
