fix regex to get a list of linters (#91)

xxpxxxxp · Nov 17, 2021 · 1769529 · 1769529
1 parent 836ce29
commit 1769529
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/kotlin/com/ypwang/plugin/GolangCiOutputParser.kt b/src/main/kotlin/com/ypwang/plugin/GolangCiOutputParser.kt
@@ -35,8 +35,8 @@ object GolangCiOutputParser {
 
         val linters = mutableListOf<GoLinter>()
         val linterRaw = result.stdout.lines()
-        // format: name[ (aka)]: description [fast: bool, auto-fix: bool]
-        val regex = Regex("""(?<name>\w+)( \((?<aka>[\w, ]+)\))?: (?<description>.+) \[fast: (?<fast>true|false), auto-fix: (?<autofix>true|false)]""")
+        // format: name[ (aka)][ deprecated]: description [fast: bool, auto-fix: bool]
+        val regex = Regex("""(?<name>\w+)( \((?<aka>[\w, ]+)\))?( \[(?<deprecated>deprecated)])?: (?<description>.+) \[fast: (?<fast>true|false), auto-fix: (?<autofix>true|false)]""")
         // parse output
         var enabled = true
         for (line in linterRaw) {
@@ -57,9 +57,11 @@ object GolangCiOutputParser {
                         enabled,
                         it.groups["name"]!!.value,
                         it.groups["aka"]?.value ?: "",
+                        it.groups["deprecated"]?.value == "deprecated",
                         it.groups["description"]!!.value,
                         it.groups["fast"]!!.value.toBoolean(),
-                        it.groups["autofix"]!!.value.toBoolean())
+                        it.groups["autofix"]!!.value.toBoolean(),
+                    )
                 )
             }
         }

diff --git a/src/main/kotlin/com/ypwang/plugin/model/GoLinter.kt b/src/main/kotlin/com/ypwang/plugin/model/GoLinter.kt
@@ -4,6 +4,7 @@ data class GoLinter (
         val defaultEnabled: Boolean,
         val name: String,
         val aka: String,
+        val isDeprecated: Boolean,
         val description: String,
         val fast: Boolean,
         val autoFix: Boolean