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
@@ -1,6 +1,6 @@
// SIBLING:
public class A {
default object {
companion object {
private val t: Int = 1
}
fun f() {
@@ -1 +1 @@
Property A.Default.t will become invisible after extraction
Property A.Companion.t will become invisible after extraction
@@ -5,7 +5,7 @@ class MyClass {
return coProp + 10</selection>
}
default object {
companion object {
val coProp = 1
fun coFun() {
@@ -4,7 +4,7 @@ class MyClass {
return i()
}
default object {
companion object {
val coProp = 1
fun coFun() {
@@ -6,7 +6,7 @@ class A {
return coProp + 10</selection>
}
default object {
companion object {
val coProp = 1
fun coFun() {
@@ -5,7 +5,7 @@ class A {
return i()
}
default object {
companion object {
val coProp = 1
fun coFun() {
@@ -6,7 +6,7 @@ class MyClass {
}
public class P {
default object {
companion object {
val a = 1
fun foo() = 1
}
@@ -5,7 +5,7 @@ class MyClass {
}
public class P {
default object {
companion object {
val a = 1
fun foo() = 1
}
@@ -1,5 +1,5 @@
class Class {
default object {
companion object {
val p = 239
}
}
@@ -1,5 +1,5 @@
class Class {
default object {
companion object {
}
}
@@ -2,19 +2,19 @@ package library
class KtClass {
class Inner {
default object {
companion object {
fun foo(): Int = 1
}
}
default object {
companion object {
fun foo(): Int = 1
}
}
object KtObject {
class Inner {
default object {
companion object {
fun foo(): Int = 1
}
}
@@ -3,7 +3,7 @@ package source
import library.*
class Bar {
default object {
companion object {
val c : Int
}
}
@@ -2,19 +2,19 @@ package library
class KtClass {
class Inner {
default object {
companion object {
fun foo(): Int = 1
}
}
default object {
companion object {
fun foo(): Int = 1
}
}
object KtObject {
class Inner {
default object {
companion object {
fun foo(): Int = 1
}
}
@@ -11,17 +11,17 @@ class <caret>Foo {
val kt2 = KtObject.foo()
val kt3 = KtClass.Inner.foo()
val kt4 = KtObject.Inner.foo()
val kt5 = KtClass.Default.foo()
val kt6 = KtClass.Default
val kt5 = KtClass.Companion.foo()
val kt6 = KtClass.Companion
val kt7 = KtClass
val kt8 = Bar
val kt9 = Bar.Default
val kt10 = Bar.Default.c
val kt9 = Bar.Companion
val kt10 = Bar.Companion.c
}
class Bar {
default object {
companion object {
val c : Int
}
}
@@ -3,6 +3,6 @@ class JavaUsage {
System.out.println(Foo.CONST);
Foo.s();
Foo.Baz.f();
Foo foo = new Foo(); // not usage of default object
Foo foo = new Foo(); // not usage of companion object
}
}
@@ -1,5 +1,5 @@
class Foo {
default object Baz {
companion object Baz {
fun f() {
}
@@ -3,6 +3,6 @@ class JavaUsage {
System.out.println(Foo.CONST);
Foo.s();
Foo.Bar.f();
Foo foo = new Foo(); // not usage of default object
Foo foo = new Foo(); // not usage of companion object
}
}
@@ -1,5 +1,5 @@
class Foo {
default object Bar {
companion object Bar {
fun f() {
}
@@ -3,6 +3,6 @@ class JavaUsage {
System.out.println(Foo.CONST);
Foo.s();
Foo.Baz.f();
Foo foo = new Foo(); // not usage of default object
Foo foo = new Foo(); // not usage of companion object
}
}
@@ -1,5 +1,5 @@
class Foo {
default object Baz {
companion object Baz {
fun f() {
}
@@ -2,7 +2,7 @@ class JavaUsage {
public static void main(String[] args) {
System.out.println(Foo.CONST);
Foo.s();
Foo.Default.f();
Foo foo = new Foo(); // not usage of default object
Foo.Companion.f();
Foo foo = new Foo(); // not usage of companion object
}
}
@@ -1,5 +1,5 @@
class Foo {
default object {
companion object {
fun f() {
}
@@ -3,6 +3,6 @@ fun main(args: Array<String>) {
Foo.f()
val x = Foo
Foo.Default.f()
val xx = Foo.Default
Foo.Companion.f()
val xx = Foo.Companion
}
@@ -1,7 +1,7 @@
{
"type": "KOTLIN_CLASS",
"classId": "/Foo.Default",
"oldName": "Default",
"classId": "/Foo.Companion",
"oldName": "Companion",
"newName": "Baz",
"mainFile": "toBeRenamed.kt"
}