fix(ignored-errors): properly check if errors were modified

Author: Blarc

CHANGELOG.md

@@ -4,6 +4,7 @@
 ### Added
 - Option to ignore specific error for a file.
 - Explanation for `Pipeline filtered out by workflow rules` error.
+- Table of ignored errors in settings.
 
 ### Changed
 - Refactor code for getting remote URL and Gitlab API URL in `ResolveContext`.

src/main/kotlin/com/github/blarc/gitlab/template/lint/plugin/settings/ignoredErrors/IgnoredError.kt

@@ -7,4 +7,16 @@ import kotlinx.serialization.Serializable
 class IgnoredError(
     var filePath: String,
     var errorMessage: String
-)
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other?.javaClass != javaClass) return false
+
+        other as IgnoredError
+        return filePath == other.filePath && errorMessage == other.errorMessage
+    }
+
+    override fun hashCode(): Int {
+        return filePath.hashCode() + errorMessage.hashCode()
+    }
+}

src/main/kotlin/com/github/blarc/gitlab/template/lint/plugin/settings/ignoredErrors/IgnoredErrorsConfigurable.kt

@@ -14,9 +14,8 @@ import com.intellij.ui.table.TableView
 import com.intellij.util.ui.ListTableModel
 import javax.swing.ListSelectionModel
 
-class IgnoredErrorsConfigurable(val project: Project) :
-    BoundConfigurable(message("settings.ignored-errors.group.title")) {
-    private var ignoredErrors = project.service<ProjectSettings>().ignoredErrors.toMutableMap()
+class IgnoredErrorsConfigurable(val project: Project) : BoundConfigurable(message("settings.ignored-errors.group.title")) {
+    private var ignoredErrors = projectsIgnoredErrors()
 
     private val tableModel = createTableModel()
 
@@ -45,36 +44,40 @@ class IgnoredErrorsConfigurable(val project: Project) :
             createColumn<IgnoredError>(message("settings.ignored-error.file")) { ignoredError -> ignoredError.filePath.removePrefix("${project.basePath ?: ""}/") },
             createColumn(message("settings.ignored-error.message")) { ignoredError -> ignoredError.errorMessage }
         ),
-        ignoredErrorsList()
+        ignoredErrors
     )
 
     private fun removeIgnoredError() {
         val selectedRow = table.selectedObject ?: return
 
-        ignoredErrors[selectedRow.filePath]?.remove(selectedRow.errorMessage)
+        ignoredErrors = ignoredErrors.minus(selectedRow)
         refreshTableModel()
     }
 
     private fun refreshTableModel() {
-        tableModel.items = ignoredErrorsList()
+        tableModel.items = ignoredErrors
     }
 
     override fun reset() {
         super.reset()
-        ignoredErrors = project.service<ProjectSettings>().ignoredErrors.toMutableMap()
+        ignoredErrors = projectsIgnoredErrors()
         refreshTableModel()
     }
 
     override fun isModified(): Boolean {
-        return super.isModified() || ignoredErrors != project.service<ProjectSettings>().ignoredErrors
+        return ignoredErrors != projectsIgnoredErrors()
     }
 
     override fun apply() {
         super.apply()
-        project.service<ProjectSettings>().ignoredErrors = ignoredErrors
+        project.service<ProjectSettings>().ignoredErrors = ignoredErrors.groupBy {
+            it.filePath
+        }.mapValues {
+            it.value.map { ignoredError -> ignoredError.errorMessage }.toMutableSet()
+        }.toMutableMap()
     }
 
-    private fun ignoredErrorsList() = ignoredErrors.map { mapEntry ->
+    private fun projectsIgnoredErrors() = project.service<ProjectSettings>().ignoredErrors.map { mapEntry ->
         mapEntry.value.map {
             IgnoredError(mapEntry.key, it)
         }