Preserve target authorities in definition and reference URIs

Author: jakezwang

pylsp/plugins/definition.py

@@ -64,7 +64,7 @@ def pylsp_definitions(
     follow_builtin_defns = settings.get("follow_builtin_definitions", True)
     return [
         {
-            "uri": uris.uri_with(document.uri, path=str(d.module_path)),
+            "uri": uris.from_fs_path(str(d.module_path)),
             "range": {
                 "start": {"line": d.line - 1, "character": d.column},
                 "end": {"line": d.line - 1, "character": d.column + len(d.name)},

pylsp/plugins/references.py

@@ -20,7 +20,7 @@ def pylsp_references(document, position, exclude_declaration):
     # Filter out builtin modules
     return [
         {
-            "uri": uris.uri_with(document.uri, path=str(d.module_path))
+            "uri": uris.from_fs_path(str(d.module_path))
             if d.module_path
             else document.uri,
             "range": {

test/plugins/test_location_uris.py

@@ -0,0 +1,65 @@
+# Copyright 2021- Python Language Server Contributors.
+
+from pathlib import PureWindowsPath
+from types import SimpleNamespace
+
+import pytest
+
+from pylsp import uris
+from pylsp.plugins.definition import pylsp_definitions
+from pylsp.plugins.references import pylsp_references
+from pylsp.workspace import Document
+
+
+@pytest.mark.parametrize("operation", ["definition", "references"])
+@pytest.mark.parametrize(
+    "document_uri,target_path,expected_uri",
+    [
+        (
+            "file:///c:/project/main.py",
+            r"\\server\share\target.py",
+            "file://server/share/target.py",
+        ),
+        (
+            "file://server/share/main.py",
+            r"\\other\share\target.py",
+            "file://other/share/target.py",
+        ),
+        (
+            "file://server/share/main.py",
+            r"C:\project\target.py",
+            "file:///c:/project/target.py",
+        ),
+        (
+            "file://server/share/main.py",
+            r"\\server\share\target.py",
+            "file://server/share/target.py",
+        ),
+    ],
+)
+def test_location_uri(
+    config, workspace, monkeypatch, operation, document_uri, target_path, expected_uri
+) -> None:
+    monkeypatch.setattr(uris, "IS_WIN", True)
+    name = SimpleNamespace(
+        module_path=PureWindowsPath(target_path),
+        line=1,
+        column=0,
+        name="target",
+        is_definition=lambda: True,
+        in_builtin_module=lambda: False,
+    )
+    script = SimpleNamespace(
+        goto=lambda **kwargs: [name], get_references=lambda **kwargs: [name]
+    )
+    document = Document(document_uri, workspace, "target()")
+    monkeypatch.setattr(document, "jedi_script", lambda **kwargs: script)
+    position = {"line": 0, "character": 0}
+
+    if operation == "definition":
+        locations = pylsp_definitions(config, document, position)
+    else:
+        locations = pylsp_references(document, position, exclude_declaration=False)
+
+    assert len(locations) == 1
+    assert locations[0]["uri"] == expected_uri