IDEA-56950 IDEA doesn't consider types int and Integer as identical

plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java

@@ -103,7 +103,8 @@ public class TypesUtil {
     if (candidates.length == 1) {
       final PsiElement element = candidates[0].getElement();
       if (element instanceof PsiMethod) {
-        return candidates[0].getSubstitutor().substitute(PsiUtil.getSmartReturnType((PsiMethod)element));
+        return boxPrimitiveType(candidates[0].getSubstitutor().substitute(PsiUtil.getSmartReturnType((PsiMethod)element)),
+                                place.getManager(), place.getResolveScope());
       }
     }
     return null;

plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java

@@ -102,12 +102,13 @@ public class GrIndexPropertyImpl extends GrExpressionImpl implements GrIndexProp
           componentType = TypesUtil.boxPrimitiveType(((PsiArrayType)thisType).getComponentType(), getManager(), getResolveScope());
         }
         else if (InheritanceUtil.isInheritor(thisType, CommonClassNames.JAVA_UTIL_MAP) && argTypes.length == 1) {
-          componentType = substituteTypeParameter(thisType, CommonClassNames.JAVA_UTIL_MAP, 1, true);
+          componentType = TypesUtil
+            .boxPrimitiveType(substituteTypeParameter(thisType, CommonClassNames.JAVA_UTIL_MAP, 1, true), getManager(), getResolveScope());
         }
 
         if (overloadedOperatorType != null &&
             (componentType == null || !TypesUtil.isAssignable(overloadedOperatorType, componentType, getManager(), getResolveScope()))) {
-          return overloadedOperatorType;
+          return TypesUtil.boxPrimitiveType(overloadedOperatorType, getManager(), getResolveScope());
         }
         return componentType;
       }

plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTest.java

@@ -230,4 +230,7 @@ public class GroovyCompletionTest extends GroovyCompletionTestBase {
                                                                             "}");
     doSmartTest();
   }
-}
+
+  public void testIntCompletionInPlusMethod() {doBasicTest();}
+  public void testIntCompletionInGenericParameter() {doBasicTest();}
+}

plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTestBase.java

@@ -31,7 +31,7 @@ abstract public class GroovyCompletionTestBase extends LightCodeInsightFixtureTe
     myFixture.checkResultByFile(getTestName(false) + "_after.groovy", true);
   }
 
-  protected void doBasicTest() throws Exception {
+  protected void doBasicTest() {
     myFixture.testCompletion(getTestName(false) + ".groovy", getTestName(false) + "_after.groovy");
   }
 

plugins/groovy/testdata/groovy/completion/IntCompletionInGenericParameter.groovy

@@ -0,0 +1,2 @@
+List<int> list
+list.get(0).intV<caret>

plugins/groovy/testdata/groovy/completion/IntCompletionInGenericParameter_after.groovy

@@ -0,0 +1,2 @@
+List<int> list
+list.get(0).intValue()

plugins/groovy/testdata/groovy/completion/IntCompletionInPlusMethod.groovy

@@ -0,0 +1,5 @@
+class X {
+  int plus(X x) {}
+}
+
+(new X()+new X()).intV<caret>

plugins/groovy/testdata/groovy/completion/IntCompletionInPlusMethod_after.groovy

@@ -0,0 +1,5 @@
+class X {
+  int plus(X x) {}
+}
+
+(new X()+new X()).intValue()