From f7e6b044eea666594646b4aee28d857ab3dbd080 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 12 Oct 2016 14:51:39 +0200
Subject: [PATCH] don't autoinsert an overload with parameters when
 java.completion.argument.live.template is enabled

---
 .../codeInsight/completion/JavaMethodMergingContributor.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java
index 13e8e401fd15..87d8ee3830a8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java
@@ -16,6 +16,7 @@
 package com.intellij.codeInsight.completion;
 
 import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiType;
 import org.jetbrains.annotations.NotNull;
@@ -37,6 +38,10 @@ public class JavaMethodMergingContributor extends CompletionContributor {
       return null;
     }
 
+    if (Registry.is("java.completion.argument.live.template")) {
+      return null;
+    }
+
     final LookupElement[] items = context.getItems();
     if (items.length > 1) {
       String commonName = null;