From 0f4a39556929abaa46cb7f108fa8bd50c82eace7 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Tue, 26 Apr 2016 22:12:03 +0300 Subject: [PATCH] IDEA-155239 Quick documentation does not show static lambda field values when "Show quick doc on mouse move" is enabled --- .../intellij/codeInsight/javadoc/JavaDocInfoGenerator.java | 2 +- .../codeInsight/javadocIG/constantFieldInitializer.html | 2 +- .../codeInsight/javadocIG/fieldInitializedWithLambda.html | 1 + .../codeInsight/javadocIG/fieldInitializedWithLambda.java | 3 +++ .../codeInsight/javadoc/JavaDocInfoGeneratorTest.java | 4 ++++ 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithLambda.html create mode 100644 java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithLambda.java 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 @@ - Test
public static final int field = 
+    Test
public static final int field = 1 + 1
 Resolved value: 2

\ 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 @@
+    A
public static java.util.function.Consumer<Integer> F = i -> System.out.println(i)

\ 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 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];