Skip to content

Handle windows paths in workspace.get_uri_like + test #87

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 4 commits into from
Aug 7, 2017
Merged

Handle windows paths in workspace.get_uri_like + test #87

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bafce03
Handle windows paths in workspace.get_uri_like + test
tomv564 Aug 7, 2017
413cf2c
Guard against module_path=None being passed into get_uri_like
tomv564 Aug 7, 2017
a21a5fa
Also quote outgoing uris
tomv564 Aug 7, 2017
4947f79
Make sure a colon exists before trying to split a windows path
tomv564 Aug 7, 2017
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
3 changes: 2 additions & 1 deletion pyls/plugins/definition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ def pyls_definitions(document, position):
d for d in definitions
if d.is_definition() and d.line is not None and d.column is not None
]

return [{
'uri': workspace.get_uri_like(document.uri, d.module_path),
'uri': workspace.get_uri_like(document.uri, d.module_path) if d.module_path else document.uri,
'range': {
'start': {'line': d.line - 1, 'character': d.column},
'end': {'line': d.line - 1, 'character': d.column + len(d.name)}
Expand Down
2 changes: 1 addition & 1 deletion pyls/plugins/references.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def pyls_references(document, position, exclude_declaration=False):
usages = [d for d in usages if not d.is_definition()]

return [{
'uri': workspace.get_uri_like(document.uri, d.module_path),
'uri': workspace.get_uri_like(document.uri, d.module_path) if d.module_path else document.uri,
'range': {
'start': {'line': d.line - 1, 'character': d.column},
'end': {'line': d.line - 1, 'character': d.column + len(d.name)}
Expand Down
2 changes: 2 additions & 0 deletions pyls/workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,5 +181,7 @@ def get_uri_like(doc_uri, path):
unicode objects.
"""
parts = list(urlparse(doc_uri))
if path[0] != '/': # fix path for windows
Copy link
Contributor

@gatesn gatesn Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add and ':' in path just to make sure we don't throw on the next line

path = '/' + path.replace('\\', '/')
parts[2] = path
return urlunparse([str(p) for p in parts])
4 changes: 4 additions & 0 deletions test/test_workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ def test_bad_get_document(pyls):

def test_uri_like():
assert workspace.get_uri_like('file:///some-path', '/my/path') == 'file:///my/path'
win_doc_uri = r'file:///D:/helloworld.py'
win_doc_path = r'D:\helloworld.py'
win_uri = workspace.get_uri_like(win_doc_uri, win_doc_path)
assert win_uri == win_doc_uri


def test_non_root_project(pyls):
Expand Down