Merge pull request #11 from andybro19/problem-matcher-improvements

Problem matcher improvements

Author: gizmoguy

README.md

@@ -17,11 +17,11 @@ for common linters (see [list](#available-problem-matchers) below).
 * ansible-lint (requires `--parseable` flag or `parseable: true` in config)
 * black
 * eslint
-* flake8
 * isort
 * markdownlint
 * mypy
-* pycodestyle
+* pycodestyle-error (also works for linters that use the same output format, like flake8)
+* pycodestyle-warning (also works for linters that use the same output format, like flake8)
 * pydocstyle
 * pylint-error
 * pylint-warning

matchers/actionlint.json

@@ -5,11 +5,12 @@
             "severity": "error",
             "pattern": [
                 {
-                    "regexp": "^([^:]+):(\\d+):(\\d+): (?!\\[[a-z]+\\] )(.*)$",
+                    "regexp": "^(.+?):(\\d+):(\\d+): (.+) \\[(.+)\\]$",
                     "file": 1,
                     "line": 2,
                     "column": 3,
-                    "message": 4
+                    "message": 4,
+                    "code": 5
                 }
             ]
         }

matchers/ansible-lint.json

@@ -5,10 +5,12 @@
             "severity": "error",
             "pattern": [
                 {
-                    "regexp": "^([^:]+):(\\d+): (.*)$",
+                    "regexp": "^(.+?):(\\d+):(?:(\\d+):)? (?![A-Z]\\d+: )(\\S+): (.+)$",
                     "file": 1,
                     "line": 2,
-                    "message": 3
+                    "column": 3,
+                    "code": 4,
+                    "message": 5
                 }
             ]
         }

matchers/black.json

@@ -3,14 +3,11 @@
         {
             "owner": "black",
             "severity": "warning",
-            "column": 1,
-            "line": 1,
-            "code": "W",
             "pattern": [
                 {
-                    "regexp": "^(would reformat) (.*)$",
-                    "file": 2,
-                    "message": 1
+                    "regexp": "^(would reformat) (.+)$",
+                    "message": 1,
+                    "file": 2
                 }
             ]
         }

matchers/eslint.json

@@ -9,11 +9,12 @@
                     "file": 1
                 },
                 {
-                    "regexp": "^  (\\d+):(\\d+)  (?=[a-z]+)(error|warning)?[a-z]*  (.*)$",
+                    "regexp": "^ +(\\d+):(\\d+) +(?:(error|warning)|[a-z]+) +(.+?)(?: {2,}(\\S+))?$",
                     "line": 1,
                     "column": 2,
                     "severity": 3,
                     "message": 4,
+                    "code": 5,
                     "loop": true
                 }
             ]

matchers/isort.json

@@ -4,9 +4,9 @@
             "owner": "isort",
             "pattern": [
                 {
-                    "regexp": "^(\\S*): (\\S*) (.*)$",
-                    "file": 2,
+                    "regexp": "^([A-Z]+): (.+?) (.+)$",
                     "severity": 1,
+                    "file": 2,
                     "message": 3
                 }
             ]

matchers/mypy.json

@@ -2,13 +2,13 @@
     "problemMatcher": [
         {
             "owner": "mypy",
-            "code": "E",
+            "severity": "notice",
             "pattern": [
                 {
-                    "regexp": "^(\\S*):(\\d+):(\\d+): ([a-z]+): (.*)$",
+                    "regexp": "^(.+?):(\\d+):(?:(\\d+):)? (?:(error|warning)|[a-z]+): (.+)$",
                     "file": 1,
-                    "column": 3,
                     "line": 2,
+                    "column": 3,
                     "severity": 4,
                     "message": 5
                 }

matchers/pycodestyle.json matchers/pycodestyle-error.jsonmatchers/pycodestyle.json renamed to matchers/pycodestyle-error.json

@@ -1,11 +1,11 @@
 {
     "problemMatcher": [
         {
-            "owner": "pycodestyle",
-            "severity": "warning",
+            "owner": "pycodestyle-error",
+            "severity": "error",
             "pattern": [
                 {
-                    "regexp": "^(\\S*):(\\d+):(\\d+): ([A-Z]\\d+) (.*)$",
+                    "regexp": "^(.+?):(\\d+):(\\d+): ([A-VX-Z]\\d+) (.+)$",
                     "file": 1,
                     "line": 2,
                     "column": 3,

matchers/flake8.json matchers/pycodestyle-warning.jsonmatchers/flake8.json renamed to matchers/pycodestyle-warning.json

@@ -1,11 +1,11 @@
 {
     "problemMatcher": [
         {
-            "owner": "flake8",
+            "owner": "pycodestyle-warning",
             "severity": "warning",
             "pattern": [
                 {
-                    "regexp": "(\\S+):(\\d+):(\\d+): ([A-Z]\\d+) (.*)",
+                    "regexp": "^(.+?):(\\d+):(\\d+): (W\\d+) (.+)$",
                     "file": 1,
                     "line": 2,
                     "column": 3,

matchers/pydocstyle.json

@@ -3,17 +3,16 @@
         {
             "owner": "pydocstyle",
             "severity": "warning",
-            "column": 1,
             "pattern": [
                 {
-                    "regexp": "^(\\S*):(\\d*) .*",
+                    "regexp": "^(.+?):(\\d+) in .+$",
                     "file": 1,
                     "line": 2
                 },
                 {
-                    "regexp": "\\s*(D\\d*): (.*)$",
-                    "message": 2,
-                    "code": 1
+                    "regexp": "\\s*(D\\d+): (.+)$",
+                    "code": 1,
+                    "message": 2
                 }
             ]
         }