Merge branch 'master' into info-2-1

2020-04-29 14:41:42 +02:00
parent 8bbf42623f 1ad3df42dc
commit c2ccfcfd98
2 changed files with 47 additions and 17 deletions
--- a/.github/python_matcher.json
+++ b/.github/python_matcher.json
@@ -4,18 +4,16 @@
            "owner": "yapf-diff",
            "pattern": [
                {
-                    "regexp": "^[+-]{3}\\s*([^\\s]*)\\s*\\((original|reformatted)\\)$",
+                    "regexp": "^---\\s*([^\\s]*)\\s*\\(original\\)$",
                    "file": 1
                },
                {
-                    "regexp": "^@@\\s*-(\\d+),(\\d+)\\s*\\+(\\d+),(\\d+)\\s*@@$",
-                    "line": 1,
-                    "column": 2
+                    "regexp": "^\\+\\+\\+\\s*([^\\s]*)\\s*\\((.*)\\)$",
+                    "message": 2
                },
                {
-                    "regexp": "^(\\s|\\+[^+]|\\-[^-]).*$",
-                    "loop": true,
-                    "message": 1
+                    "regexp": "^@@\\s*-(\\d+),(\\d+)\\s*\\+(\\d+),(\\d+)\\s*@@$",
+                    "line": 1
                }
            ]
        },