Skip to content

utils: prefer parent uri when matching uri #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mnauw wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

utils: prefer parent uri when matching uri #682

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions pylsp/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import docstring_to_markdown
import jedi

from pylsp import IS_WIN

JEDI_VERSION = jedi.__version__

# Eol chars accepted by the LSP protocol
Expand Down Expand Up @@ -134,9 +136,23 @@ def match_uri_to_workspace(uri, workspaces):
if len(workspace_parts) > len(path):
continue
match_len = 0
is_parent = True
for workspace_part, path_part in zip(workspace_parts, path):
# filename match is case insensitive on windows
# also, uris._normalize_win_path() lowercases the drive letter
if IS_WIN:
workspace_part = workspace_part.lower()
path_part = path_part.lower()
if workspace_part == path_part:
match_len += 1
else:
# give up, any subsequent match is no longer relevant
is_parent = False
break
# prefer a match that is actually a parent of uri
# otherwise fall back to longest matching non-parent
if is_parent and match_len > 0:
match_len += 1000
if match_len > 0:
if match_len > max_len:
max_len = match_len
Expand Down
Loading