Suggestions from expression itself to have higher priority + fixed incorect upper case naming

idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt

@@ -34,13 +34,13 @@ public object KotlinNameSuggester {
     public fun suggestNamesByExpressionAndType(expression: JetExpression, bindingContext: BindingContext, validator: (String) -> Boolean, defaultName: String?): Collection<String> {
         val result = LinkedHashSet<String>()
 
+        result.addNamesByExpression(expression, validator)
+
         val type = bindingContext.getType(expression)
         if (type != null) {
             result.addNamesByType(type, validator)
         }
 
-        result.addNamesByExpression(expression, validator)
-
         if (result.isEmpty()) {
             result.addName(defaultName, validator)
         }
@@ -284,15 +284,7 @@ public object KotlinNameSuggester {
         if (expression == null) return
 
         when (expression) {
-            is JetSimpleNameExpression -> {
+            is JetSimpleNameExpression -> addCamelNames(expression.getReferencedName(), validator)
-                val referenceName = expression.getReferencedName()
-                if (referenceName == referenceName.toUpperCase()) {
-                    addName(referenceName, validator)
-                }
-                else {
-                    addCamelNames(referenceName, validator)
-                }
-            }
 
             is JetQualifiedExpression -> addNamesByExpression(expression.getSelectorExpression(), validator)
 

idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt.after

@@ -1,8 +1,8 @@
 fun main(args: Array<String>) {
-    val any = doSomething("one" + 1,
+    val doSomething = doSomething("one" + 1,
             "two",
             3 * 4)
-    val t = if (any != null) any else throw NullPointerException("Expression 'doSomething(\"one\" + 1, ...' must not be null")
+    val t = if (doSomething != null) doSomething else throw NullPointerException("Expression 'doSomething(\"one\" + 1, ...' must not be null")
 }
 
 fun doSomething(vararg a: Any): Any? = null

idea/testData/intentions/branched/doubleBangToIfThen/localVar.kt.after

@@ -1,7 +1,7 @@
 fun main(args: Array<String>) {
     var a: String? = "A"
-    val s = a
+    val a1 = a
-    doSomething(if (s != null) s else throw NullPointerException("Expression 'a' must not be null"))
+    doSomething(if (a1 != null) a1 else throw NullPointerException("Expression 'a' must not be null"))
 }
 
 fun doSomething(a: Any){}

idea/testData/intentions/branched/doubleBangToIfThen/topLevelValCustomGetter.kt.after

@@ -2,6 +2,6 @@ val a: String?
     get() = ""
 
 fun main(args: Array<String>) {
-    val s = a
+    val a1 = a
-    val x = if (s != null) s else throw NullPointerException("Expression 'a' must not be null")
+    val x = if (a1 != null) a1 else throw NullPointerException("Expression 'a' must not be null")
 }

idea/testData/intentions/branched/doubleBangToIfThen/topLevelVar.kt.after

@@ -1,5 +1,5 @@
 var a: String? = "A"
 fun main(args: Array<String>) {
-    val s = a
+    val a1 = a
-    val t = if (s != null) s else throw NullPointerException("Expression 'a' must not be null")
+    val t = if (a1 != null) a1 else throw NullPointerException("Expression 'a' must not be null")
 }

idea/testData/intentions/branched/doubleBangToIfThen/topLevelVarCustomGetter.kt.after

@@ -3,8 +3,8 @@ var a: String?
     set(v) {}
 
 fun main(args: Array<String>) {
-    val s = a
+    val a1 = a
-    doSomething(if (s != null) s else throw NullPointerException("Expression 'a' must not be null"))
+    doSomething(if (a1 != null) a1 else throw NullPointerException("Expression 'a' must not be null"))
 }
 
 fun doSomething(a: Any){}

idea/testData/intentions/branched/elvisToIfThen/callExpression.kt.after

@@ -6,6 +6,6 @@ fun bar() {
 }
 
 fun main(args: Array<String>) {
-    val s = foo()
+    val foo = foo()
-    if (s != null) s else bar()
+    if (foo != null) foo else bar()
 }

idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt.after

@@ -6,6 +6,6 @@ fun bar() {
 }
 
 fun main(args: Array<String>) {
-    val s = foo()
+    val foo = foo()
-    if (s != null) s else bar()
+    if (foo != null) foo else bar()
 }

idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt.after

@@ -1,5 +1,5 @@
 fun main(args: Array<String>) {
     var a: String? = "A"
-    val s = a
+    val a1 = a
-    if (s != null) s else "bar"
+    if (a1 != null) a1 else "bar"
 }

idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt.after

@@ -2,6 +2,6 @@ val a: String?
     get() = ""
 
 fun main(args: Array<String>) {
-    val s = a
+    val a1 = a
-    if (s != null) s else "bar"
+    if (a1 != null) a1 else "bar"
 }

idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt.after

@@ -1,5 +1,5 @@
 var a: String? = "A"
 fun main(args: Array<String>) {
-    val s = a
+    val a1 = a
-    if (s != null) s else "bar"
+    if (a1 != null) a1 else "bar"
 }

idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt.after

@@ -3,6 +3,6 @@ var a: String?
     set(v) {}
 
 fun main(args: Array<String>) {
-    val s = a
+    val a1 = a
-    if (s != null) s else "bar"
+    if (a1 != null) a1 else "bar"
 }

idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt.after

@@ -1,5 +1,5 @@
 fun foo(): String? = "foo"
 fun main(args: Array<String>) {
-    val s = foo()
+    val foo = foo()
-    if (s != null) s.length()
+    if (foo != null) foo.length()
 }

idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt.after

@@ -1,5 +1,5 @@
 fun foo(): String? = "foo"
 fun main(args: Array<String>) {
-    val s = foo()
+    val foo = foo()
-    if (s != null) s.length()
+    if (foo != null) foo.length()
 }

idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after

@@ -9,6 +9,6 @@ class Foo {
 
 fun main(args: Array<String>) {
     val a = Foo()
-    val s = a.b
+    val b = a.b
-    doSomething(if (s != null) s.length() else null)
+    doSomething(if (b != null) b.length() else null)
 }

idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after

@@ -2,7 +2,7 @@ fun doSomething<T>(a: T) {}
 
 fun main(args: Array<String>) {
     var a: String? = "A"
-    val s = a
+    val a1 = a
-    doSomething(if (s != null) s.length() else null)
+    doSomething(if (a1 != null) a1.length() else null)
 }
 

idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after

@@ -4,6 +4,6 @@ val a: String?
     get() = ""
 
 fun main(args: Array<String>) {
-    val s = a
+    val a1 = a
-    doSomething(if (s != null) s.length() else null)
+    doSomething(if (a1 != null) a1.length() else null)
 }

idea/testData/intentions/branched/safeAccessToIfThen/topLevelVar.kt.after

@@ -1,5 +1,5 @@
 var a: String? = "A"
 fun main(args: Array<String>) {
-    val s = a
+    val a1 = a
-    if (s != null) s.length()
+    if (a1 != null) a1.length()
 }

idea/testData/intentions/branched/safeAccessToIfThen/topLevelVarCustomGetter.kt.after

@@ -3,6 +3,6 @@ var a: String?
     set(v) {}
 
 fun main(args: Array<String>) {
-    val s = a
+    val a1 = a
-    if (s != null) s.length()
+    if (a1 != null) a1.length()
 }

idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.after.Dependency.java

@@ -3,7 +3,7 @@ import org.jetbrains.annotations.NotNull;
 class J {
 
     public static class A {
-        public A(int i, @NotNull String s, @NotNull B B) {
+        public A(int i, @NotNull String s, @NotNull B b) {
         }
     }
 }

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after

@@ -6,6 +6,6 @@ fun test() {
     val a: A<Int> = 2 + A(1)
 }
 
-fun Int.plus(A: A<Int>): A<Int> {
+fun Int.plus(a: A<Int>): A<Int> {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }

idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after

@@ -6,6 +6,6 @@ fun test() {
     val a: A<Int> = 2.foo(A(1))
 }
 
-fun Int.foo(A: A<Int>): A<Int> {
+fun Int.foo(a: A<Int>): A<Int> {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }

idea/testData/refactoring/introduceParameter/defaultValueNoTempVar.kt.after

@@ -8,6 +8,6 @@ fun foo(t: T): Int {
 fun bar(x: Int = foo(T(T(2).t + 1)))
 
 fun test() {
-    val i = T(2).t
+    val t = T(2).t
-    foo(T(i + 1))
+    foo(T(t + 1))
 }

idea/testData/refactoring/introduceParameter/substituteIncrement.kt.after

@@ -7,6 +7,6 @@ fun foo(i: Int): Int {
 fun test() {
     var x = 1
     val i = ++x
-    val i1 = x++
+    val x1 = x++
-    foo(i * i1)
+    foo(i * x1)
 }

idea/testData/refactoring/introduceVariable/It.kt.after

@@ -2,7 +2,7 @@ fun a(op: (Int) -> Int) {}
 fun b() {
     a {it}
     a {
-        val i = it
+        val it1 = it
-        i
+        it1
     }
 }

idea/testData/refactoring/introduceVariable/NoExplicitReceivers.kt.after

@@ -1,9 +1,9 @@
 // WITH_RUNTIME
 fun main(args: Array<String>) {
     with(A()) {
-        val i = prop
+        val prop = prop
-        println(i)
+        println(prop)
-        println(i)
+        println(prop)
     }
 }
 

idea/testData/refactoring/introduceVariable/NoNewLinesInBetween.kt.after

@@ -1,5 +1,5 @@
 fun bar(): Int = 1
 
 fun foo() {
-    val i = bar();
+    val bar = bar();
 }

idea/testData/refactoring/introduceVariable/NoNewLinesInBetweenNoBraces.kt.after

@@ -3,6 +3,6 @@ fun baz()
 
 fun foo() {
     if (true) {
-        val i = bar();
+        val bar = bar();
     } else baz()
 }

idea/testData/refactoring/introduceVariable/OneExplicitReceiver.kt.after

@@ -1,8 +1,8 @@
 fun main(args: Array<String>) {
     val myA = A()
-    val i = myA.prop
+    val prop = myA.prop
-    println(i)
+    println(prop)
-    println(i)
+    println(prop)
 }
 
 class A {

idea/testData/refactoring/introduceVariable/TwoExplicitReceivers.kt.after

@@ -7,7 +7,7 @@ class Foo() {
 
 fun main(args: Array<String>) {
     val f = Foo()
-    val i = Bar().f()
+    val f1 = Bar().f()
-    println(i)
+    println(f1)
-    println(i)
+    println(f1)
 }

idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions1.kt.after

@@ -4,7 +4,7 @@ class A {
 
 fun main(args: Array<String>) {
     val a = A()
-    val i = a.test()
+    val test = a.test()
 
-    val b = i
+    val b = test
 }

idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions2.kt.after

@@ -4,7 +4,7 @@ class A {
 
 fun main(args: Array<String>) {
     val a = A()
-    val i = a.test()
+    val test = a.test()
 
-    val b = i
+    val b = test
 }

idea/testData/refactoring/introduceVariable/callUnderSmartCast.kt.after

@@ -5,8 +5,8 @@ interface T {
 interface U: T
 
 fun test(t: T): Int {
-    val i = t.foo()
+    val foo = t.foo()
     return if (t is U)
-        i + 1
+        foo + 1
-    else i
+    else foo
 }

idea/testData/refactoring/introduceVariable/nonEquivalentReceivers.kt.after

@@ -6,9 +6,9 @@ fun foo(body: A.() -> Unit) {}
 
 fun bar() {
     foo {
-        val i = value
+        val value = value
-        print(i)
+        print(value)
-        print(i)
+        print(value)
     }
 
     foo {

idea/testData/refactoring/introduceVariable/notNullAssertion.kt.after

@@ -1,9 +1,9 @@
 fun foo(): Int {
     val s: String? = ""
-    val i = s!!.length
+    val length = s!!.length
     return if (true) {
-        i
+        length
     } else {
-        i
+        length
     }
 }