Skip to content

Complete all Jinja2 keys after --<tab> in /f #2095

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
rolandwalker merged 1 commit into from
Aug 4, 2026
+8 −0
Merged

Complete all Jinja2 keys after --<tab> in /f #2095

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions mycli/packages/completion_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,8 @@ def suggest_favorite_query_with_template(text: str, arg: str) -> list[dict[str,
is_current = index == len(arguments) - 1 and not trailing_space

if argument == '--':
if is_current:
break
return []
if argument.startswith('--'):
option = argument[2:]
Expand Down
2 changes: 2 additions & 0 deletions test/pytests/test_completion_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,8 @@ def test_suggest_type_handles_parser_results_shorter_than_cursor(monkeypatch):
('/f report ', [{'type': 'favoritequery_template_key', 'name': 'report', 'used_keys': set()}]),
('\\f report --u', [{'type': 'favoritequery_template_key', 'name': 'report', 'used_keys': set()}]),
('/f report -', [{'type': 'favoritequery_template_key', 'name': 'report', 'used_keys': set()}]),
('/f report --', [{'type': 'favoritequery_template_key', 'name': 'report', 'used_keys': set()}]),
('/f report -- ', []),
('/f report positional', []),
('/f report positional ', [{'type': 'favoritequery_template_key', 'name': 'report', 'used_keys': set()}]),
('/f report --user=', []),
Expand Down
4 changes: 4 additions & 0 deletions test/pytests/test_sqlcompleter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,8 @@ def test_get_completions_favorite_query_template_keys(monkeypatch) -> None:

blank_text = '/f report '
blank = list(completer.get_completions(Document(text=blank_text, cursor_position=len(blank_text)), None))
option_prefix_text = '/f report --'
option_prefix = list(completer.get_completions(Document(text=option_prefix_text, cursor_position=len(option_prefix_text)), None))
partial_text = '/f report --u'
partial = list(completer.get_completions(Document(text=partial_text, cursor_position=len(partial_text)), None))
dashed_text = '/f report --start-'
Expand All @@ -535,6 +537,8 @@ def test_get_completions_favorite_query_template_keys(monkeypatch) -> None:
used_dashed = list(completer.get_completions(Document(text=used_dashed_text, cursor_position=len(used_dashed_text)), None))

assert [completion.text for completion in blank] == ['--range=', '--start-date=', '--start_date=', '--user=']
assert {completion.text for completion in option_prefix} == {'--range=', '--start-date=', '--start_date=', '--user='}
assert {completion.start_position for completion in option_prefix} == {-2}
assert [(completion.text, completion.start_position) for completion in partial] == [('--user=', -3)]
assert [(completion.text, completion.start_position) for completion in dashed] == [('--start-date=', -8)]
assert [completion.text for completion in used] == ['--range=', '--start-date=', '--start_date=']
Expand Down
Loading