Don't highlight declaration with WRAPPED_INTO_REF
Leave highlighting only for usage. This may allow to make highlighting more local and lazy. Java follows the same rules for "Implicit anonymous class parameter".
This commit is contained in:
@@ -30,10 +30,10 @@ class A2<T>(x: Int, y: Int, t: T) {
|
||||
//captured
|
||||
|
||||
class B(
|
||||
<info descr="Value captured in a closure">x</info>: Int,
|
||||
<info descr="Value captured in a closure">y</info>: Int,
|
||||
<info descr="Value captured in a closure">t</info>: Int,
|
||||
<info descr="Value captured in a closure">d</info>: Int
|
||||
x: Int,
|
||||
y: Int,
|
||||
t: Int,
|
||||
d: Int
|
||||
) {
|
||||
<info>init</info> {
|
||||
class C(<warning>a</warning>: Int = <info>x</info>): T <info>by</info> T1(<info>t</info>) {
|
||||
@@ -43,7 +43,7 @@ class B(
|
||||
}
|
||||
}
|
||||
|
||||
class B2(<info descr="Value captured in a closure">x</info>: Int, <info descr="Value captured in a closure">y</info>: Int) {
|
||||
class B2(x: Int, y: Int) {
|
||||
|
||||
val x1 = { <info>x</info> }()
|
||||
<info>init</info> {
|
||||
|
||||
+12
-12
@@ -20,45 +20,45 @@ fun inline() {
|
||||
}
|
||||
|
||||
fun notInline() {
|
||||
val <info descr="Value captured in a closure">y2</info> = 1
|
||||
val y2 = 1
|
||||
run { <info descr="Value captured in a closure">y2</info> }
|
||||
run2 { <warning><info descr="Value captured in a closure">y2</info></warning> }
|
||||
|
||||
val <info descr="Value captured in a closure">y3</info> = 1
|
||||
val y3 = 1
|
||||
run2 { <warning><info descr="Value captured in a closure">y3</info></warning> }
|
||||
run { <info descr="Value captured in a closure">y3</info> }
|
||||
|
||||
// wrapped, using in not inline
|
||||
val <info descr="Value captured in a closure">z</info> = 2
|
||||
val z = 2
|
||||
{ <info descr="Value captured in a closure">z</info> }()
|
||||
|
||||
val <info descr="Value captured in a closure">z1</info> = 3
|
||||
val z1 = 3
|
||||
run2 { <warning><info descr="Value captured in a closure">z1</info></warning> }
|
||||
}
|
||||
|
||||
fun nestedDifferent() { // inline within non-inline and vice-versa
|
||||
val <info descr="Value captured in a closure">y</info> = 1
|
||||
val y = 1
|
||||
{
|
||||
run {
|
||||
<info descr="Value captured in a closure">y</info>
|
||||
}
|
||||
}()
|
||||
|
||||
val <info descr="Value captured in a closure">y1</info> = 1
|
||||
val y1 = 1
|
||||
run {
|
||||
{ <info descr="Value captured in a closure">y1</info> }()
|
||||
}
|
||||
}
|
||||
|
||||
fun localFunctionAndClass() {
|
||||
val <info descr="Value captured in a closure">u</info> = 1
|
||||
val u = 1
|
||||
fun localFun() {
|
||||
run {
|
||||
<info descr="Value captured in a closure">u</info>
|
||||
}
|
||||
}
|
||||
|
||||
val <info descr="Value captured in a closure">v</info> = 1
|
||||
val v = 1
|
||||
class LocalClass {
|
||||
fun f() {
|
||||
run {
|
||||
@@ -69,7 +69,7 @@ fun localFunctionAndClass() {
|
||||
}
|
||||
|
||||
fun objectExpression() {
|
||||
val <info descr="Value captured in a closure">u1</info> = 1
|
||||
val u1 = 1
|
||||
object : Any() {
|
||||
fun f() {
|
||||
run {
|
||||
@@ -78,14 +78,14 @@ fun objectExpression() {
|
||||
}
|
||||
}
|
||||
|
||||
val <info descr="Value captured in a closure">u2</info> = 1
|
||||
val u2 = 1
|
||||
object : Any() {
|
||||
val prop = run {
|
||||
<info descr="Value captured in a closure">u2</info>
|
||||
}
|
||||
}
|
||||
|
||||
val <info descr="Value captured in a closure">u3</info> = ""
|
||||
val u3 = ""
|
||||
object : Throwable(run { <info descr="Value captured in a closure">u3</info> }) {
|
||||
}
|
||||
}
|
||||
@@ -95,7 +95,7 @@ fun objectExpression() {
|
||||
task2()
|
||||
}
|
||||
|
||||
fun usage(<info descr="Value captured in a closure">param1</info>: Int, param2: Int) {
|
||||
fun usage(param1: Int, param2: Int) {
|
||||
withNoInlineParam({ println(<info descr="Value captured in a closure">param1</info>) }, { println(param2) })
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -184,11 +184,11 @@ fun vars(a: Any?) {
|
||||
<warning>b =</warning> <info descr="Smart cast to kotlin.Int">a</info>
|
||||
}
|
||||
}
|
||||
fun returnFunctionLiteralBlock(<info>a</info>: Any?): Function0<Int> {
|
||||
fun returnFunctionLiteralBlock(a: Any?): Function0<Int> {
|
||||
if (<info>a</info> is Int) return { <info descr="Smart cast to kotlin.Int"><info>a</info></info> }
|
||||
else return { 1 }
|
||||
}
|
||||
fun returnFunctionLiteral(<info>a</info>: Any?): Function0<Int> =
|
||||
fun returnFunctionLiteral(a: Any?): Function0<Int> =
|
||||
if (<info>a</info> is Int) (fun (): Int = <info descr="Smart cast to kotlin.Int"><info>a</info></info>)
|
||||
else { -> 1 }
|
||||
|
||||
@@ -212,7 +212,7 @@ fun mergeSmartCasts(a: Any?) {
|
||||
|
||||
//mutability
|
||||
fun f(): String {
|
||||
var <info>a</info>: Any = 11
|
||||
var a: Any = 11
|
||||
if (<info>a</info> is String) {
|
||||
val <warning>i</warning>: String = <info descr="Smart cast to kotlin.String"><info descr="Wrapped into a reference object to be modified when captured in a closure">a</info></info>
|
||||
<info descr="Smart cast to kotlin.String"><info descr="Wrapped into a reference object to be modified when captured in a closure">a</info></info>.compareTo("f")
|
||||
|
||||
+6
-6
@@ -1,36 +1,36 @@
|
||||
fun refs() {
|
||||
var <info><warning>a</warning></info> = 1
|
||||
var <warning>a</warning> = 1
|
||||
val <warning>v</warning> = {
|
||||
<info>a</info> = 2
|
||||
}
|
||||
|
||||
var <info><warning>x</warning></info> = 1
|
||||
var <warning>x</warning> = 1
|
||||
val <warning>b</warning> = object {
|
||||
fun foo() {
|
||||
<info>x</info> = 2
|
||||
}
|
||||
}
|
||||
|
||||
var <info><warning>y</warning></info> = 1
|
||||
var <warning>y</warning> = 1
|
||||
fun foo() {
|
||||
<info>y</info> = 1
|
||||
}
|
||||
}
|
||||
|
||||
fun refsPlusAssign() {
|
||||
var <info>a</info> = 1
|
||||
var a = 1
|
||||
val <warning>v</warning> = {
|
||||
<info>a</info> += 2
|
||||
}
|
||||
|
||||
var <info>x</info> = 1
|
||||
var x = 1
|
||||
val <warning>b</warning> = object {
|
||||
fun foo() {
|
||||
<info>x</info> += 2
|
||||
}
|
||||
}
|
||||
|
||||
var <info>y</info> = 1
|
||||
var y = 1
|
||||
fun foo() {
|
||||
<info>y</info> += 1
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user