default -> companion: replace all mentions of default and default object

This commit is contained in:
Pavel V. Talanov
2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
@@ -3,7 +3,7 @@
class A {
class Nested()
class NestedWithClassObject { default object }
class NestedWithClassObject { companion object }
enum class NestedEnum { A }
object NestedObj { fun invoke() = 1 }
}
@@ -1,2 +1,2 @@
<!-- nestedClassAcessedViaInstanceReference2 -->
Nested default object 'Default' accessed via instance reference
Nested companion object 'Companion' accessed via instance reference
@@ -15,21 +15,21 @@ fun A.B.test() {
}
class C {
default object {
companion object {
class D {
class Nested
}
}
}
fun C.Default.D.text() {
fun C.Companion.D.text() {
Nested()
::Nested
}
class E {
class F {
default object
companion object
}
}
@@ -1,2 +1,2 @@
<!-- nestedClassShouldBeQualified3 -->
Nested class 'Nested' should be qualified as 'C.Default.D.Nested'
Nested class 'Nested' should be qualified as 'C.Companion.D.Nested'
@@ -1,2 +1,2 @@
<!-- nestedClassShouldBeQualified4 -->
Nested class 'Nested' should be qualified as 'C.Default.D::Nested'
Nested class 'Nested' should be qualified as 'C.Companion.D::Nested'
@@ -1,2 +1,2 @@
<!-- nestedClassShouldBeQualified5 -->
Nested default object 'Default' should be qualified as 'E.F.Default'
Nested companion object 'Companion' should be qualified as 'E.F.Companion'