From db144a612177d93ead36e3895b68974a5b29e2d8 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 26 Jun 2015 22:03:06 +0300 Subject: [PATCH] Suggestions from expression itself to have higher priority + fixed incorect upper case naming --- .../kotlin/idea/core/KotlinNameSuggester.kt | 14 +++----------- .../exceptionTextHandlesMultiline.kt.after | 4 ++-- .../branched/doubleBangToIfThen/localVar.kt.after | 4 ++-- .../topLevelValCustomGetter.kt.after | 4 ++-- .../doubleBangToIfThen/topLevelVar.kt.after | 4 ++-- .../topLevelVarCustomGetter.kt.after | 4 ++-- .../branched/elvisToIfThen/callExpression.kt.after | 4 ++-- .../elvisToIfThen/callExpressionParens.kt.after | 4 ++-- .../branched/elvisToIfThen/localVarLhs.kt.after | 4 ++-- .../elvisToIfThen/topLevelValCustomGetter.kt.after | 4 ++-- .../branched/elvisToIfThen/topLevelVar.kt.after | 4 ++-- .../elvisToIfThen/topLevelVarCustomGetter.kt.after | 4 ++-- .../safeAccessToIfThen/callExpression.kt.after | 4 ++-- .../callExpressionParens.kt.after | 4 ++-- .../customGetterAsReceiver.kt.after | 4 ++-- .../safeAccessToIfThen/localVarLhs.kt.after | 4 ++-- .../topLevelValCustomGetter.kt.after | 4 ++-- .../safeAccessToIfThen/topLevelVar.kt.after | 4 ++-- .../topLevelVarCustomGetter.kt.after | 4 ++-- ...atorToNestedJavaSupercall.after.Dependency.java | 2 +- .../binaryOperations/plusOnLibType.kt.after | 2 +- .../createFunction/call/funOnLibType.kt.after | 2 +- .../defaultValueNoTempVar.kt.after | 4 ++-- .../substituteIncrement.kt.after | 4 ++-- .../refactoring/introduceVariable/It.kt.after | 4 ++-- .../introduceVariable/NoExplicitReceivers.kt.after | 6 +++--- .../introduceVariable/NoNewLinesInBetween.kt.after | 2 +- .../NoNewLinesInBetweenNoBraces.kt.after | 2 +- .../introduceVariable/OneExplicitReceiver.kt.after | 6 +++--- .../TwoExplicitReceivers.kt.after | 6 +++--- .../UsedAndUnusedExpressions1.kt.after | 4 ++-- .../UsedAndUnusedExpressions2.kt.after | 4 ++-- .../introduceVariable/callUnderSmartCast.kt.after | 6 +++--- .../nonEquivalentReceivers.kt.after | 6 +++--- .../introduceVariable/notNullAssertion.kt.after | 6 +++--- 35 files changed, 72 insertions(+), 80 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt index 865e82426e1..089dda7e3b2 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt +++ b/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 { val result = LinkedHashSet() + 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 -> { - val referenceName = expression.getReferencedName() - if (referenceName == referenceName.toUpperCase()) { - addName(referenceName, validator) - } - else { - addCamelNames(referenceName, validator) - } - } + is JetSimpleNameExpression -> addCamelNames(expression.getReferencedName(), validator) is JetQualifiedExpression -> addNamesByExpression(expression.getSelectorExpression(), validator) diff --git a/idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt.after b/idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt.after index 6097a7ef46d..1a89b8b8a6a 100644 --- a/idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt.after +++ b/idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt.after @@ -1,8 +1,8 @@ fun main(args: Array) { - 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 diff --git a/idea/testData/intentions/branched/doubleBangToIfThen/localVar.kt.after b/idea/testData/intentions/branched/doubleBangToIfThen/localVar.kt.after index 52c80123634..8470bc3346e 100644 --- a/idea/testData/intentions/branched/doubleBangToIfThen/localVar.kt.after +++ b/idea/testData/intentions/branched/doubleBangToIfThen/localVar.kt.after @@ -1,7 +1,7 @@ fun main(args: Array) { 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){} diff --git a/idea/testData/intentions/branched/doubleBangToIfThen/topLevelValCustomGetter.kt.after b/idea/testData/intentions/branched/doubleBangToIfThen/topLevelValCustomGetter.kt.after index c4b5f1a6732..4c34a07fa29 100644 --- a/idea/testData/intentions/branched/doubleBangToIfThen/topLevelValCustomGetter.kt.after +++ b/idea/testData/intentions/branched/doubleBangToIfThen/topLevelValCustomGetter.kt.after @@ -2,6 +2,6 @@ val a: String? get() = "" fun main(args: Array) { - 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") } diff --git a/idea/testData/intentions/branched/doubleBangToIfThen/topLevelVar.kt.after b/idea/testData/intentions/branched/doubleBangToIfThen/topLevelVar.kt.after index e17a2a482f1..5e8b2ad491b 100644 --- a/idea/testData/intentions/branched/doubleBangToIfThen/topLevelVar.kt.after +++ b/idea/testData/intentions/branched/doubleBangToIfThen/topLevelVar.kt.after @@ -1,5 +1,5 @@ var a: String? = "A" fun main(args: Array) { - 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") } diff --git a/idea/testData/intentions/branched/doubleBangToIfThen/topLevelVarCustomGetter.kt.after b/idea/testData/intentions/branched/doubleBangToIfThen/topLevelVarCustomGetter.kt.after index b508c304b0a..e1bae914e56 100644 --- a/idea/testData/intentions/branched/doubleBangToIfThen/topLevelVarCustomGetter.kt.after +++ b/idea/testData/intentions/branched/doubleBangToIfThen/topLevelVarCustomGetter.kt.after @@ -3,8 +3,8 @@ var a: String? set(v) {} fun main(args: Array) { - 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){} diff --git a/idea/testData/intentions/branched/elvisToIfThen/callExpression.kt.after b/idea/testData/intentions/branched/elvisToIfThen/callExpression.kt.after index 065ebbcefe5..e95a9c98d8e 100644 --- a/idea/testData/intentions/branched/elvisToIfThen/callExpression.kt.after +++ b/idea/testData/intentions/branched/elvisToIfThen/callExpression.kt.after @@ -6,6 +6,6 @@ fun bar() { } fun main(args: Array) { - val s = foo() - if (s != null) s else bar() + val foo = foo() + if (foo != null) foo else bar() } diff --git a/idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt.after b/idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt.after index 065ebbcefe5..e95a9c98d8e 100644 --- a/idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt.after +++ b/idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt.after @@ -6,6 +6,6 @@ fun bar() { } fun main(args: Array) { - val s = foo() - if (s != null) s else bar() + val foo = foo() + if (foo != null) foo else bar() } diff --git a/idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt.after b/idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt.after index c9486b05218..8bc4e7a50c0 100644 --- a/idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt.after +++ b/idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt.after @@ -1,5 +1,5 @@ fun main(args: Array) { var a: String? = "A" - val s = a - if (s != null) s else "bar" + val a1 = a + if (a1 != null) a1 else "bar" } diff --git a/idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt.after b/idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt.after index 1b11ac0ed61..f49bf79d250 100644 --- a/idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt.after +++ b/idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt.after @@ -2,6 +2,6 @@ val a: String? get() = "" fun main(args: Array) { - val s = a - if (s != null) s else "bar" + val a1 = a + if (a1 != null) a1 else "bar" } diff --git a/idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt.after b/idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt.after index e4aceeeef5d..47514ef4e7b 100644 --- a/idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt.after +++ b/idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt.after @@ -1,5 +1,5 @@ var a: String? = "A" fun main(args: Array) { - val s = a - if (s != null) s else "bar" + val a1 = a + if (a1 != null) a1 else "bar" } diff --git a/idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt.after b/idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt.after index 93d9ada5c3e..46b5130fc24 100644 --- a/idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt.after +++ b/idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt.after @@ -3,6 +3,6 @@ var a: String? set(v) {} fun main(args: Array) { - val s = a - if (s != null) s else "bar" + val a1 = a + if (a1 != null) a1 else "bar" } diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt.after index 36fd675f675..cac21479944 100644 --- a/idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt.after +++ b/idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt.after @@ -1,5 +1,5 @@ fun foo(): String? = "foo" fun main(args: Array) { - val s = foo() - if (s != null) s.length() + val foo = foo() + if (foo != null) foo.length() } diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt.after index 36fd675f675..cac21479944 100644 --- a/idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt.after +++ b/idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt.after @@ -1,5 +1,5 @@ fun foo(): String? = "foo" fun main(args: Array) { - val s = foo() - if (s != null) s.length() + val foo = foo() + if (foo != null) foo.length() } diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after index 12650d0674f..6023c6ef532 100644 --- a/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after +++ b/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after @@ -9,6 +9,6 @@ class Foo { fun main(args: Array) { 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) } diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after index 09919a2bb05..4a6d7aa7a2d 100644 --- a/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after +++ b/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after @@ -2,7 +2,7 @@ fun doSomething(a: T) {} fun main(args: Array) { 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) } diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after index a4a59867cd1..27276cfda12 100644 --- a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after +++ b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after @@ -4,6 +4,6 @@ val a: String? get() = "" fun main(args: Array) { - val s = a - doSomething(if (s != null) s.length() else null) + val a1 = a + doSomething(if (a1 != null) a1.length() else null) } diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVar.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVar.kt.after index 75f22822585..6912d6e8d0d 100644 --- a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVar.kt.after +++ b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVar.kt.after @@ -1,5 +1,5 @@ var a: String? = "A" fun main(args: Array) { - val s = a - if (s != null) s.length() + val a1 = a + if (a1 != null) a1.length() } diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVarCustomGetter.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVarCustomGetter.kt.after index ac86b6ace94..56500375724 100644 --- a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVarCustomGetter.kt.after +++ b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVarCustomGetter.kt.after @@ -3,6 +3,6 @@ var a: String? set(v) {} fun main(args: Array) { - val s = a - if (s != null) s.length() + val a1 = a + if (a1 != null) a1.length() } diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.after.Dependency.java b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.after.Dependency.java index eae683a3583..aff64df0f17 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.after.Dependency.java +++ b/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) { } } } \ No newline at end of file diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after index 61f210720ba..74166b2a503 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after @@ -6,6 +6,6 @@ fun test() { val a: A = 2 + A(1) } -fun Int.plus(A: A): A { +fun Int.plus(a: A): A { throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after index 066f5a3d8fe..51c92879905 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after @@ -6,6 +6,6 @@ fun test() { val a: A = 2.foo(A(1)) } -fun Int.foo(A: A): A { +fun Int.foo(a: A): A { throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } diff --git a/idea/testData/refactoring/introduceParameter/defaultValueNoTempVar.kt.after b/idea/testData/refactoring/introduceParameter/defaultValueNoTempVar.kt.after index 4e91ca6dc3d..c60632f827d 100644 --- a/idea/testData/refactoring/introduceParameter/defaultValueNoTempVar.kt.after +++ b/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 - foo(T(i + 1)) + val t = T(2).t + foo(T(t + 1)) } \ No newline at end of file diff --git a/idea/testData/refactoring/introduceParameter/substituteIncrement.kt.after b/idea/testData/refactoring/introduceParameter/substituteIncrement.kt.after index 49624325bf2..96edd2e9d2f 100644 --- a/idea/testData/refactoring/introduceParameter/substituteIncrement.kt.after +++ b/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++ - foo(i * i1) + val x1 = x++ + foo(i * x1) } \ No newline at end of file diff --git a/idea/testData/refactoring/introduceVariable/It.kt.after b/idea/testData/refactoring/introduceVariable/It.kt.after index e4fd6200727..03b81349b8c 100644 --- a/idea/testData/refactoring/introduceVariable/It.kt.after +++ b/idea/testData/refactoring/introduceVariable/It.kt.after @@ -2,7 +2,7 @@ fun a(op: (Int) -> Int) {} fun b() { a {it} a { - val i = it - i + val it1 = it + it1 } } \ No newline at end of file diff --git a/idea/testData/refactoring/introduceVariable/NoExplicitReceivers.kt.after b/idea/testData/refactoring/introduceVariable/NoExplicitReceivers.kt.after index 9ec9e3de118..5260c9aeb4e 100644 --- a/idea/testData/refactoring/introduceVariable/NoExplicitReceivers.kt.after +++ b/idea/testData/refactoring/introduceVariable/NoExplicitReceivers.kt.after @@ -1,9 +1,9 @@ // WITH_RUNTIME fun main(args: Array) { with(A()) { - val i = prop - println(i) - println(i) + val prop = prop + println(prop) + println(prop) } } diff --git a/idea/testData/refactoring/introduceVariable/NoNewLinesInBetween.kt.after b/idea/testData/refactoring/introduceVariable/NoNewLinesInBetween.kt.after index 1f5f3942917..c4f9a835ffb 100644 --- a/idea/testData/refactoring/introduceVariable/NoNewLinesInBetween.kt.after +++ b/idea/testData/refactoring/introduceVariable/NoNewLinesInBetween.kt.after @@ -1,5 +1,5 @@ fun bar(): Int = 1 fun foo() { - val i = bar(); + val bar = bar(); } \ No newline at end of file diff --git a/idea/testData/refactoring/introduceVariable/NoNewLinesInBetweenNoBraces.kt.after b/idea/testData/refactoring/introduceVariable/NoNewLinesInBetweenNoBraces.kt.after index e136ba4be0c..bc328edc052 100644 --- a/idea/testData/refactoring/introduceVariable/NoNewLinesInBetweenNoBraces.kt.after +++ b/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() } \ No newline at end of file diff --git a/idea/testData/refactoring/introduceVariable/OneExplicitReceiver.kt.after b/idea/testData/refactoring/introduceVariable/OneExplicitReceiver.kt.after index 9e04e8bcfcb..7e497ed639a 100644 --- a/idea/testData/refactoring/introduceVariable/OneExplicitReceiver.kt.after +++ b/idea/testData/refactoring/introduceVariable/OneExplicitReceiver.kt.after @@ -1,8 +1,8 @@ fun main(args: Array) { val myA = A() - val i = myA.prop - println(i) - println(i) + val prop = myA.prop + println(prop) + println(prop) } class A { diff --git a/idea/testData/refactoring/introduceVariable/TwoExplicitReceivers.kt.after b/idea/testData/refactoring/introduceVariable/TwoExplicitReceivers.kt.after index 31349566aed..99e07bc620f 100644 --- a/idea/testData/refactoring/introduceVariable/TwoExplicitReceivers.kt.after +++ b/idea/testData/refactoring/introduceVariable/TwoExplicitReceivers.kt.after @@ -7,7 +7,7 @@ class Foo() { fun main(args: Array) { val f = Foo() - val i = Bar().f() - println(i) - println(i) + val f1 = Bar().f() + println(f1) + println(f1) } \ No newline at end of file diff --git a/idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions1.kt.after b/idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions1.kt.after index 0b78b2234b5..1b27d16c37f 100644 --- a/idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions1.kt.after +++ b/idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions1.kt.after @@ -4,7 +4,7 @@ class A { fun main(args: Array) { val a = A() - val i = a.test() + val test = a.test() - val b = i + val b = test } diff --git a/idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions2.kt.after b/idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions2.kt.after index 0b78b2234b5..1b27d16c37f 100644 --- a/idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions2.kt.after +++ b/idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions2.kt.after @@ -4,7 +4,7 @@ class A { fun main(args: Array) { val a = A() - val i = a.test() + val test = a.test() - val b = i + val b = test } diff --git a/idea/testData/refactoring/introduceVariable/callUnderSmartCast.kt.after b/idea/testData/refactoring/introduceVariable/callUnderSmartCast.kt.after index 321ceece163..e10c8ea4f64 100644 --- a/idea/testData/refactoring/introduceVariable/callUnderSmartCast.kt.after +++ b/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 - else i + foo + 1 + else foo } \ No newline at end of file diff --git a/idea/testData/refactoring/introduceVariable/nonEquivalentReceivers.kt.after b/idea/testData/refactoring/introduceVariable/nonEquivalentReceivers.kt.after index dd5a9b6ebf7..87f663d3f23 100644 --- a/idea/testData/refactoring/introduceVariable/nonEquivalentReceivers.kt.after +++ b/idea/testData/refactoring/introduceVariable/nonEquivalentReceivers.kt.after @@ -6,9 +6,9 @@ fun foo(body: A.() -> Unit) {} fun bar() { foo { - val i = value - print(i) - print(i) + val value = value + print(value) + print(value) } foo { diff --git a/idea/testData/refactoring/introduceVariable/notNullAssertion.kt.after b/idea/testData/refactoring/introduceVariable/notNullAssertion.kt.after index fb04a0de2da..624798a3c5d 100644 --- a/idea/testData/refactoring/introduceVariable/notNullAssertion.kt.after +++ b/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 } } \ No newline at end of file