fixup! Add option to override command line

Author: jpneverwas

README.rst

@@ -33,8 +33,8 @@ Configuration
 ``strict`` (default is False) refers to the ``strict`` option of ``mypy``.
     This option often is too strict to be useful.
 
-``overrides`` (default is ``[]``) specifies a list of alternate or supplemental command-line options.
-    This modifies the options passed to ``mypy`` or the mypy-specific ones passed to ``dmypy run``. When present, the special boolean member ``True`` is replaced with the command-line options that would've been passed had ``overrides`` not been specified.
+``overrides`` (default is ``[True]``) specifies a list of alternate or supplemental command-line options.
+    This modifies the options passed to ``mypy`` or the mypy-specific ones passed to ``dmypy run``. When present, the special boolean member ``True`` is replaced with the command-line options that would've been passed had ``overrides`` not been specified. Later options take precedence, which allows for replacing or negating individual default options (see ``mypy.main:process_options`` and ``mypy --help | grep inverse``).
 
 Depending on your editor, the configuration (found in a file called pylsp-mypy.cfg in your workspace or a parent directory) should be roughly like this for a standard configuration:
 

pylsp_mypy/plugin.py

@@ -16,7 +16,7 @@
 from pylsp import hookimpl
 from pylsp.workspace import Document, Workspace
 from pylsp.config.config import Config
-from typing import Optional, Dict, Any, IO, List, Generator
+from typing import Optional, Dict, Any, IO, List
 import atexit
 import collections
 import warnings
@@ -95,13 +95,13 @@ def parse_line(line: str, document: Optional[Document] = None) -> Optional[Dict[
     return None
 
 
-def apply_overrides(args: List[str], overrides: List[Any]) -> Generator[str, None, None]:
-    """Replace or combine overrides with command-line args."""
-    for v in overrides:
-        if v is True:
-            yield from iter(args)
-            continue
-        yield v
+def apply_overrides(args: List[str], overrides: List[Any]) -> List[str]:
+    """Replace or combine default command-line options with overrides."""
+    o = iter(overrides)
+    if True not in o:
+        return overrides
+    rest = list(o)
+    return [*overrides[: -(len(rest) + 1)], *args, *rest]
 
 
 @hookimpl
@@ -200,7 +200,7 @@ def pylsp_lint(
     if not dmypy:
         args.extend(["--incremental", "--follow-imports", "silent"])
         if overrides:
-            args = list(apply_overrides(args, overrides))
+            args = apply_overrides(args, overrides)
 
         log.info("executing mypy args = %s", args)
         completed_process = subprocess.run(
@@ -222,7 +222,7 @@ def pylsp_lint(
             subprocess.run(["dmypy", "kill"])
 
         # run to use existing daemon or restart if required
-        args = ["run", "--"] + (list(apply_overrides(args, overrides)) if overrides else args)
+        args = ["run", "--"] + (apply_overrides(args, overrides) if overrides else args)
         log.info("dmypy run args = %s", args)
         completed_process = subprocess.run(
             ["dmypy", *args], stdout=subprocess.PIPE, stderr=subprocess.PIPE

test/test_plugin.py

@@ -129,27 +129,25 @@ def foo():
 
 
 def test_apply_overrides():
-    assert list(plugin.apply_overrides(["1", "2"], [])) == []
-    assert list(plugin.apply_overrides(["1", "2"], ["a"])) == ["a"]
-    assert list(plugin.apply_overrides(["1", "2"], ["a", True])) == ["a", "1", "2"]
-    assert list(plugin.apply_overrides(["1", "2"], [True, "a"])) == ["1", "2", "a"]
-    assert list(plugin.apply_overrides(["1"], ["a", True, "b"])) == ["a", "1", "b"]
+    assert plugin.apply_overrides(["1", "2"], []) == []
+    assert plugin.apply_overrides(["1", "2"], ["a"]) == ["a"]
+    assert plugin.apply_overrides(["1", "2"], ["a", True]) == ["a", "1", "2"]
+    assert plugin.apply_overrides(["1", "2"], [True, "a"]) == ["1", "2", "a"]
+    assert plugin.apply_overrides(["1"], ["a", True, "b"]) == ["a", "1", "b"]
 
 
 def test_option_overrides(tmpdir, diag_mp, workspace):
     import sys
-    from textwrap import dedent
 
     sentinel = tmpdir / "ran"
 
-    source = dedent(
-        """\
-        #!{}
-        import os, sys, pathlib
-        pathlib.Path({!r}).touch()
-        os.execv({!r}, sys.argv)
-        """
-    ).format(sys.executable, str(sentinel), sys.executable)
+    source = """\
+#!{}
+import os, sys, pathlib
+pathlib.Path({!r}).touch()
+os.execv({!r}, sys.argv)\n"""
+
+    source = source.format(sys.executable, str(sentinel), sys.executable)
 
     wrapper = tmpdir / "bin/wrapper"
     wrapper.write(source, ensure=True)