aboutsummaryrefslogtreecommitdiff
path: root/test/data
diff options
context:
space:
mode:
Diffstat (limited to 'test/data')
-rw-r--r--test/data/classes/classWithCompanionObject.kt (renamed from test/data/classes/classWithDefaultObject.kt)2
-rw-r--r--test/data/classes/companionObjectExtension.kt (renamed from test/data/classes/defaultObjectExtension.kt)2
-rw-r--r--test/data/format/classWithCompanionObject.html (renamed from test/data/format/classWithDefaultObject.html)4
-rw-r--r--test/data/format/classWithCompanionObject.kt (renamed from test/data/format/classWithDefaultObject.kt)2
-rw-r--r--test/data/format/classWithCompanionObject.md (renamed from test/data/format/classWithDefaultObject.md)4
-rw-r--r--test/data/format/companionObjectExtension.kt (renamed from test/data/format/defaultObjectExtension.kt)2
-rw-r--r--test/data/format/companionObjectExtension.md (renamed from test/data/format/defaultObjectExtension.md)2
7 files changed, 9 insertions, 9 deletions
diff --git a/test/data/classes/classWithDefaultObject.kt b/test/data/classes/classWithCompanionObject.kt
index 92e1a695..fdbd915d 100644
--- a/test/data/classes/classWithDefaultObject.kt
+++ b/test/data/classes/classWithCompanionObject.kt
@@ -1,5 +1,5 @@
class Klass() {
- default object {
+ companion object {
val x = 1
fun foo() {}
diff --git a/test/data/classes/defaultObjectExtension.kt b/test/data/classes/companionObjectExtension.kt
index 58d2e86a..4b471376 100644
--- a/test/data/classes/defaultObjectExtension.kt
+++ b/test/data/classes/companionObjectExtension.kt
@@ -1,5 +1,5 @@
class Foo {
- default object Default {
+ companion object Default {
}
}
diff --git a/test/data/format/classWithDefaultObject.html b/test/data/format/classWithCompanionObject.html
index 663d8f64..be9247ea 100644
--- a/test/data/format/classWithDefaultObject.html
+++ b/test/data/format/classWithCompanionObject.html
@@ -20,7 +20,7 @@
</tr>
</tbody>
</table>
-<h3>Default Object Properties</h3>
+<h3>Companion Object Properties</h3>
<table>
<tbody>
<tr>
@@ -31,7 +31,7 @@
</tr>
</tbody>
</table>
-<h3>Default Object Functions</h3>
+<h3>Companion Object Functions</h3>
<table>
<tbody>
<tr>
diff --git a/test/data/format/classWithDefaultObject.kt b/test/data/format/classWithCompanionObject.kt
index 92e1a695..fdbd915d 100644
--- a/test/data/format/classWithDefaultObject.kt
+++ b/test/data/format/classWithCompanionObject.kt
@@ -1,5 +1,5 @@
class Klass() {
- default object {
+ companion object {
val x = 1
fun foo() {}
diff --git a/test/data/format/classWithDefaultObject.md b/test/data/format/classWithCompanionObject.md
index 645f4755..9398c3d3 100644
--- a/test/data/format/classWithDefaultObject.md
+++ b/test/data/format/classWithCompanionObject.md
@@ -13,13 +13,13 @@
| [&lt;init&gt;](test/-klass/-init-) | `Klass()` |
-### Default Object Properties
+### Companion Object Properties
| [x](test/-klass/x) | `val x: Int` |
-### Default Object Functions
+### Companion Object Functions
| [foo](test/-klass/foo) | `fun foo(): Unit` |
diff --git a/test/data/format/defaultObjectExtension.kt b/test/data/format/companionObjectExtension.kt
index 78df38c5..f452de2c 100644
--- a/test/data/format/defaultObjectExtension.kt
+++ b/test/data/format/companionObjectExtension.kt
@@ -1,5 +1,5 @@
class Foo {
- default object Default {
+ companion object Default {
}
}
diff --git a/test/data/format/defaultObjectExtension.md b/test/data/format/companionObjectExtension.md
index 4ede33e8..271da5b0 100644
--- a/test/data/format/defaultObjectExtension.md
+++ b/test/data/format/companionObjectExtension.md
@@ -13,7 +13,7 @@
| [&lt;init&gt;](test/-foo/-init-) | `Foo()` |
-### Default Object Extension Properties
+### Companion Object Extension Properties
| [x](test/x) | `val Foo.Default.x: Int`