azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/shortenRefs/classObject.kt
+11 -11
View File
@@ -1,25 +1,25 @@
package p.q
<selection>fun foo(myC: p.q.MyClass, def: p.q.MyClass.Default, nes: p.q.MyClass.Default.Nested) {
p.q.MyClass.Default.foo()
p.q.MyClass.Default.coProp
p.q.MyClass.Default
<selection>fun foo(myC: p.q.MyClass, def: p.q.MyClass.Companion, nes: p.q.MyClass.Companion.Nested) {
p.q.MyClass.Companion.foo()
p.q.MyClass.Companion.coProp
p.q.MyClass.Companion
p.q.MyClass
p.q.MyClass.coProp
p.q.MyClass.foo()
p.q.MyClass.bar(p.q.MyClass.Default)
p.q.MyClass.bar(p.q.MyClass.Companion)
p.q.MyClass.bar(p.q.MyClass)
p.q.MyClass.Default.Nested.Default
p.q.MyClass.Default.Nested.Default.c
MyClass.Default
p.q.MyClass.Companion.Nested.Companion
p.q.MyClass.Companion.Nested.Companion.c
MyClass.Companion
}</selection>
class MyClass {
default object {
companion object {
val coProp = 1
class Nested {
default object {
companion object {
val c: Int = 1
}
}
@@ -28,7 +28,7 @@ class MyClass {
}
fun bar(p: MyClass.Default) {
fun bar(p: MyClass.Companion) {
}
}
}
idea/testData/shortenRefs/classObject.kt.after
+6 -6
View File
@@ -1,6 +1,6 @@
package p.q
fun foo(myC: MyClass, def: MyClass.Default, nes: MyClass.Default.Nested) {
fun foo(myC: MyClass, def: MyClass.Companion, nes: MyClass.Companion.Nested) {
MyClass.foo()
MyClass.coProp
MyClass
@@ -9,17 +9,17 @@ fun foo(myC: MyClass, def: MyClass.Default, nes: MyClass.Default.Nested) {
MyClass.foo()
MyClass.bar(MyClass)
MyClass.bar(MyClass)
MyClass.Default.Nested
MyClass.Default.Nested.c
MyClass.Companion.Nested
MyClass.Companion.Nested.c
MyClass
}
class MyClass {
default object {
companion object {
val coProp = 1
class Nested {
default object {
companion object {
val c: Int = 1
}
}
@@ -28,7 +28,7 @@ class MyClass {
}
fun bar(p: MyClass.Default) {
fun bar(p: MyClass.Companion) {
}
}
}