From c7916f74964246bee4d256c106b01c7e317e6c10 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 17 Mar 2015 19:54:11 +0100
Subject: default objects -> companion objects

---
 test/data/classes/classWithCompanionObject.kt |  7 +++++++
 test/data/classes/classWithDefaultObject.kt   |  7 -------
 test/data/classes/companionObjectExtension.kt | 10 ++++++++++
 test/data/classes/defaultObjectExtension.kt   | 10 ----------
 4 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 test/data/classes/classWithCompanionObject.kt
 delete mode 100644 test/data/classes/classWithDefaultObject.kt
 create mode 100644 test/data/classes/companionObjectExtension.kt
 delete mode 100644 test/data/classes/defaultObjectExtension.kt

(limited to 'test/data/classes')

diff --git a/test/data/classes/classWithCompanionObject.kt b/test/data/classes/classWithCompanionObject.kt
new file mode 100644
index 00000000..fdbd915d
--- /dev/null
+++ b/test/data/classes/classWithCompanionObject.kt
@@ -0,0 +1,7 @@
+class Klass() {
+    companion object {
+        val x = 1
+
+        fun foo() {}
+    }
+}
diff --git a/test/data/classes/classWithDefaultObject.kt b/test/data/classes/classWithDefaultObject.kt
deleted file mode 100644
index 92e1a695..00000000
--- a/test/data/classes/classWithDefaultObject.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-class Klass() {
-    default object {
-        val x = 1
-
-        fun foo() {}
-    }
-}
diff --git a/test/data/classes/companionObjectExtension.kt b/test/data/classes/companionObjectExtension.kt
new file mode 100644
index 00000000..4b471376
--- /dev/null
+++ b/test/data/classes/companionObjectExtension.kt
@@ -0,0 +1,10 @@
+class Foo {
+    companion object Default {
+    }
+}
+
+
+/**
+ * The def
+ */
+val Foo.Default.x: Int get() = 1
diff --git a/test/data/classes/defaultObjectExtension.kt b/test/data/classes/defaultObjectExtension.kt
deleted file mode 100644
index 58d2e86a..00000000
--- a/test/data/classes/defaultObjectExtension.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-class Foo {
-    default object Default {
-    }
-}
-
-
-/**
- * The def
- */
-val Foo.Default.x: Int get() = 1
-- 
cgit