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

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
-    doSomething(if (s != null) s else throw NullPointerException("Expression 'a' must not be null"))
+    val a1 = a
+    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 x = if (s != null) s else throw NullPointerException("Expression 'a' must not be null")
+    val a1 = a
+    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 t = if (s != null) s else throw NullPointerException("Expression 'a' must not be null")
+    val a1 = a
+    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
-    doSomething(if (s != null) s else throw NullPointerException("Expression 'a' must not be null"))
+    val a1 = a
+    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()
-    if (s != null) s else bar()
+    val foo = foo()
+    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()
-    if (s != null) s else bar()
+    val foo = foo()
+    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
-    if (s != null) s else "bar"
+    val a1 = a
+    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
-    if (s != null) s else "bar"
+    val a1 = a
+    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
-    if (s != null) s else "bar"
+    val a1 = a
+    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
-    if (s != null) s else "bar"
+    val a1 = a
+    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()
-    if (s != null) s.length()
+    val foo = foo()
+    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()
-    if (s != null) s.length()
+    val foo = foo()
+    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
-    doSomething(if (s != null) s.length() else null)
+    val b = a.b
+    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
-    doSomething(if (s != null) s.length() else null)
+    val a1 = a
+    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
-    doSomething(if (s != null) s.length() else null)
+    val a1 = a
+    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
-    if (s != null) s.length()
+    val a1 = a
+    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
-    if (s != null) s.length()
+    val a1 = a
+    if (a1 != null) a1.length()
 }