default -> companion: replace all mentions of default and default object
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
import kotlin.platform.platformStatic
|
||||
|
||||
class Foo {
|
||||
default <caret>object {
|
||||
companion <caret>object {
|
||||
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,3 +1,3 @@
|
||||
Class static member access (3: 28) System.out.println(Foo.CONST);
|
||||
Class static member access (4: 9) Foo.s();
|
||||
Unclassified usage (5: 13) Foo.Default.f();
|
||||
Unclassified usage (5: 13) Foo.Companion.f();
|
||||
@@ -1,7 +1,7 @@
|
||||
// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration
|
||||
// OPTIONS: usages
|
||||
class Foo {
|
||||
default object <caret>Bar {
|
||||
companion object <caret>Bar {
|
||||
fun f() {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
fun main(args: Array<String>) {
|
||||
val p: Foo = Foo() // simple class usage
|
||||
|
||||
// default object usages
|
||||
// companion object usages
|
||||
Foo.f()
|
||||
val x = Foo
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Default object (5: 5) Foo.f()
|
||||
Default object (6: 13) val x = Foo
|
||||
Default object (8: 9) Foo.Bar.f()
|
||||
Default object (9: 18) val xx = Foo.Bar
|
||||
Companion object (5: 5) Foo.f()
|
||||
Companion object (6: 13) val x = Foo
|
||||
Companion object (8: 9) Foo.Bar.f()
|
||||
Companion object (9: 18) val xx = Foo.Bar
|
||||
@@ -1,7 +1,7 @@
|
||||
// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration
|
||||
// OPTIONS: usages
|
||||
class Foo {
|
||||
default <caret>object {
|
||||
companion <caret>object {
|
||||
fun f() {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
fun main(args: Array<String>) {
|
||||
val p: Foo = Foo() // simple class usage
|
||||
|
||||
// default object usages
|
||||
// companion object usages
|
||||
Foo.f()
|
||||
val x = Foo
|
||||
|
||||
Foo.Default.f()
|
||||
val xx = Foo.Default
|
||||
Foo.Companion.f()
|
||||
val xx = Foo.Companion
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
Default object (5: 5) Foo.f()
|
||||
Default object (6: 13) val x = Foo
|
||||
Default object (8: 9) Foo.Default.f()
|
||||
Default object (9: 18) val xx = Foo.Default
|
||||
Companion object (5: 5) Foo.f()
|
||||
Companion object (6: 13) val x = Foo
|
||||
Companion object (8: 9) Foo.Companion.f()
|
||||
Companion object (9: 18) val xx = Foo.Companion
|
||||
Reference in New Issue
Block a user