azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

# KT-1579 Fixed Can't import nested class/trait

Browse Source
This commit is contained in:
Svetlana Isakova
2012-03-27 15:15:15 +04:00
parent fe9d5ddf89
commit f7cfb36f62
26 changed files with 548 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.jet
+1 -1
View File
@@ -1,5 +1,5 @@
package a
import A as ER
import a.A as ER
class A()
compiler/testData/diagnostics/tests/scopes/Imports.jet
+3 -3
View File
@@ -70,7 +70,7 @@ fun bar() {}
//FILE:c.kt
package c
import <!CANNOT_IMPORT_FROM_ELEMENT!>C<!>.*
import c.<!CANNOT_IMPORT_FROM_ELEMENT!>C<!>.*
object C {
fun f() {
@@ -85,8 +85,8 @@ fun foo() {
//FILE:d.kt
package d
import A.B
import A.C
import d.A.B
import d.A.C
val b : B = B()
val c : B = C
compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.jet
+1 -1
View File
@@ -1,5 +1,5 @@
package a
import <!USELESS_SIMPLE_IMPORT!>B<!>
import <!USELESS_SIMPLE_IMPORT!>a<!>
object B {}
compiler/testData/diagnostics/tests/scopes/kt1579.jet
+1
View File
@@ -1,3 +1,4 @@
//KT-1579 Can't import nested class/trait
//FILE:a.kt
package lib
trait WithInner {
compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.jet
+8
View File
@@ -4,9 +4,17 @@ package a
import java.util.Map.*
fun foo(b : Entry<String, String>) = b
//FILE:b.kt
//+JDK
package b
import java.util.Map.Entry
fun bar(b : Entry<String, String>) = b
//FILE:c.kt
//+JDK
package c
import java.util.Map
fun fff(b: Map.Entry<String, String>) = b
compiler/testData/diagnostics/tests/scopes/kt900-1.jet
+2 -2
View File
@@ -1,8 +1,8 @@
// import all members from class object
package c
import A.*
import <!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.*
import c.A.*
import c.<!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.*
fun foo() {
val <!UNUSED_VARIABLE!>b<!>: B = B()
compiler/testData/diagnostics/tests/scopes/kt900-2.jet
+5 -5
View File
@@ -2,11 +2,11 @@ package d
//import from objects before properties resolve
import <!CANNOT_IMPORT_FROM_ELEMENT!>A<!>.*
import <!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.R
import <!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.R.bar
import <!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.T
import <!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.Y
import d.<!CANNOT_IMPORT_FROM_ELEMENT!>A<!>.*
import d.<!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.R
import d.<!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.R.bar
import d.<!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.T
import d.<!CANNOT_IMPORT_FROM_ELEMENT!>M<!>.Y
var r: T = <!UNRESOLVED_REFERENCE!>T<!>()
val y: T = <!UNRESOLVED_REFERENCE!>Y<!>
compiler/testData/diagnostics/tests/scopes/kt900.jet
+2 -2
View File
@@ -35,8 +35,8 @@ object N {
//FILE:b.kt
package b
import <!CANNOT_IMPORT_FROM_ELEMENT!>N<!>.M
import A.P
import b.<!CANNOT_IMPORT_FROM_ELEMENT!>N<!>.M
import b.A.P
import b.A.B
fun foo() {