From 2c1a0a0c4b69a1ad774843baecb8219cb37ce33e Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 3 Apr 2015 17:42:05 +0300
Subject: [PATCH] Smart completion: expected type instantiation made higher
 priority than static members

---
 .../kotlin/idea/completion/smart/Utils.kt        |  2 +-
 .../smart/NoNameSimilarityForQualifier.kt        |  2 +-
 .../completion/weighers/smart/SmartPriority3.kt  | 16 ++++++++++++++++
 .../SmartCompletionWeigherTestGenerated.java     |  6 ++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 idea/testData/completion/weighers/smart/SmartPriority3.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
index 012674b016b..17baa76032e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
@@ -268,8 +268,8 @@ enum class SmartCompletionItemPriority {
     THIS
     DEFAULT
     NULLABLE
-    STATIC_MEMBER
     INSTANTIATION
+    STATIC_MEMBER
     ANONYMOUS_OBJECT
     LAMBDA_NO_PARAMS
     LAMBDA
diff --git a/idea/testData/completion/weighers/smart/NoNameSimilarityForQualifier.kt b/idea/testData/completion/weighers/smart/NoNameSimilarityForQualifier.kt
index 02941ae19ca..2f1af1c59c9 100644
--- a/idea/testData/completion/weighers/smart/NoNameSimilarityForQualifier.kt
+++ b/idea/testData/completion/weighers/smart/NoNameSimilarityForQualifier.kt
@@ -11,5 +11,5 @@ fun bar() {
 }
 
 // ORDER: it
-// ORDER: create
 // ORDER: Name
+// ORDER: create
diff --git a/idea/testData/completion/weighers/smart/SmartPriority3.kt b/idea/testData/completion/weighers/smart/SmartPriority3.kt
new file mode 100644
index 00000000000..ed8716f8b7b
--- /dev/null
+++ b/idea/testData/completion/weighers/smart/SmartPriority3.kt
@@ -0,0 +1,16 @@
+class C {
+    companion object {
+        val INSTANCE = C()
+        fun create() = C()
+    }
+}
+
+fun foo(p: C) {
+    foo(<caret>)
+}
+
+
+// ORDER: p
+// ORDER: C
+// ORDER: INSTANCE
+// ORDER: create
diff --git a/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java
index dc9f93957df..9c7c9800069 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java
@@ -203,4 +203,10 @@ public class SmartCompletionWeigherTestGenerated extends AbstractSmartCompletion
         String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/smart/SmartPriority2.kt");
         doTest(fileName);
     }
+
+    @TestMetadata("SmartPriority3.kt")
+    public void testSmartPriority3() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/smart/SmartPriority3.kt");
+        doTest(fileName);
+    }
 }