command-scoped completions (nushell 0.108.0)

Author: chklauser

clap_complete_nushell/src/dynamic.rs

@@ -56,45 +56,24 @@ do {{
 fn write_completion_script(
     var: &str,
     name: &str,
-    bin: &str,
+    _bin: &str,
     completer: &str,
     buf: &mut dyn Write,
 ) -> Result<(), Error> {
     writeln!(
         buf,
         r#"
-# Determines whether the completer for {name} is supposed to handle the command line
-def handles [
-    spans: list # The spans that were passed to the external completer closure
-]: nothing -> bool {{
-    ($spans | get --optional 0) == r#'{bin}'#
-}}
-
 # Performs the completion for {name}
-def complete [
-    spans: list # The spans that were passed to the external completer closure
+def {name}-completer [
+    spans: list<string> # The spans that were passed to the external completer closure
 ]: nothing -> list {{
     {var}=nushell ^r#'{completer}'# -- ...$spans | from json
 }}
 
-# Installs this module as an external completer for {name} globally.
-#
-# For commands other {name}, it will fall back to whatever external completer
-# was defined previously (if any).
-$env.config = $env.config
-  | upsert completions.external.enable true
-  | upsert completions.external.completer {{ |original_config|
-      let previous_completer = $original_config
-        | get --optional completions.external.completer
-        | default {{ |spans| null }}
-      {{ |spans|
-        if (handles $spans) {{
-            complete $spans
-        }} else {{
-            do $previous_completer $spans
-        }}
-      }}
-  }}
+@complete {name}-completer
+def --wrapped {name} [...args] {{
+  ^r#'{completer}'# ...$args
+}}
 "#
     )
 }