Create actual fix: handle companions correctly #KT-21114 Fixed

2017-12-29 20:06:44 +03:00
parent f46fa263ef
commit 5abb9dd23e
7 changed files with 48 additions and 2 deletions
@@ -225,7 +225,15 @@ internal fun KtPsiFactory.generateClassOrObjectByExpectedClass(
        }

    val expectedText = expectedClass.text
-    val actualClass = if (expectedClass is KtObjectDeclaration) createObject(expectedText) else createClass(expectedText)
+    val actualClass = if (expectedClass is KtObjectDeclaration) {
+        if (expectedClass.isCompanion()) {
+            createCompanionObject(expectedText)
+        } else {
+            createObject(expectedText)
+        }
+    } else {
+        createClass(expectedText)
+    }
    val isInterface = expectedClass is KtClass && expectedClass.isInterface()
    actualClass.declarations.forEach {
        if (it.exists()) {