fix: added completes to string output (#186)

jdx · Dec 9, 2024 · cb94d3d · cb94d3d
1 parent d29ec77
commit cb94d3d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/lib/src/complete/snapshots/usage__complete__bash__tests__complete_bash-3.snap b/lib/src/complete/snapshots/usage__complete__bash__tests__complete_bash-3.snap
@@ -33,6 +33,7 @@ arg "[arg2]" help="arg2 description" default="default value" {
 arg "<arg3>" help="arg3 description" help_long="arg3 long description"
 arg "<argrest>..." var=true
 arg "[with-default]" default="default value"
+complete "plugin" run="echo \"plugin-1\nplugin-2\nplugin-3\""
 cmd "plugin" {
     cmd "install" {
         flag "-g --global"

diff --git a/lib/src/complete/snapshots/usage__complete__fish__tests__complete_fish-3.snap b/lib/src/complete/snapshots/usage__complete__fish__tests__complete_fish-3.snap
@@ -32,6 +32,7 @@ arg "[arg2]" help="arg2 description" default="default value" {
 arg "<arg3>" help="arg3 description" help_long="arg3 long description"
 arg "<argrest>..." var=true
 arg "[with-default]" default="default value"
+complete "plugin" run="echo \"plugin-1\nplugin-2\nplugin-3\""
 cmd "plugin" {
     cmd "install" {
         flag "-g --global"

diff --git a/lib/src/complete/snapshots/usage__complete__zsh__tests__complete_zsh-3.snap b/lib/src/complete/snapshots/usage__complete__zsh__tests__complete_zsh-3.snap
@@ -38,6 +38,7 @@ arg "[arg2]" help="arg2 description" default="default value" {
 arg "<arg3>" help="arg3 description" help_long="arg3 long description"
 arg "<argrest>..." var=true
 arg "[with-default]" default="default value"
+complete "plugin" run="echo \"plugin-1\nplugin-2\nplugin-3\""
 cmd "plugin" {
     cmd "install" {
         flag "-g --global"

diff --git a/lib/src/spec/complete.rs b/lib/src/spec/complete.rs
@@ -1,3 +1,4 @@
+use kdl::{KdlEntry, KdlNode};
 use serde::{Deserialize, Serialize};
 
 use crate::error::UsageErr;
@@ -38,3 +39,17 @@ impl SpecComplete {
         Ok(config)
     }
 }
+
+impl From<&SpecComplete> for KdlNode {
+    fn from(complete: &SpecComplete) -> Self {
+        let mut node = KdlNode::new("complete");
+        node.push(KdlEntry::new(complete.name.clone()));
+        if let Some(run) = &complete.run {
+            node.push(KdlEntry::new_prop("run", run.clone()));
+        }
+        if let Some(type_) = &complete.type_ {
+            node.push(KdlEntry::new_prop("type", type_.clone()));
+        }
+        node
+    }
+}
diff --git a/lib/src/spec/mod.rs b/lib/src/spec/mod.rs
@@ -90,6 +90,7 @@ impl Spec {
             && self.usage.is_empty()
             && self.cmd.is_empty()
             && self.config.is_empty()
+            && self.complete.is_empty()
     }
 
     pub(crate) fn parse(ctx: &ParsingContext, input: &str) -> Result<Spec, UsageErr> {
@@ -342,6 +343,9 @@ impl Display for Spec {
         for arg in self.cmd.args.iter() {
             nodes.push(arg.into());
         }
+        for complete in self.complete.values() {
+            nodes.push(complete.into());
+        }
         for cmd in self.cmd.subcommands.values() {
             nodes.push(cmd.into())
         }
@@ -406,6 +410,7 @@ cmd "config" {
     arg "value"
   }
 }
+complete "file" run="ls"
         "#,
         )
         .unwrap();
@@ -414,6 +419,7 @@ cmd "config" {
         bin "usage"
         flag "-f --force" global=true
         arg "<arg1>"
+        complete "file" run="ls"
         cmd "config" {
             cmd "set" {
                 arg "<key>" help="Key to set"