code review fixes

sbdchd · sbdchd · commit 434eded74e6c · 2021-02-24T22:48:53.000-05:00
diff --git a/src/client/linters/mypy.ts b/src/client/linters/mypy.ts
@@ -16,8 +16,8 @@ export class MyPy extends BaseLinter {
     }
 
     protected async runLinter(document: TextDocument, cancellation: CancellationToken): Promise<ILintMessage[]> {
-        const fileName = document.uri.fsPath.slice(this.getWorkspaceRootPath(document).length + 1);
-        const regex = getRegex(fileName);
+        const relativeFilePath = document.uri.fsPath.slice(this.getWorkspaceRootPath(document).length + 1);
+        const regex = getRegex(relativeFilePath);
         const messages = await this.run([document.uri.fsPath], document, cancellation, regex);
         messages.forEach((msg) => {
             msg.severity = this.parseMessagesSeverity(msg.type, this.pythonSettings.linting.mypyCategorySeverity);
diff --git a/src/test/linters/mypy.unit.test.ts b/src/test/linters/mypy.unit.test.ts
@@ -60,4 +60,41 @@ suite('Linting - MyPy', () => {
             expect(msg).to.deep.equal(expected);
         }
     });
+    test('regex excludes unexpected files', () => {
+        // mypy run against `foo/bar.py` returning errors for foo/__init__.py
+        const outputWithUnexpectedFile = `
+foo/__init__.py:4:5: error: Statement is unreachable  [unreachable]
+foo/bar.py:2:14: error: Incompatible types in assignment (expression has type "str", variable has type "int")  [assignment]
+Found 2 errors in 2 files (checked 1 source file)
+`;
+
+        const lines = outputWithUnexpectedFile.split('\n');
+        const tests: [string, ILintMessage | undefined][] = [
+            [lines[0], undefined],
+            [lines[1], undefined],
+            [
+                lines[2],
+                {
+                    code: undefined,
+                    message:
+                        'Incompatible types in assignment (expression has type "str", variable has type "int")  [assignment]',
+                    column: 14,
+                    line: 2,
+                    type: 'error',
+                    provider: 'mypy',
+                },
+            ],
+            [lines[3], undefined],
+        ];
+        for (const [line, expected] of tests) {
+            const msg = parseLine(line, getRegex('foo/bar.py'), LinterId.MyPy);
+
+            expect(msg).to.deep.equal(expected);
+        }
+    });
+    test('getRegex escapes filename correctly', () => {
+        expect(getRegex('foo/bar.py')).to.eql(
+            String.raw`foo/bar\.py:(?<line>\d+)(:(?<column>\d+))?: (?<type>\w+): (?<message>.*)\r?(\n|$)`,
+        );
+    });
 });
