Extract Function: Add backticks to non-identifiers and references originally surrounded in backticks

#KT-8192 Fixed
This commit is contained in:
Alexey Sedunov
2015-06-23 19:13:58 +03:00
parent c6f6637b25
commit 4e7200d8e8
14 changed files with 132 additions and 5 deletions
@@ -0,0 +1,12 @@
// PARAM_TYPES: X
// PARAM_TYPES: Y
// PARAM_DESCRIPTOR: internal final fun X.test(): kotlin.Unit defined in Y
// PARAM_DESCRIPTOR: internal final class Y defined in root package
class X(val x: Int)
// SIBLING:
class Y(val y: Int) {
fun X.test() {
<selection>`x`plus y</selection>
}
}
@@ -0,0 +1,16 @@
// PARAM_TYPES: X
// PARAM_TYPES: Y
// PARAM_DESCRIPTOR: internal final fun X.test(): kotlin.Unit defined in Y
// PARAM_DESCRIPTOR: internal final class Y defined in root package
class X(val x: Int)
// SIBLING:
class Y(val y: Int) {
fun X.test() {
__dummyTestFun__(this, this@Y)
}
}
private fun __dummyTestFun__(x: X, y1: Y) {
x.`x`plus y1.y
}
@@ -0,0 +1,6 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: val i: kotlin.Int defined in test
fun test() {
val `i` = 0
<selection>`i`plus i</selection>
}
@@ -0,0 +1,10 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: val i: kotlin.Int defined in test
fun test() {
val `i` = 0
__dummyTestFun__(`i`)
}
private fun __dummyTestFun__(`i`: Int) {
`i`plus i
}
@@ -0,0 +1,6 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: val 0: kotlin.Int defined in test
fun test() {
val `0` = 0
<selection>`0`plus 1</selection>
}
@@ -0,0 +1,10 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: val 0: kotlin.Int defined in test
fun test() {
val `0` = 0
__dummyTestFun__(`0`)
}
private fun __dummyTestFun__(`0`: Int) {
`0`plus 1
}
@@ -0,0 +1,6 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: val i: kotlin.Int defined in test
fun test() {
val i = 0
<selection>`i`plus i</selection>
}
@@ -0,0 +1,10 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: val i: kotlin.Int defined in test
fun test() {
val i = 0
__dummyTestFun__(`i`)
}
private fun __dummyTestFun__(i: Int) {
`i`plus i
}
@@ -0,0 +1,6 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: val i: kotlin.Int defined in test
fun test() {
val i = 0
<selection>i plus `i`</selection>
}
@@ -0,0 +1,10 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: val i: kotlin.Int defined in test
fun test() {
val i = 0
__dummyTestFun__(i)
}
private fun __dummyTestFun__(i: Int) {
i plus `i`
}