From af9fcfd5e0cc66fba970be00b198e0a5147f7718 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 8 Feb 2012 19:36:31 +0400
Subject: [PATCH] Fix automatic selection of completion proposal

---
 idea/src/META-INF/plugin.xml                   |  4 +++-
 .../completion/JetCompletionConfidence.java    | 18 ------------------
 .../handlers/JetFunctionInsertHandler.java     |  4 +++-
 3 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 idea/src/org/jetbrains/jet/plugin/completion/JetCompletionConfidence.java

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 9408e472dd3..c94e6d9f806 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -83,7 +83,9 @@
 
       <completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.completion.GlobalMemberCompletionContributor"/>
       <completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor" id="liveTemplates" order="first"/>
-      <completion.confidence language="jet" implementationClass="org.jetbrains.jet.plugin.completion.JetCompletionConfidence"/>
+
+      <completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier"/>
+      <completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" order="last"/>
       <completion.skip implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor$Skipper" id="skipLiveTemplate"/>
 
       <psi.referenceContributor language="jet" order="after JetCompletionContributor" implementation="org.jetbrains.jet.plugin.references.JetReferenceContributor"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionConfidence.java b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionConfidence.java
deleted file mode 100644
index 3ac10ac06f5..00000000000
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionConfidence.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jetbrains.jet.plugin.completion;
-
-import com.intellij.codeInsight.completion.CompletionConfidence;
-import com.intellij.codeInsight.completion.CompletionParameters;
-import com.intellij.util.ThreeState;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author Nikolay Krasko
- */
-public class JetCompletionConfidence extends CompletionConfidence {
-
-    @NotNull
-    @Override
-    public ThreeState shouldFocusLookup(@NotNull CompletionParameters parameters) {
-        return ThreeState.YES;
-    }
-}
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java
index b7a5e8ed21c..c5fcaf89d59 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java
@@ -20,7 +20,9 @@ import org.jetbrains.jet.plugin.completion.JetLookupObject;
 import org.jetbrains.jet.plugin.quickfix.ImportClassHelper;
 
 /**
- * Inserts '()' after function proposal insert.
+ * Performs number of code modification after insertion jet function:
+ * - Insert ()
+ * - Add import directive if necessary for top level functions
  *
  * @author Nikolay Krasko
  */