Fix packages that have the same names as locals
This commit is contained in:
committed by
Pavel Punegov
parent
c55d9671f8
commit
fed1a5d63f
@@ -1,6 +1,6 @@
|
||||
// FILE: 1.kt
|
||||
|
||||
package test
|
||||
package testpack
|
||||
|
||||
class Test(val _member: String) {
|
||||
val _parameter: Z = test {
|
||||
@@ -21,7 +21,7 @@ inline fun test(s: () -> Z): Z {
|
||||
// FILE: 2.kt
|
||||
|
||||
//NO_CHECK_LAMBDA_INLINING
|
||||
import test.*
|
||||
import testpack.*
|
||||
|
||||
fun box(): String {
|
||||
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
// FILE: 1.kt
|
||||
|
||||
package test
|
||||
package testpack
|
||||
|
||||
class Test(val _member: String) {
|
||||
val _parameter: Z<Z<String>> = test {
|
||||
@@ -25,7 +25,7 @@ inline fun <T> test(s: () -> Z<T>): Z<T> {
|
||||
// FILE: 2.kt
|
||||
|
||||
//NO_CHECK_LAMBDA_INLINING
|
||||
import test.*
|
||||
import testpack.*
|
||||
|
||||
fun box(): String {
|
||||
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
// FILE: 1.kt
|
||||
// WITH_RUNTIME
|
||||
package test
|
||||
package holder
|
||||
|
||||
public class Holder(var value: String = "") {
|
||||
|
||||
@@ -36,7 +36,7 @@ public inline fun <R> doCallWithException(h: Holder, block: ()-> R) : R {
|
||||
|
||||
// FILE: 2.kt
|
||||
|
||||
import test.*
|
||||
import holder.*
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertTrue
|
||||
import kotlin.test.fail
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
// FILE: 1.kt
|
||||
// WITH_RUNTIME
|
||||
package test
|
||||
package testpack
|
||||
|
||||
public class Holder(var value: String = "") {
|
||||
|
||||
@@ -36,7 +36,7 @@ public inline fun <R> doCallWithException(h: Holder, block: ()-> R) {
|
||||
|
||||
// FILE: 2.kt
|
||||
|
||||
import test.*
|
||||
import testpack.*
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertTrue
|
||||
import kotlin.test.fail
|
||||
|
||||
Reference in New Issue
Block a user