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

2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
@@ -3,11 +3,11 @@ package p
 class B

 class R {
-    default object {
+    companion object {
        fun B.f() {
            this.<caret>
        }
    }
 }

-// EXIST: { itemText: "f", tailText: "() for B in R.Default" }
+// EXIST: { itemText: "f", tailText: "() for B in R.Companion" }
@@ -4,7 +4,7 @@ class C {
    inner class InnerClass
    object AnObject

-    default object {
+    companion object {
        val classObjectField = 0
        class ClassObjectClass

@@ -9,7 +9,7 @@ class C {
        }
    }

-    default object {
+    companion object {
        fun fromClassObject(){}
    }
 }
@@ -2,7 +2,7 @@ class A {
    class Nested
    inner class Inner

-    default object {
+    companion object {
        class Nested2
        val c: Int = 1
        object Obj2
@@ -19,7 +19,7 @@ fun some() {
 }

 // EXIST: Nested
-// EXIST: Default
+// EXIST: Companion
 // EXIST: c
 // EXIST: foo
 // EXIST: Obj
@@ -2,7 +2,7 @@ class A {
    class Nested
    inner class Inner

-    default object Named {
+    companion object Named {
        class Nested2
        val c: Int = 1
        object Obj2
@@ -2,7 +2,7 @@ class A {
    class Nested
    inner class Inner

-    default object Named {
+    companion object Named {
        class Nested2
        val c: Int = 1
        object Obj2
@@ -1,7 +1,7 @@
 package Test.MyTest

 class A {
-    default object {
+    companion object {
        public fun testOther() {

        }
@@ -1,5 +1,5 @@
 class Some {
-    default object {
+    companion object {
        val coProp = 12

        fun coFun = 12
@@ -2,11 +2,11 @@ package foo

 class A {
    class B {
-        default object
+        companion object
    }
 }

-fun A.B.Default.foo() {}
+fun A.B.Companion.foo() {}

 fun some() {
    A.B.<caret>
@@ -1,7 +1,7 @@
 class C {
    fun String.memberExtForString(){}

-    default object {
+    companion object {
        fun foo() {
            "".<caret>
        }