minor readability changes

Author: Richardk2n

README.rst

@@ -57,12 +57,12 @@ With ``dmypy`` enabled your config should look like this:
         "strict": False
     }
 
-With ``overrides`` specified, your config should resemble this:
+With ``overrides`` specified (for example to tell mypy to use a different python than the currently active venv), your config could look like this:
 
 ::
 
     {
-        ...,
+        "enabled": True,
         "overrides": ["--python-executable", "/home/me/bin/python", True]
     }
 

pylsp_mypy/plugin.py

@@ -97,11 +97,14 @@ def parse_line(line: str, document: Optional[Document] = None) -> Optional[Dict[
 
 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:
+    overrides_iterator = iter(overrides)
+    if True not in overrides_iterator:
         return overrides
-    rest = list(o)
-    return [*overrides[: -(len(rest) + 1)], *args, *rest]
+    # If True is in the list, the if above leaves the iterator at the element after True,
+    # therefore, the list below only contains the elements after the True
+    rest = list(overrides_iterator)
+    # slice of the True and the rest, add the args, add the rest
+    return overrides[: -(len(rest) + 1)] + args + rest
 
 
 @hookimpl
@@ -195,12 +198,11 @@ def pylsp_lint(
     if settings.get("strict", False):
         args.append("--strict")
 
-    overrides = settings.get("overrides")
+    overrides = settings.get("overrides", [True])
 
     if not dmypy:
         args.extend(["--incremental", "--follow-imports", "silent"])
-        if overrides:
-            args = apply_overrides(args, overrides)
+        args = apply_overrides(args, overrides)
 
         log.info("executing mypy args = %s", args)
         completed_process = subprocess.run(
@@ -214,15 +216,17 @@ def pylsp_lint(
         # If daemon is hung, kill will reset
         # If daemon is dead/absent, kill will no-op.
         # In either case, reset to fresh state
-        completed_process = subprocess.run(["dmypy", *args], stderr=subprocess.PIPE)
+        completed_process = subprocess.run(
+            ["dmypy", *apply_overrides(args, overrides)], stderr=subprocess.PIPE
+        )
         _err = completed_process.stderr.decode()
         _status = completed_process.returncode
         if _status != 0:
             log.info("restarting dmypy from status: %s message: %s", _status, _err.strip())
             subprocess.run(["dmypy", "kill"])
 
         # run to use existing daemon or restart if required
-        args = ["run", "--"] + (apply_overrides(args, overrides) if overrides else args)
+        args = ["run", "--"] + apply_overrides(args, overrides)
         log.info("dmypy run args = %s", args)
         completed_process = subprocess.run(
             ["dmypy", *args], stdout=subprocess.PIPE, stderr=subprocess.PIPE

test/test_plugin.py

@@ -5,6 +5,7 @@
 from pylsp import uris
 from unittest.mock import Mock
 from pylsp_mypy import plugin
+import collections
 
 DOC_URI = __file__
 DOC_TYPE_ERR = """{}.append(3)
@@ -18,7 +19,7 @@
 
 @pytest.fixture
 def diag_mp(monkeypatch):
-    monkeypatch.setattr(plugin, "last_diagnostics", plugin.collections.defaultdict(list))
+    monkeypatch.setattr(plugin, "last_diagnostics", collections.defaultdict(list))
     return monkeypatch