Disallow generation of getters, setters and extraction of fields with…

… no fields selected
intellij-rust · Aug 1, 2022 · 1c97efe · 1c97efe
1 parent b576897
commit 1c97efe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/src/main/kotlin/org/rust/ide/refactoring/extractStructFields/RsExtractStructFieldsAction.kt b/src/main/kotlin/org/rust/ide/refactoring/extractStructFields/RsExtractStructFieldsAction.kt
@@ -42,7 +42,8 @@ class RsExtractStructFieldsAction : RsBaseEditorRefactoringAction() {
             project,
             struct,
             fields,
-            RsBundle.message("action.Rust.RsExtractStructFields.choose.fields.title")
+            RsBundle.message("action.Rust.RsExtractStructFields.choose.fields.title"),
+            allowEmptySelection = false
         ) ?: return
         if (chosenFields.isEmpty()) return
 

diff --git a/src/main/kotlin/org/rust/ide/refactoring/generate/BaseGenerateHandler.kt b/src/main/kotlin/org/rust/ide/refactoring/generate/BaseGenerateHandler.kt
@@ -45,6 +45,8 @@ abstract class BaseGenerateHandler : LanguageCodeInsightActionHandler {
 
     override fun startInWriteAction() = false
 
+    open val allowEmptySelection: Boolean = false
+
     private fun getContext(editor: Editor, file: PsiFile): Context? {
         val element = file.findElementAt(editor.caretModel.offset) ?: return null
         val struct = element.ancestorOrSelf<RsStructItem>()
@@ -80,7 +82,8 @@ abstract class BaseGenerateHandler : LanguageCodeInsightActionHandler {
             context.struct.project,
             context.struct,
             context.fields,
-            dialogTitle
+            dialogTitle,
+            allowEmptySelection
         ) ?: return
         runWriteAction {
             performRefactoring(context.struct, context.implBlock, chosenFields, context.substitution, editor)

diff --git a/src/main/kotlin/org/rust/ide/refactoring/generate/constructor/GenerateConstructorHandler.kt b/src/main/kotlin/org/rust/ide/refactoring/generate/constructor/GenerateConstructorHandler.kt
@@ -27,6 +27,8 @@ class GenerateConstructorAction : BaseGenerateAction() {
 class GenerateConstructorHandler : BaseGenerateHandler() {
     override val dialogTitle: String = "Select constructor parameters"
 
+    override val allowEmptySelection: Boolean = true
+
     override fun isImplBlockValid(impl: RsImplItem): Boolean = super.isImplBlockValid(impl) &&
         impl.isSuitableForConstructor
 

diff --git a/src/main/kotlin/org/rust/ide/refactoring/generate/ui.kt b/src/main/kotlin/org/rust/ide/refactoring/generate/ui.kt
@@ -22,12 +22,13 @@ fun showStructMemberChooserDialog(
     project: Project,
     structItem: RsStructItem,
     fields: List<StructMember>,
-    @Suppress("UnstableApiUsage") @DialogTitle title: String
+    @Suppress("UnstableApiUsage") @DialogTitle title: String,
+    allowEmptySelection: Boolean
 ): List<StructMember>? {
     val chooser = if (isUnitTestMode) {
         MOCK ?: error("You should set mock ui via `withMockStructMemberChooserUi`")
     } else {
-        DialogStructMemberChooserUi(title)
+        DialogStructMemberChooserUi(title, allowEmptySelection = allowEmptySelection)
     }
     val base = MemberChooserObjectBase(structItem.name, structItem.getIcon(0))
     val arguments = fields.map { RsStructMemberChooserObject(base, it) }
@@ -60,11 +61,15 @@ interface StructMemberChooserUi {
 }
 
 private class DialogStructMemberChooserUi(
-    @Suppress("UnstableApiUsage") @DialogTitle private val title: String
+    @Suppress("UnstableApiUsage") @DialogTitle private val title: String,
+    private val allowEmptySelection: Boolean
 ) : StructMemberChooserUi {
-    override fun selectMembers(project: Project, all: List<RsStructMemberChooserObject>): List<RsStructMemberChooserObject>? {
+    override fun selectMembers(
+        project: Project,
+        all: List<RsStructMemberChooserObject>
+    ): List<RsStructMemberChooserObject>? {
         val dialogTitle = title
-        val chooser = MemberChooser(all.toTypedArray(), true, true, project).apply {
+        val chooser = MemberChooser(all.toTypedArray(), allowEmptySelection, true, project).apply {
             title = dialogTitle
             selectElements(all.toTypedArray())
             setCopyJavadocVisible(false)