revert parameter info fix, as it breaks completion hints behavior

diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
index 116458dae6da97ef6f509b802ffa21e53bfe76ab..edf78ed8fb9ab5db0b48160ad37ef33e4a357061 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
@@ -324,9 +324,6 @@ public class MethodParameterInfoHandler implements ParameterInfoHandlerWithTabAc
       }
 
       context.setUIComponentEnabled(i, enabled);
       }
 
       context.setUIComponentEnabled(i, enabled);

-      if (!enabled && context.getHighlightedParameter() == candidate) {
-        context.setHighlightedParameter(null);
-      }

       if (candidates.length > 1 && enabled) {
         if (PsiManager.getInstance(context.getProject()).areElementsEquivalent(chosenMethod, method)) {
           chosenInfo = candidate;
       if (candidates.length > 1 && enabled) {
         if (PsiManager.getInstance(context.getProject()).areElementsEquivalent(chosenMethod, method)) {
           chosenInfo = candidate;

diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/ParameterInfoTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/ParameterInfoTest.java
index 81a05977034ea5984e668671c5026e690350c51e..73e6a1264f4d6f2fb1003b2fdb630c6f82ea5d01 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/ParameterInfoTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/ParameterInfoTest.java
@@ -361,7 +361,7 @@ public class ParameterInfoTest extends LightCodeInsightFixtureTestCase {
     myFixture.checkResultByFile(getTestName(false) + "_after.java");
   }
 
     myFixture.checkResultByFile(getTestName(false) + "_after.java");
   }
 

-  public void testHighlightCurrentParameterAfterTypingFirstArgumentOfThree() {
+  public void _testHighlightCurrentParameterAfterTypingFirstArgumentOfThree() {

     myFixture.configureByFile(getTestName(false) + ".java");
 
     MethodParameterInfoHandler handler = new MethodParameterInfoHandler();
     myFixture.configureByFile(getTestName(false) + ".java");
 
     MethodParameterInfoHandler handler = new MethodParameterInfoHandler();


@@ -374,7 +374,7 @@ public class ParameterInfoTest extends LightCodeInsightFixtureTestCase {
     MockUpdateParameterInfoContext updateContext = updateParameterInfo(handler, argList, items);
     assertTrue(updateContext.isUIComponentEnabled(0));
     assertTrue(updateContext.isUIComponentEnabled(1));
     MockUpdateParameterInfoContext updateContext = updateParameterInfo(handler, argList, items);
     assertTrue(updateContext.isUIComponentEnabled(0));
     assertTrue(updateContext.isUIComponentEnabled(1));

-    assertEquals(-1, updateContext.getCurrentParameter());
+    assertEquals(0, updateContext.getCurrentParameter());

 
     myFixture.type("1, ");
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
 
     myFixture.type("1, ");
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();