azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"Generate member" actions: do not show any dialogs for expect class

Browse Source 
Related to KT-27595
This commit is contained in:
Mikhail Glukhikh
2018-11-08 12:40:22 +03:00
parent b15b993b26
commit 92bbf885f7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
+2 -1
View File
@@ -41,6 +41,7 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.js.resolve.JsPlatform import org.jetbrains.kotlin.js.resolve.JsPlatform
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext 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.psi.psiUtil.quoteIfNeeded
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.resolve.TargetPlatform
@@ -117,7 +118,7 @@ class KotlinGenerateEqualsAndHashcodeAction : KotlinGenerateMemberActionBase<Kot
} }
return with(KotlinGenerateEqualsWizard(project, klass, properties, needEquals, needHashCode)) { return with(KotlinGenerateEqualsWizard(project, klass, properties, needEquals, needHashCode)) {
if (!showAndGet()) return null if (!klass.hasExpectModifier() && !showAndGet()) return null
Info(needEquals, Info(needEquals,
needHashCode, needHashCode,
idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateToStringAction.kt
+5 -2
View File
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.idea.core.util.DescriptorMemberChooserObject
import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext 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.psi.psiUtil.quoteIfNeeded
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
@@ -169,8 +170,10 @@ class KotlinGenerateToStringAction : KotlinGenerateMemberActionBase<KotlinGenera
selectElements(memberChooserObjects) selectElements(memberChooserObjects)
} }
chooser.show() if (!klass.hasExpectModifier()) {
if (chooser.exitCode != DialogWrapper.OK_EXIT_CODE) return null chooser.show()
if (chooser.exitCode != DialogWrapper.OK_EXIT_CODE) return null
}
return Info(classDescriptor, return Info(classDescriptor,
chooser.selectedElements?.map { it.descriptor as VariableDescriptor } ?: emptyList(), chooser.selectedElements?.map { it.descriptor as VariableDescriptor } ?: emptyList(),