[r=nik] no comma/semicolon/whatever when no closing bracket is inserted (IDEA-62725, IDEA-58920)

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

@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInsight.completion;
 
+import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.ExpectedTypeInfo;
 import com.intellij.codeInsight.TailType;
@@ -57,10 +58,15 @@ public class SmartCompletionDecorator extends TailTypeDecorator<LookupElement> {
       return defType;
     }
 
-    final PsiExpression enclosing = PsiTreeUtil.getContextOfType(myPosition, PsiExpression.class, true);
     LookupElement item = getDelegate();
+    Object object = item.getObject();
+    if (!CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET && (object instanceof PsiMethod || object instanceof PsiClass)) {
+      return TailType.NONE;
+    }
 
-    if (enclosing != null && item.getObject() instanceof PsiElement) {
+    final PsiExpression enclosing = PsiTreeUtil.getContextOfType(myPosition, PsiExpression.class, true);
+
+    if (enclosing != null && object instanceof PsiElement) {
       final PsiType type = getItemType(item);
       final TailType itemType = item instanceof LookupItem ? ((LookupItem)item).getTailType() : TailType.NONE;
       TailType cached = itemType;

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

@@ -0,0 +1,5 @@
+class A {
+  {
+    String c = new String(<caret>
+  }
+}

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

@@ -0,0 +1,5 @@
+class A {
+  {
+    String c = new Stri<caret>
+  }
+}

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

@@ -0,0 +1,6 @@
+class A {
+  {
+    String x;
+    Class c = x.getClass(<caret>
+  }
+}

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

@@ -0,0 +1,6 @@
+class A {
+  {
+    String x;
+    Class c = x.getCl<caret>
+  }
+}

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

@@ -0,0 +1,7 @@
+class A {
+  {
+    Class c = this.xxxxx(<caret>
+  }
+
+  Class xxxxx() {}
+}

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

@@ -0,0 +1,7 @@
+class A {
+  {
+    Class c = this.xx<caret>
+  }
+
+  Class xxxxx() {}
+}

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

@@ -477,6 +477,29 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
 
   public void testSameNamedFieldAndLocal() throws Throwable { doTest(); }
 
+  public void testNoTailWhenNoPairBracket() throws Throwable {
+    doTestNoPairBracket();
+  }
+
+  public void testNoTailWhenNoPairBracket2() throws Throwable {
+    doTestNoPairBracket();
+  }
+
+  private void doTestNoPairBracket() throws Exception {
+    boolean old = CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET;
+    CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET = false;
+    try {
+      doTest();
+    }
+    finally {
+      CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET = old;
+    }
+  }
+
+  public void testNoConstructorTailWhenNoPairBracket() throws Throwable {
+    doTestNoPairBracket();
+  }
+
   public void testAbstractClassTwice() throws Throwable {
     configureByTestName();
     assertOneElement(myItems);