Skip to content

PR: Fix snippet parsing when a slash character is present #701

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
ccordoba12 merged 4 commits into from
Nov 20, 2019
Merged

PR: Fix snippet parsing when a slash character is present #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe9d58b
fix snippet creation when a slash character is present
steff456 Nov 19, 2019
7eb59d9
remove print
steff456 Nov 19, 2019
756bafe
add test for snippet parsing
steff456 Nov 19, 2019
55cc8d5
Merge branch 'develop' into fix_snippet_slash
ccordoba12 Nov 20, 2019
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/jedi_completion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ def _format_completion(d, include_params=True):
completion['insertTextFormat'] = lsp.InsertTextFormat.Snippet
snippet = d.name + '('
for i, param in enumerate(positional_args):
snippet += '${%s:%s}' % (i + 1, param.name)
name = param.name if param.name != '/' else '\\/'
snippet += '${%s:%s}' % (i + 1, name)
if i < len(positional_args) - 1:
snippet += ', '
snippet += ')$0'
Expand Down
12 changes: 12 additions & 0 deletions test/plugins/test_completion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,18 @@ def test_snippets_completion(config):
assert completions[0]['insertText'] == out


def test_snippet_parsing(config):
doc = 'import numpy as np\nnp.logical_and'
completion_position = {'line': 1, 'character': 14}
doc = Document(DOC_URI, doc)
config.capabilities['textDocument'] = {
'completion': {'completionItem': {'snippetSupport': True}}}
config.update({'plugins': {'jedi_completion': {'include_params': True}}})
completions = pyls_jedi_completions(config, doc, completion_position)
out = 'logical_and(${1:x1}, ${2:x2}, ${3:\\/}, ${4:*})$0'
assert completions[0]['insertText'] == out


def test_multiline_snippets(config):
document = 'from datetime import\\\n date,\\\n datetime \na=date'
doc = Document(DOC_URI, document)
Expand Down