fix: mypy ci and formatting

Author: xiaoshihou514

lua/guard-collection/linter/mypy/base.lua

@@ -64,7 +64,9 @@ return function(cmd, args)
           tonumber(mes.col) - opts.offset,
           ('%s [%s]'):format(mes.message, code),
           opts.severities[mes.severity],
-          opts.source
+          opts.source,
+          nil,
+          nil
         )
 
         diag.end_col = tonumber(mes.end_col) - opts.offset

test/formatter/alejandra_spec.lua

@@ -7,11 +7,11 @@ describe('alejandra', function()
     -- the helper creates a new buffer with it, formats, and returns the formatted output
     local formatted = require('test.formatter.helper').test_with('nix', {
       -- The input code should somewhat reflect the filetype
-      [[{inputs={nixpkgs.url="github:NixOS/nixpkgs/nixos-unstable";};}]]
+      [[{inputs={nixpkgs.url="github:NixOS/nixpkgs/nixos-unstable";};}]],
     })
     -- Show that the input is indeed formatted as intended
     assert.are.same({
-      [[{inputs = {nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";};}]]
+      [[{inputs = {nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";};}]],
     }, formatted)
   end)
 end)

test/linter/mypy_spec.lua

@@ -6,22 +6,18 @@ describe('mypy', function()
     ft('python'):lint('mypy')
 
     local diagnostics = helper.test_with('python', {
-      [[from typing import Iterator]],
-      [[def fib(n) -> Iterator[str]:]],
-      [[  a, b = 0, 1]],
-      [[  while a < n:]],
-      [[    yield a]],
-      [[    a, b = b, a+b]],
+      [[def foo() -> str:]],
+      [[    return 42]],
     })
 
     assert.are.same({
       {
         bufnr = 3,
-        col = 4,
-        end_col = 10,
-        end_lnum = 4,
-        lnum = 4,
-        message = 'Incompatible types in "yield" (actual type "int", expected type "str") [misc]',
+        col = 11,
+        end_col = 12,
+        end_lnum = 1,
+        lnum = 1,
+        message = 'Incompatible return value type (got "int", expected "str") [return-value]',
         namespace = ns,
         severity = 1,
         source = 'mypy',