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,5 +1,5 @@
// "Import" "true"
// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a default object
// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a companion object
// KT-4000
@@ -1,5 +1,5 @@
// "Import" "true"
// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a default object
// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a companion object
// KT-4000
@@ -1,7 +1,7 @@
package some
public class Some {
default object {
companion object {
public fun test() {
}
}
@@ -1,7 +1,7 @@
// "Create function 'foo'" "true"
class A<T>(val n: T) {
default object {
companion object {
fun foo(i: Int): Int {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
@@ -1,7 +1,7 @@
// "Create function 'foo'" "true"
class A<T>(val n: T) {
default object {
companion object {
}
}
@@ -5,7 +5,7 @@
// ERROR: Unresolved reference: foo
class A {
default object {
companion object {
val test: Int get() {
return <caret>foo
}
@@ -5,7 +5,7 @@
// ERROR: Unresolved reference: foo
class A {
default object {
companion object {
init {
val t: Int = <caret>foo
}
@@ -3,7 +3,7 @@
// ERROR: Unresolved reference: foo
class A {
default object {
companion object {
val test: Int = <caret>foo
}
}
@@ -2,7 +2,7 @@
// ERROR: Property must be initialized or be abstract
class A<T>(val n: T) {
default object {
companion object {
val foo: Int
}
@@ -2,7 +2,7 @@
// ERROR: Property must be initialized or be abstract
class A<T>(val n: T) {
default object {
companion object {
}
}
@@ -1,7 +1,7 @@
// "Replace 'class' keyword with 'default' modifier" "true"
class A {
public default object {
public companion object {
}
}
@@ -1,21 +1,21 @@
class D {
default public object Named {
companion public object Named {
}
}
trait H {
default object {
companion object {
}
}
class E {
default object {
companion object {
class D {
default object {
companion object {
class D {
default object
companion object
}
}
}
@@ -23,7 +23,7 @@ class E {
}
class K {
default object Default
companion object Companion
class Object
}
@@ -1,19 +1,19 @@
// "Replace 'class' keyword with 'default' modifier in whole project" "true"
class A {
public default object {
public companion object {
}
}
class B {
default object {
companion object {
}
}
class C {
default object Named {
companion object Named {
}
}
@@ -1,11 +1,11 @@
class D {
default public class object Named {
companion public class object Named {
}
}
trait H {
default class object {
companion class object {
}
}
@@ -23,7 +23,7 @@ class E {
}
class K {
default object Default
companion object Companion
class Object
}
@@ -1,8 +1,8 @@
// "Suppress 'REDUNDANT_NULLABLE' for default object Default of C" "true"
// "Suppress 'REDUNDANT_NULLABLE' for companion object Companion of C" "true"
class C {
[suppress("REDUNDANT_NULLABLE")]
default object {
companion object {
var foo: String?<caret>? = null
}
}
@@ -1,7 +1,7 @@
// "Suppress 'REDUNDANT_NULLABLE' for default object Default of C" "true"
// "Suppress 'REDUNDANT_NULLABLE' for companion object Companion of C" "true"
class C {
default object {
companion object {
var foo: String?<caret>? = null
}
}