Fixed keywords after 'this@' completion + fixed implementation of JetExpressionWithLabel.getLabelName()

This commit is contained in:
Valentin Kipyatkov
2015-05-20 11:46:16 +03:00
parent 2a5ca095ee
commit a6f76bbf76
13 changed files with 56 additions and 28 deletions
@@ -4,5 +4,5 @@ class `this` {
}
}
// ELEMENT: "this@this"
// ELEMENT: "this@`this`"
@@ -1,8 +1,8 @@
class `this` {
fun String.foo(){
val foo: `this` = this@this<caret>
val foo: `this` = this@`this`<caret>
}
}
// ELEMENT: "this@this"
// ELEMENT: "this@`this`"
@@ -9,4 +9,4 @@ fun foo(){
})
}
// ELEMENT: this@fun
// ELEMENT: this@`fun`
@@ -4,9 +4,9 @@ fun bar(handler: Int.() -> Unit){}
fun foo(){
`fun`({
bar({
val s: String = this@fun<caret>
val s: String = this@`fun`<caret>
})
})
}
// ELEMENT: this@fun
// ELEMENT: this@`fun`
@@ -0,0 +1,14 @@
fun foo() {
`fun` {
`val`({ ret<caret> })
}
}
inline fun `fun`(handler: () -> Unit){}
inline fun `val`(handler: () -> Unit){}
// INVOCATION_COUNT: 1
// EXIST: { lookupString: "return", itemText: "return", tailText: null, attributes: "bold" }
// EXIST: { lookupString: "return@`fun`", itemText: "return", tailText: "@`fun`", attributes: "bold" }
// EXIST: { lookupString: "return@`val`", itemText: "return", tailText: "@`val`", attributes: "bold" }
// NOTHING_ELSE: true