Merge branch 'release-1.1.0' into bugfix/add-new-operators

Author: adroaldonetozup

src/main/kotlin/com/stackspot/intellij/services/GetDocumentationService.kt

@@ -17,7 +17,6 @@
 package com.stackspot.intellij.services
 
 import com.intellij.openapi.components.Service
-import com.intellij.util.containers.isNullOrEmpty
 import com.stackspot.intellij.commands.BackgroundCommandRunner
 import com.stackspot.intellij.commands.git.GitBranch
 import com.stackspot.intellij.commands.git.GitConfig

src/main/kotlin/com/stackspot/intellij/ui/toolwindow/panels/Component.kt

@@ -18,12 +18,10 @@ package com.stackspot.intellij.ui.toolwindow.panels
 
 import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.openapi.ui.validation.CHECK_NON_EMPTY
-import com.intellij.openapi.ui.validation.validationTextErrorIf
 import com.intellij.ui.UIBundle
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.dsl.builder.*
 import com.intellij.util.MathUtil
-import com.stackspot.model.Input
 import com.stackspot.model.component.Helper
 import org.apache.commons.lang3.StringUtils
 import java.awt.event.KeyAdapter
@@ -63,34 +61,38 @@ class IntComponent : ComponentType {
             val field = textField()
                 .bindText(getterString(helper)) { helper.addValues(it) }
                 .comment(helper.input.help)
-            validatePattern(field, helper.input)
+            validateRequired(helper, field)
+            validatePattern(helper, field)
             validateIfInputIsNumber(field)
             field.columns(COLUMNS_SIZE)
-            field.component.addKeyListener(object : KeyAdapter() {
-                override fun keyPressed(e: KeyEvent?) {
-                    val text = field.component.text
-                    if (text.length >= MAX_TEXT_LENGTH && text.toIntOrNull() != null) {
-                        var value = text.toIntOrNull()
-                        value = value?.let { MathUtil.clamp(it, 0, 9999999) }
-                        field.component.text = ""
-                        field.component.text = value.toString()
-                        e?.consume()
-                    }
-                }
-            })
+            validateNumericFieldSize(field)
             helper.components.add(field)
         }
     }
 
-    private fun validateIfInputIsNumber(field: Cell<JBTextField>) {
+    private fun validateNumericFieldSize(field: Cell<JBTextField>) {
+        field.component.addKeyListener(object : KeyAdapter() {
+            override fun keyPressed(e: KeyEvent?) {
+                val text = field.component.text
+                if (text.length >= MAX_TEXT_LENGTH && text.toIntOrNull() != null) {
+                    var value = text.toIntOrNull()
+                    value = value?.let { MathUtil.clamp(it, 0, 9999999) }
+                    field.component.text = ""
+                    field.component.text = value.toString()
+                    e?.consume()
+                }
+            }
+        })
+    }
 
+    private fun validateIfInputIsNumber(field: Cell<JBTextField>) {
         val regex = "^[0-9]*\$".toRegex()
-
-        val checkPattern = validationTextErrorIf(UIBundle.message(ENTER_A_NUMBER)) {
-            !regex.matches(it) && field.component.isVisible
+        field.validation {
+            val text: String = field.component.text
+            if (!regex.matches(text) && field.component.isVisible) {
+                ValidationInfo(UIBundle.message(ENTER_A_NUMBER), field.component)
+            } else null
         }
-
-        checkPattern.let { field.textValidation(it) }
     }
 }
 
@@ -114,26 +116,12 @@ class TextComponent : ComponentType {
             val field = textField()
                 .bindText(getterString(helper)) { helper.addValues(it) }
                 .comment(helper.input.help)
-            validatePattern(field, helper.input)
+            validatePattern(helper, field)
             helper.components.add(field)
         }
     }
 }
 
-private const val INPUT_INVALID_REGEX = "Input is invalid for regex:"
-
-private fun validatePattern(field: Cell<JTextField>, input: Input) {
-    val pattern = input.pattern?.toRegex()
-    val checkPattern = pattern?.let {
-        validationTextErrorIf("$INPUT_INVALID_REGEX $pattern") {
-            !pattern.matches(it) && field.component.isVisible
-        }
-    }
-    checkPattern?.let { field.textValidation(it) }
-    if (input.required) field.textValidation(CHECK_NON_EMPTY)
-}
-
-
 class ListComponent : ComponentType {
     override fun create(helper: Helper): Row {
         return helper.panel.row(helper.input.label) {
@@ -155,13 +143,29 @@ class PasswordComponent : ComponentType {
             val field = cell(passwordField)
                 .bindText(getterString(helper)) { helper.addValues(it) }
                 .comment(helper.input.help)
-            validatePattern(field, helper.input)
+            validatePattern(helper, field)
             helper.components.add(field)
         }
     }
 }
 
+private const val INPUT_INVALID_REGEX = "Input is invalid for regex:"
+
+private fun validateRequired(helper: Helper, field: Cell<JBTextField>) {
+    if (helper.input.required) field.textValidation(CHECK_NON_EMPTY)
+}
 
+private fun validatePattern(helper: Helper, field: Cell<JTextField>) {
+    val pattern = helper.input.pattern?.toRegex()
+    pattern?.let {
+        field.validation {
+            val text: String = field.component.text
+            if (!pattern.matches(text) && field.component.isVisible) {
+                ValidationInfo("$INPUT_INVALID_REGEX $pattern", field.component)
+            } else null
+        }
+    }
+}
 
 private fun getterBoolean(
     helper: Helper,

src/main/kotlin/com/stackspot/intellij/ui/toolwindow/panels/PluginInputsPanel.kt

@@ -29,7 +29,7 @@ import javax.swing.JComponent
 class PluginInputsPanel(
     project: Project? = null,
     private val plugin: Plugin,
-    private val windowTitle: String,
+    windowTitle: String,
     val variablesMap: MutableMap<String, Any> = mutableMapOf(),
     private val helpers: MutableList<Helper> = mutableListOf()
 ) : DialogWrapper(project, true) {

src/main/kotlin/com/stackspot/intellij/ui/toolwindow/panels/ValidationHandler.kt

@@ -17,6 +17,7 @@
 package com.stackspot.intellij.ui.toolwindow.panels
 
 import com.intellij.openapi.ui.ValidationInfo
+import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.dsl.builder.Row
 import com.stackspot.model.Condition
@@ -181,20 +182,12 @@ class TextFieldListener(
     private val condition: Condition,
     private val row: Row,
     private val helper: Helper
-) : DocumentListener {
-    override fun insertUpdate(e: DocumentEvent?) {
+) : DocumentAdapter() {
+    override fun textChanged(e: DocumentEvent) {
         val text = textField.text
         val isVisible = condition.evaluate(text)
         helper.isActive = isVisible
         row.enabled(isVisible)
         row.visible(isVisible)
     }
-
-    override fun removeUpdate(e: DocumentEvent?) {
-        insertUpdate(e)
-    }
-
-    override fun changedUpdate(e: DocumentEvent?) {
-        insertUpdate(e)
-    }
 }

src/main/kotlin/com/stackspot/model/Input.kt

@@ -16,7 +16,6 @@
 
 package com.stackspot.model
 
-import com.intellij.util.containers.isNullOrEmpty
 import org.apache.commons.lang3.StringUtils
 
 data class Input(