fix completion context to collapse to diamonds (IDEA-169491)

java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java

@@ -159,7 +159,7 @@ public class JavaInheritorsGetter extends CompletionProvider<CompletionParameter
         }
         try {
           final PsiStatement statement = elementFactory
-            .createStatementFromText(canonicalText + " v = new " + erasedText + "<>()", parameters.getOriginalFile());
+            .createStatementFromText(canonicalText + " v = new " + erasedText + "<>()", parameters.getPosition());
           final PsiVariable declaredVar = (PsiVariable)((PsiDeclarationStatement)statement).getDeclaredElements()[0];
           final PsiNewExpression initializer = (PsiNewExpression)declaredVar.getInitializer();
           final boolean hasDefaultConstructorOrNoGenericsOne = PsiDiamondTypeImpl.hasDefaultConstructor(psiClass) ||

java/java-tests/testData/codeInsight/completion/smartType/DiamondCollapsedWithMethodTypeParameter-out.java

@@ -0,0 +1,8 @@
+import java.util.ArrayList;
+
+class Test {
+
+    <T> ArrayList<T> foo () {
+        return new ArrayList<>();
+    }
+}

java/java-tests/testData/codeInsight/completion/smartType/DiamondCollapsedWithMethodTypeParameter.java

@@ -0,0 +1,8 @@
+import java.util.ArrayList;
+
+class Test {
+
+    <T> ArrayList<T> foo () {
+        return new Arr<caret>
+    }
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType17CompletionTest.java

@@ -42,6 +42,10 @@ public class SmartType17CompletionTest extends LightFixtureCompletionTestCase {
     doTest();
   }
 
+  public void testDiamondCollapsedWithMethodTypeParameter() throws Exception {
+    doTest();
+  }
+
   public void testDiamondNotCollapsed() throws Exception {
     doTest();
   }