From 92bbf885f7152c54906caef85c89bc4dbabf3700 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 8 Nov 2018 12:40:22 +0300
Subject: [PATCH] "Generate member" actions: do not show any dialogs for expect
 class

Related to KT-27595
---
 .../generate/KotlinGenerateEqualsAndHashcodeAction.kt      | 3 ++-
 .../idea/actions/generate/KotlinGenerateToStringAction.kt  | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
index 2120d7fa269..220fc0f8b48 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
@@ -41,6 +41,7 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.js.resolve.JsPlatform
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
+import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier
 import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.TargetPlatform
@@ -117,7 +118,7 @@ class KotlinGenerateEqualsAndHashcodeAction : KotlinGenerateMemberActionBase<Kot
         }
 
         return with(KotlinGenerateEqualsWizard(project, klass, properties, needEquals, needHashCode)) {
-            if (!showAndGet()) return null
+            if (!klass.hasExpectModifier() && !showAndGet()) return null
 
             Info(needEquals,
                  needHashCode,
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateToStringAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateToStringAction.kt
index 366c20821d4..52f92694da2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateToStringAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateToStringAction.kt
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.idea.core.util.DescriptorMemberChooserObject
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
+import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier
 import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
@@ -169,8 +170,10 @@ class KotlinGenerateToStringAction : KotlinGenerateMemberActionBase<KotlinGenera
             selectElements(memberChooserObjects)
         }
 
-        chooser.show()
-        if (chooser.exitCode != DialogWrapper.OK_EXIT_CODE) return null
+        if (!klass.hasExpectModifier()) {
+            chooser.show()
+            if (chooser.exitCode != DialogWrapper.OK_EXIT_CODE) return null
+        }
 
         return Info(classDescriptor,
                     chooser.selectedElements?.map { it.descriptor as VariableDescriptor } ?: emptyList(),