Skip to content

Compare paths not URIs for detecting local definitions #733

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

Merged
merged 3 commits into from
Feb 4, 2020
Merged

Compare paths not URIs for detecting local definitions #733

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
359bb3d
Compare paths not URIs
gatesn Jan 21, 2020
7db42f9
Remove unused highlight
gatesn Jan 21, 2020
5d8f304
Merge branch 'develop' into ngates/compare-paths
ccordoba12 Feb 4, 2020
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
4 changes: 2 additions & 2 deletions pyls/plugins/highlight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2017 Palantir Technologies, Inc.
import logging
from pyls import hookimpl, lsp, uris
from pyls import hookimpl, lsp

log = logging.getLogger(__name__)

Expand All @@ -13,7 +13,7 @@ def is_valid(definition):
return definition.line is not None and definition.column is not None

def local_to_document(definition):
return not definition.module_path or uris.uri_with(document.uri, path=definition.module_path) == document.uri
return not definition.module_path or definition.module_path == document.path

return [{
'range': {
Expand Down