Add error end functionality

Author: AntonVucinic

pylsp_mypy/plugin.py

@@ -30,7 +30,7 @@
 from pylsp.config.config import Config
 from pylsp.workspace import Document, Workspace
 
-line_pattern: str = r"((?:^[a-z]:)?[^:]+):(?:(\d+):)?(?:(\d+):)? (\w+): (.*)"
+line_pattern: str = r"((?:^[a-z]:)?[^:]+):(?:(\d+):)?(?:(\d+):)?(?:(\d+):)?(?:(\d+):)? (\w+): (.*)"
 
 log = logging.getLogger(__name__)
 
@@ -79,7 +79,7 @@ def parse_line(line: str, document: Optional[Document] = None) -> Optional[Dict[
     """
     result = re.match(line_pattern, line)
     if result:
-        file_path, linenoStr, offsetStr, severity, msg = result.groups()
+        file_path, linenoStr, offsetStr, endlinenoStr, endoffsetStr, severity, msg = result.groups()
 
         if file_path != "<string>":  # live mode
             # results from other files can be included, but we cannot return
@@ -90,25 +90,26 @@ def parse_line(line: str, document: Optional[Document] = None) -> Optional[Dict[
 
         lineno = int(linenoStr or 1) - 1  # 0-based line number
         offset = int(offsetStr or 1) - 1  # 0-based offset
+        end_lineno = (int(endlinenoStr) - 1) if endlinenoStr else None
+        end_offset = (int(endoffsetStr) - 1) if endoffsetStr else None
         errno = 2
         if severity == "error":
             errno = 1
         diag: Dict[str, Any] = {
             "source": "mypy",
             "range": {
                 "start": {"line": lineno, "character": offset},
-                # There may be a better solution, but mypy does not provide end
-                "end": {"line": lineno, "character": offset + 1},
+                "end": {"line": end_lineno or lineno, "character": end_offset},
             },
             "message": msg,
             "severity": errno,
         }
-        if document:
-            # although mypy does not provide the end of the affected range, we
-            # can make a good guess by highlighting the word that Mypy flagged
-            word = document.word_at_position(diag["range"]["start"])
-            if word:
-                diag["range"]["end"]["character"] = diag["range"]["start"]["character"] + len(word)
+        if diag["range"]["end"]["character"] is None:
+            diag["range"]["end"]["character"] = (
+                offset + len(word)
+                if (document and (word := document.word_at_position(diag["range"]["start"])))
+                else offset + 1
+            )
 
         return diag
     return None
@@ -229,7 +230,7 @@ def get_diagnostics(
     if dmypy:
         dmypy_status_file = settings.get("dmypy_status_file", ".dmypy.json")
 
-    args = ["--show-column-numbers"]
+    args = ["--show-error-end"]
 
     global tmpFile
     if live_mode and not is_saved:

requirements.txt

@@ -1,5 +1,5 @@
 python-lsp-server
-mypy
+mypy >= 0.981
 tomli >= 1.1.0 ; python_version < "3.11"
 black
 pre-commit

setup.cfg

@@ -21,7 +21,7 @@ python_requires = >= 3.7
 packages = find:
 install_requires =
     python-lsp-server >=1.7.0
-    mypy
+    mypy >= 0.981
     tomli >= 1.1.0 ; python_version < "3.11"
 
 [flake8]

test/test_plugin.py

@@ -18,7 +18,8 @@
 """
 TYPE_ERR_MSG = '"Dict[<nothing>, <nothing>]" has no attribute "append"  [attr-defined]'
 
-TEST_LINE = 'test_plugin.py:279:8: error: "Request" has no attribute "id"'
+TEST_LINE = 'test_plugin.py:279:8:279:19: error: "Request" has no attribute "id"'
+TEST_LINE_WITHOUT_END = 'test_plugin.py:279:8: error: "Request" has no attribute "id"'
 TEST_LINE_WITHOUT_COL = "test_plugin.py:279: " 'error: "Request" has no attribute "id"'
 TEST_LINE_WITHOUT_LINE = "test_plugin.py: " 'error: "Request" has no attribute "id"'
 
@@ -65,14 +66,22 @@ def test_plugin(workspace, last_diagnostics_monkeypatch):
     diag = diags[0]
     assert diag["message"] == TYPE_ERR_MSG
     assert diag["range"]["start"] == {"line": 0, "character": 0}
-    assert diag["range"]["end"] == {"line": 0, "character": 1}
+    assert diag["range"]["end"] == {"line": 0, "character": 8}
 
 
 def test_parse_full_line(workspace):
     diag = plugin.parse_line(TEST_LINE)  # TODO parse a document here
     assert diag["message"] == '"Request" has no attribute "id"'
     assert diag["range"]["start"] == {"line": 278, "character": 7}
-    assert diag["range"]["end"] == {"line": 278, "character": 8}
+    assert diag["range"]["end"] == {"line": 278, "character": 18}
+
+
+def test_parse_line_without_end(workspace):
+    doc = Document(DOC_URI, workspace)
+    diag = plugin.parse_line(TEST_LINE_WITHOUT_END, doc)
+    assert diag["message"] == '"Request" has no attribute "id"'
+    assert diag["range"]["start"] == {"line": 278, "character": 7}
+    assert diag["range"]["end"] == {"line": 278, "character": 13}
 
 
 def test_parse_line_without_col(workspace):
@@ -95,7 +104,7 @@ def test_parse_line_without_line(workspace):
 def test_parse_line_with_context(monkeypatch, word, bounds, workspace):
     doc = Document(DOC_URI, workspace)
     monkeypatch.setattr(Document, "word_at_position", lambda *args: word)
-    diag = plugin.parse_line(TEST_LINE, doc)
+    diag = plugin.parse_line(TEST_LINE_WITHOUT_END, doc)
     assert diag["message"] == '"Request" has no attribute "id"'
     assert diag["range"]["start"] == {"line": 278, "character": bounds[0]}
     assert diag["range"]["end"] == {"line": 278, "character": bounds[1]}
@@ -226,7 +235,7 @@ def test_option_overrides_dmypy(last_diagnostics_monkeypatch, workspace):
         "--",
         "--python-executable",
         "/tmp/fake",
-        "--show-column-numbers",
+        "--show-error-end",
         document.path,
     ]
     m.assert_called_with(expected, capture_output=True, **windows_flag, encoding="utf-8")