Can't omit default object name in imports and types

There should be only one way to denote a type (A.Default.B can't be denoted as A.B)
This commit is contained in:
Pavel V. Talanov
2015-02-16 17:45:23 +03:00
parent 640d2de5b9
commit cceb5738c8
17 changed files with 27 additions and 35 deletions
@@ -4,6 +4,6 @@ class A {
}
}
val v: A.Inner = <caret>
val v: A.Default.Inner = <caret>
// ELEMENT: Inner
@@ -4,6 +4,6 @@ class A {
}
}
val v: A.Inner = A.Inner()<caret>
val v: A.Default.Inner = A.Inner()
// ELEMENT: Inner
@@ -3,7 +3,7 @@ package test
import dependency.*
public class DependencyOnNestedClasses : D.Nested() {
fun f(nc: D.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested {
fun f(nc: D.Default.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested {
return D.Nested()
}
}
@@ -3,7 +3,7 @@ package test
import dependency.*
public class DependencyOnNestedClasses : D.Nested() {
fun f(nc: D.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested {
fun f(nc: D.Default.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested {
return D.Nested()
}
}
@@ -22,7 +22,7 @@ class C {
}
}
fun C.D.text() {
fun C.Default.D.text() {
Nested()
::Nested
}
@@ -1,4 +1,4 @@
import MyClass.*
import MyClass.Default.TEST
fun main() {
TEST
@@ -1,4 +1,4 @@
import MyClass.TEST
import MyClass.Default.TEST
fun main() {
TEST