From 09d6f71387b36d612a12ecfb74eccc5af07a2eac Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 20 Mar 2017 13:23:06 +0100
Subject: [PATCH] IDEA-169780 Show parameter types in implement/override popup

---
 .../completion/JavaGenerateMemberCompletionContributor.java   | 4 +++-
 .../completion/normal/StrikeOutDeprecatedSuperMethods.java    | 2 +-
 .../codeInsight/completion/NormalCompletionTest.groovy        | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
index cd183ba8b5dd..d18ddf040960 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
@@ -162,7 +162,9 @@ public class JavaGenerateMemberCompletionContributor {
     PsiType type = substitutor.substitute(prototype.getReturnType());
     String signature = modifiers + (type == null ? "" : type.getPresentableText() + " ") + methodName;
 
-    String parameters = PsiFormatUtil.formatMethod(prototype, substitutor, PsiFormatUtilBase.SHOW_PARAMETERS, PsiFormatUtilBase.SHOW_NAME);
+    String parameters = PsiFormatUtil.formatMethod(prototype, substitutor,
+                                                   PsiFormatUtilBase.SHOW_PARAMETERS,
+                                                   PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_RAW_TYPE | PsiFormatUtilBase.SHOW_TYPE);
 
     String overrideSignature = " @Override " + signature; // leading space to make it a middle match, under all annotation suggestions
     LookupElementBuilder element = LookupElementBuilder.create(prototype, signature).withLookupString(methodName).
diff --git a/java/java-tests/testData/codeInsight/completion/normal/StrikeOutDeprecatedSuperMethods.java b/java/java-tests/testData/codeInsight/completion/normal/StrikeOutDeprecatedSuperMethods.java
index 8837a3def6aa..c5a1f2ceb5b6 100644
--- a/java/java-tests/testData/codeInsight/completion/normal/StrikeOutDeprecatedSuperMethods.java
+++ b/java/java-tests/testData/codeInsight/completion/normal/StrikeOutDeprecatedSuperMethods.java
@@ -1,7 +1,7 @@
 class Super {
   void foo1() {}
   @Deprecated
-  void foo2() {}
+  void foo2(int x) {}
 }
 
 class Sub extends Super {
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index 4347c57af0ea..07b21317eb6b 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -1514,7 +1514,7 @@ class XInternalError {}
 
     def p = LookupElementPresentation.renderElement(item)
     assert p.itemText == 'public void run'
-    assert p.tailText == '(t, myInt) {...}'
+    assert p.tailText == '(String t, int myInt) {...}'
     assert p.typeText == 'Foo'
 
     lookup.currentItem = item
@@ -1552,7 +1552,7 @@ class XInternalError {}
 
     p = LookupElementPresentation.renderElement(setter)
     assert p.itemText == setter.lookupString
-    assert p.tailText == '(field) {...}'
+    assert p.tailText == '(int field) {...}'
     assert !p.typeText
 
     lookup.currentItem = getter