Merge branch 'develop' into uri_match_parent

Author: ccordoba12

.github/workflows/static.yml

@@ -22,13 +22,13 @@ jobs:
       OS: 'linux'
     timeout-minutes: 2
     steps:
-      - uses: actions/cache@v4
+      - uses: actions/cache@v6
         with:
           path: ~/.cache/pip
           key: static-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: static-pip-
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.9'
           architecture: 'x64'

.github/workflows/test-linux.yml

@@ -27,13 +27,13 @@ jobs:
         PYTHON_VERSION: ['3.14', '3.13', '3.12', '3.11', '3.10', '3.9']
     timeout-minutes: 10
     steps:
-      - uses: actions/cache@v4
+      - uses: actions/cache@v6
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: 'x64'

.github/workflows/test-mac.yml

@@ -16,24 +16,24 @@ concurrency:
 jobs:
   build:
     name: Mac Py${{ matrix.PYTHON_VERSION }}
-    runs-on: macos-13
+    runs-on: macos-14
     env:
       CI: 'true'
       OS: 'macos'
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.14', '3.12', '3.9']
+        PYTHON_VERSION: ['3.14', '3.12', '3.11']
     timeout-minutes: 10
     steps:
-      - uses: actions/cache@v4
+      - uses: actions/cache@v6
         with:
           path: ~/Library/Caches/pip
           key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: 'x64'

.github/workflows/test-win.yml

@@ -27,13 +27,13 @@ jobs:
         PYTHON_VERSION: ['3.14', '3.12', '3.9']
     timeout-minutes: 10
     steps:
-      - uses: actions/cache@v4
+      - uses: actions/cache@v6
         with:
           path: ~\AppData\Local\pip\Cache
           key: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: ${{ runner.os }}-${{ matrix.PYTHON_VERSION }}-pip-
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: 'x64'

CONFIGURATION.md

@@ -78,6 +78,6 @@ This server can be configured using the `workspace/didChangeConfiguration` metho
 | `pylsp.rope.ropeFolder` | `array` of unique `string` items | The name of the folder in which rope stores project configurations and data.  Pass `null` for not using such a folder at all. | `null` |
 | `pylsp.signature.formatter` | `string` (one of: `'black'`, `'ruff'`, `None`) | Formatter to use for reformatting signatures in docstrings. | `"black"` |
 | `pylsp.signature.include_docstring` | `boolean` | Include signature docstring. | `true` |
-| `pylsp.signature.line_length` | `number`  | Maximum line length in signatures. | `88` |
+| `pylsp.signature.line_length` | `integer` | Maximum line length in signatures. | `88` |
 
 This documentation was generated from `pylsp/config/schema.json`. Please do not edit this file directly.

pylsp/_utils.py

@@ -98,7 +98,13 @@ def find_parents(root, path, names):
     # Split the relative by directory, generate all the parent directories, then check each of them.
     # This avoids running a loop that has different base-cases for unix/windows
     # e.g. /a/b and /a/b/c/d/e.py -> ['/a/b', 'c', 'd']
-    dirs = [root] + os.path.relpath(os.path.dirname(path), root).split(os.path.sep)
+    try:
+        dirs = [root] + os.path.relpath(os.path.dirname(path), root).split(os.path.sep)
+    except ValueError:
+        # On Windows, relpath raises ValueError when path and root are on different mounts
+        # (e.g. a UNC share root vs a drive-letter path). Nothing to find in this case.
+        log.warning("Path %r not in %r", path, root)
+        return []
 
     # Search each of /a/b/c, /a/b, /a
     while dirs:

pylsp/config/schema.json

@@ -91,7 +91,10 @@
       "description": "List of errors and warnings to ignore (or skip)."
     },
     "pylsp.plugins.flake8.maxComplexity": {
-      "type": "integer",
+      "type": [
+        "integer",
+        "null"
+      ],
       "default": null,
       "description": "Maximum allowed complexity threshold."
     },
@@ -536,7 +539,7 @@
       "description": "Include signature docstring."
     },
     "pylsp.signature.line_length": {
-      "type": "number",
+      "type": "integer",
       "default": 88,
       "description": "Maximum line length in signatures."
     }

pylsp/plugins/definition.py

@@ -71,7 +71,10 @@ def pylsp_definitions(
             },
         }
         for d in definitions
-        if d.is_definition() and (follow_builtin_defns or _not_internal_definition(d))
+        if d.is_definition()
+        and d.line is not None
+        and d.column is not None
+        and (follow_builtin_defns or _not_internal_definition(d))
     ]
 
 

test/plugins/test_completion.py

@@ -322,7 +322,7 @@ def test_matplotlib_completions(config, workspace) -> None:
 
 
 def test_snippets_completion(config, workspace) -> None:
-    doc_snippets = "from collections import defaultdict \na=defaultdict"
+    doc_snippets = "from collections import defaultdict \ndef foo(a): pass\nfoo"
     com_position = {"line": 0, "character": 35}
     doc = Document(DOC_URI, workspace, doc_snippets)
     config.capabilities["textDocument"] = {
@@ -332,9 +332,9 @@ def test_snippets_completion(config, workspace) -> None:
     completions = pylsp_jedi_completions(config, doc, com_position)
     assert completions[0]["insertText"] == "defaultdict"
 
-    com_position = {"line": 1, "character": len(doc_snippets)}
+    com_position = {"line": 2, "character": 3}
     completions = pylsp_jedi_completions(config, doc, com_position)
-    assert completions[0]["insertText"] == "defaultdict($0)"
+    assert completions[0]["insertText"] == "foo($0)"
     assert completions[0]["insertTextFormat"] == lsp.InsertTextFormat.Snippet
 
 

test/plugins/test_definitions.py

@@ -3,6 +3,8 @@
 
 import os
 
+import jedi
+
 from pylsp import uris
 from pylsp.plugins.definition import pylsp_definitions
 from pylsp.workspace import Document
@@ -173,3 +175,27 @@ def foo():
     assert [{"uri": module_uri, "range": def_range}] == pylsp_definitions(
         config, doc, cursor_pos
     )
+
+
+def test_definition_without_source_position(config, workspace, monkeypatch) -> None:
+    # A definition jedi resolves without a source position (e.g. a compiled
+    # builtin, where line/column are None) must be dropped, not crash with
+    # `TypeError: unsupported operand type(s) for -: 'NoneType' and 'int'`.
+    # Regression test for #623 and #624.
+    class _NoPositionName:
+        line = None
+        column = None
+        module_path = None
+        name = "compiled"
+
+        def is_definition(self) -> bool:
+            return True
+
+    monkeypatch.setattr(
+        jedi.api.Script, "goto", lambda *args, **kwargs: [_NoPositionName()]
+    )
+
+    doc = Document(DOC_URI, workspace, DOC)
+    # follow_builtin_definitions defaults to True, so the None-guard in the
+    # return comprehension is the only thing preventing the crash.
+    assert pylsp_definitions(config, doc, {"line": 3, "character": 6}) == []