Skip to content
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

🐛 Fix PowerShell completion with incomplete word #360

Merged
merged 10 commits into from
Aug 24, 2024
Merged

🐛 Fix PowerShell completion with incomplete word #360

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
192590e
Fixes powershell completion with incomplete word
patricksurry Feb 23, 2022
830db81
Merge branch 'master' into issues359
tiangolo Dec 16, 2022
148e1b2
🎨 [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Dec 16, 2022
4e8ff9d
Merge branch 'master' into issues359
patricksurry Jun 5, 2023
deb796c
Merge branch 'master' into issues359
svlandeg May 21, 2024
4209c5f
Merge branch 'master' into issues359
svlandeg Jul 3, 2024
997b122
Add completion test for powershell
svlandeg Jul 16, 2024
bda183e
Remove unnecessary bits using _TYPER_CURSOR_POSITION
svlandeg Jul 16, 2024
796fd32
Add equivalent test in _an test file
svlandeg Jul 16, 2024
c7d5f1c
Merge branch 'master' into issues359
svlandeg Aug 9, 2024
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
5 changes: 4 additions & 1 deletion typer/_completion_classes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,11 @@ def source_vars(self) -> Dict[str, Any]:
def get_completion_args(self) -> Tuple[List[str], str]:
completion_args = os.getenv("_TYPER_COMPLETE_ARGS", "")
incomplete = os.getenv("_TYPER_COMPLETE_WORD_TO_COMPLETE", "")
cursor = os.getenv("_TYPER_CURSOR_POSITION")
if cursor:
completion_args = completion_args[: int(cursor)]
cwords = click.parser.split_arg_string(completion_args)
args = cwords[1:]
args = cwords[1:-1] if incomplete else cwords[1:]
return args, incomplete

def format_completion(self, item: click.shell_completion.CompletionItem) -> str:
Expand Down
2 changes: 2 additions & 0 deletions typer/_completion_shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class Shells(str, Enum):
$Env:%(autocomplete_var)s = "complete_powershell"
$Env:_TYPER_COMPLETE_ARGS = $commandAst.ToString()
$Env:_TYPER_COMPLETE_WORD_TO_COMPLETE = $wordToComplete
$Env:_TYPER_CURSOR_POSITION = $cursorPosition
%(prog_name)s | ForEach-Object {
$commandArray = $_ -Split ":::"
$command = $commandArray[0]
Expand All @@ -63,6 +64,7 @@ class Shells(str, Enum):
$Env:%(autocomplete_var)s = ""
$Env:_TYPER_COMPLETE_ARGS = ""
$Env:_TYPER_COMPLETE_WORD_TO_COMPLETE = ""
$Env:_TYPER_CURSOR_POSITION = ""
}
Register-ArgumentCompleter -Native -CommandName %(prog_name)s -ScriptBlock $scriptblock
"""
Expand Down
Loading