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
compiler/testData/psi/ByClauses.kt
+7 -7
View File
@@ -1,23 +1,23 @@
class A : b by a {
default object {}
companion object {}
}
class A : b by a + b() * 5 {
default object {}
companion object {}
}
class A : b by (a) {
default object {}
companion object {}
}
class A : b by (a {}) {
default object {}
companion object {}
}
class A : b by a[a {}] {
default object {}
companion object {}
}
class A : b by a(a {}) {
default object {}
companion object {}
}
class A : b by object {
fun f() = a {}
} {
default object {}
companion object {}
}
compiler/testData/psi/ByClauses.txt
+7 -7
View File
@@ -25,7 +25,7 @@ JetFile: ByClauses.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -77,7 +77,7 @@ JetFile: ByClauses.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -114,7 +114,7 @@ JetFile: ByClauses.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -160,7 +160,7 @@ JetFile: ByClauses.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -209,7 +209,7 @@ JetFile: ByClauses.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -259,7 +259,7 @@ JetFile: ByClauses.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -321,7 +321,7 @@ JetFile: ByClauses.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/CommentsBinding.kt
+3 -3
View File
@@ -41,9 +41,9 @@ class D {
foo() // statement
} // end of foo
// default object
default object {
} // end of default object
// companion object
companion object {
} // end of companion object
}
// This is v
compiler/testData/psi/CommentsBinding.txt
+3 -3
View File
@@ -264,10 +264,10 @@ JetFile: CommentsBinding.kt
PsiComment(EOL_COMMENT)('// end of foo')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
PsiComment(EOL_COMMENT)('// default object')
PsiComment(EOL_COMMENT)('// companion object')
PsiWhiteSpace('\n ')
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -276,7 +276,7 @@ JetFile: CommentsBinding.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace(' ')
PsiComment(EOL_COMMENT)('// end of default object')
PsiComment(EOL_COMMENT)('// end of companion object')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
compiler/testData/psi/DefaultKeyword.kt
+19 -19
View File
@@ -1,44 +1,44 @@
class A {
default object {
companion object {
}
}
class A {
default object
companion object
val c: Int = 1
}
class B {
public default object A {
public companion object A {
}
}
class B {
default object A {
default object {
companion object A {
companion object {
}
}
}
default object B
companion object B
//should be error
default object {
companion object {
}
object A {
default object
companion object
}
trait A {
default object
companion object
class C {
default object C {
default object
companion object C {
companion object
}
}
}
@@ -46,27 +46,27 @@ trait A {
enum class D {
A B
default object
companion object
}
class A {
default class object
companion class object
}
//should be error
class A {
class default object
class companion object
}
class A {
default public final object
companion public final object
}
//should be error
default class {}
companion class {}
//should be error
val t = default object {
val t = companion object {
}
@@ -74,12 +74,12 @@ enum class I {
A
B
default object
companion object
}
enum class I {
A
B
default object {}
companion object {}
}
compiler/testData/psi/DefaultKeyword.txt
+19 -19
View File
@@ -11,7 +11,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -32,7 +32,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n\n ')
@@ -66,7 +66,7 @@ JetFile: DefaultKeyword.kt
MODIFIER_LIST
PsiElement(public)('public')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -90,7 +90,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -102,7 +102,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -117,7 +117,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n\n')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -128,7 +128,7 @@ JetFile: DefaultKeyword.kt
PsiComment(EOL_COMMENT)('//should be error')
PsiWhiteSpace('\n')
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -151,7 +151,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n')
@@ -167,7 +167,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n\n ')
@@ -181,7 +181,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -193,7 +193,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n ')
@@ -224,7 +224,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n')
@@ -240,7 +240,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -261,7 +261,7 @@ JetFile: DefaultKeyword.kt
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('default')
PsiElement(IDENTIFIER)('companion')
PsiWhiteSpace(' ')
OBJECT_DECLARATION
PsiElement(object)('object')
@@ -280,7 +280,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(public)('public')
PsiWhiteSpace(' ')
@@ -294,7 +294,7 @@ JetFile: DefaultKeyword.kt
PsiComment(EOL_COMMENT)('//should be error')
PsiWhiteSpace('\n')
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiErrorElement:Name expected
@@ -314,7 +314,7 @@ JetFile: DefaultKeyword.kt
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('default')
PsiElement(IDENTIFIER)('companion')
PsiWhiteSpace(' ')
PsiErrorElement:Property getter or setter expected
PsiElement(object)('object')
@@ -344,7 +344,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n')
@@ -371,7 +371,7 @@ JetFile: DefaultKeyword.kt
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/NamedClassObject.kt
+4 -4
View File
@@ -1,11 +1,11 @@
class A {
default object Default
companion object Companion
default object B
companion object B
default object C {}
companion object C {}
default object
companion object
object C
}
compiler/testData/psi/NamedClassObject.txt
+5 -5
View File
@@ -11,16 +11,16 @@ JetFile: NamedClassObject.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
OBJECT_DECLARATION_NAME
PsiElement(IDENTIFIER)('Default')
PsiElement(IDENTIFIER)('Companion')
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -29,7 +29,7 @@ JetFile: NamedClassObject.kt
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -42,7 +42,7 @@ JetFile: NamedClassObject.kt
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace('\n\n ')
compiler/testData/psi/SimpleClassMembers.kt
+10 -10
View File
@@ -19,23 +19,23 @@ class foo {
class Bar {
object foo {
default object {
companion object {
}
private default object {
private companion object {
}
private default object : Fooo {
private companion object : Fooo {
}
private default object : Fooo, Bar by foo {
private companion object : Fooo, Bar by foo {
}
private default object : Fooo, Bar by foo, Goo()
private companion object : Fooo, Bar by foo, Goo()
}
class Bar {}
@@ -58,23 +58,23 @@ class foo {
typealias foo = bar
default object {
companion object {
}
private default object {
private companion object {
}
private default object : Fooo {
private companion object : Fooo {
}
private default object : Fooo, Bar by foo {
private companion object : Fooo, Bar by foo {
}
private default object : Fooo, Bar by foo, Goo()
private companion object : Fooo, Bar by foo, Goo()
}
compiler/testData/psi/SimpleClassMembers.txt
+10 -10
View File
@@ -88,7 +88,7 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -101,7 +101,7 @@ JetFile: SimpleClassMembers.kt
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -114,7 +114,7 @@ JetFile: SimpleClassMembers.kt
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -136,7 +136,7 @@ JetFile: SimpleClassMembers.kt
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -170,7 +170,7 @@ JetFile: SimpleClassMembers.kt
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -281,7 +281,7 @@ JetFile: SimpleClassMembers.kt
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -294,7 +294,7 @@ JetFile: SimpleClassMembers.kt
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -307,7 +307,7 @@ JetFile: SimpleClassMembers.kt
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -329,7 +329,7 @@ JetFile: SimpleClassMembers.kt
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
@@ -363,7 +363,7 @@ JetFile: SimpleClassMembers.kt
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/annotation/ShortAnnotations.kt
+1 -1
View File
@@ -9,7 +9,7 @@ foo bar(1) buzz<T>(1) zoo typealias T = Int
class Foo {
foo bar(1) buzz<T>(1) zoo default object {}
foo bar(1) buzz<T>(1) zoo companion object {}
foo bar(1) buzz<T>(1) zoo class A
foo bar(1) buzz<T>(1) zoo object B
foo bar(1) buzz<T>(1) zoo fun a() {}
compiler/testData/psi/annotation/ShortAnnotations.txt
+1 -1
View File
@@ -475,7 +475,7 @@ JetFile: ShortAnnotations.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('zoo')
PsiWhiteSpace(' ')
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/examples/PolymorphicClassObjects.kt
+1 -1
View File
@@ -9,7 +9,7 @@ open class Buildable {
class List<T> {
default object : Buildable {
companion object : Buildable {
override fun newBuilder<E, R>() : Builder<E, R>
}
compiler/testData/psi/examples/PolymorphicClassObjects.txt
+1 -1
View File
@@ -133,7 +133,7 @@ JetFile: PolymorphicClassObjects.kt
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/examples/UpdateOperation.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Pair(x : Int, y : Int) {
default object {
companion object {
fun copy(from : Pair, x : Int = from.x, y : Int = from.y) = Pair(x, y)
}
}
compiler/testData/psi/examples/UpdateOperation.txt
+1 -1
View File
@@ -34,7 +34,7 @@ JetFile: UpdateOperation.kt
PsiWhiteSpace('\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')
compiler/testData/psi/recovery/kt2172.kt
+1 -1
View File
@@ -1,6 +1,6 @@
class Foo {
default object {
companion object {
val
}
}
compiler/testData/psi/recovery/kt2172.txt
+1 -1
View File
@@ -11,7 +11,7 @@ JetFile: kt2172.kt
PsiWhiteSpace('\n\n ')
OBJECT_DECLARATION
MODIFIER_LIST
PsiElement(default)('default')
PsiElement(companion)('companion')
PsiWhiteSpace(' ')
PsiElement(object)('object')
PsiWhiteSpace(' ')