first cut at getting powershell working #156

Author: bckohan

django_typer/management/commands/shellcompletion.py

@@ -180,6 +180,7 @@ def source_vars(self) -> t.Dict[str, t.Any]:
             if self.command.fallback
             else "",
             "is_installed": not isinstance(self.command.manage_script, Path),
+            "shell": self.name,
         }
 
     def load_template(self) -> t.Union[BaseTemplate, DjangoTemplate]:

django_typer/management/commands/shells/powershell.py

@@ -42,6 +42,7 @@ def get_user_profile(self) -> Path:
 
     def install(self) -> Path:
         assert self.prog_name
+        self.uninstall()
         self.set_execution_policy()
         profile = self.get_user_profile()
         profile.parent.mkdir(parents=True, exist_ok=True)
@@ -55,6 +56,8 @@ def uninstall(self):
         assert self.prog_name
         self.set_execution_policy()
         profile = self.get_user_profile()
+        if not profile.exists():
+            return
         edited_lines = []
         mark = None
         with open(profile, "rt", encoding="utf-8") as pwr_sh:
@@ -65,7 +68,7 @@ def uninstall(self):
                 elif (
                     mark is not None
                     and line.startswith("Register-ArgumentCompleter")
-                    and f" {self.prog_name} " in line
+                    and f" {self.command.manage_script_name} " in line
                 ):
                     edited_lines = edited_lines[:mark]
                     mark = None

django_typer/templates/shell_complete/powershell.ps1

@@ -2,18 +2,30 @@ Import-Module PSReadLine
 Set-PSReadLineKeyHandler -Chord Tab -Function MenuComplete
 $scriptblock = {
     param($wordToComplete, $commandAst, $cursorPosition)
-    $Env:%(autocomplete_var)s = "complete_powershell"
-    $Env:_TYPER_COMPLETE_ARGS = $commandAst.ToString()
-    $Env:_TYPER_COMPLETE_WORD_TO_COMPLETE = $wordToComplete
-    {{ manage_script }} {{ django_command }} {{ color }} complete | ForEach-Object {
+    
+    $commandText = $commandAst.Extent.Text
+
+    # trailing white space is lopped off, add it back if necessary
+    if ($cursorPosition -gt $commandText.Length) {
+        $commandText += " "
+    }
+
+    $settingsOption = ""
+    if ($commandText -match "--settings(?:\s+|=)([^\s]+)\s+") {
+        $settingsOption = "--settings=$($matches[1])"
+    }
+
+    $pythonPathOption = ""
+    if ($commandText -match "--pythonpath(?:\s+|=)([^\s]+)\s+") {
+        $pythonPathOption = "--pythonpath=$($matches[1])"
+    }
+
+    {{ manage_script_name }} {{ django_command }} $settingsOption $pythonPathOption --shell {{ shell }} {{ color }} complete "$($commandText)" | ForEach-Object {
         $commandArray = $_ -Split ":::"
         $command = $commandArray[0]
         $helpString = $commandArray[1]
         [System.Management.Automation.CompletionResult]::new(
             $command, $command, 'ParameterValue', $helpString)
     }
-    $Env:%(autocomplete_var)s = ""
-    $Env:_TYPER_COMPLETE_ARGS = ""
-    $Env:_TYPER_COMPLETE_WORD_TO_COMPLETE = ""
 }
-Register-ArgumentCompleter -Native -CommandName %(prog_name)s -ScriptBlock $scriptblock
+Register-ArgumentCompleter -Native -CommandName {{ manage_script_name }} -ScriptBlock $scriptblock