Skip to content

Commit

Permalink
Don't require hyphen as node name in kdl flags
Browse files Browse the repository at this point in the history
  • Loading branch information
ysthakur committed Jan 14, 2024
1 parent a5b9d86 commit 5fd02b2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ clap = { version = "4.3", features = ["derive", "env"] }
env_logger = "0.10"
indoc = "2"
log = "0.4"
miette = "5.10"
miette = { version = "5.10", features = ["fancy"] }
regex = "1.9"
thiserror = "1.0"

Expand All @@ -37,7 +37,6 @@ serde_yaml = "0.9"
[dev-dependencies]
assert_cmd = "2.0"
insta = "1"
miette = { version = "5.10", features = ["fancy"] }
pretty_assertions = "1"
tempfile = "3"

Expand Down
11 changes: 5 additions & 6 deletions src/gen/kdl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@ pub fn to_kdl_node(cmd: &CommandInfo) -> KdlNode {
let mut flag_nodes = KdlDocument::new();

for flag in &cmd.flags {
let mut flag_node = KdlNode::new("-");
let mut form_iter = flag.forms.iter();
let mut flag_node = KdlNode::new(form_iter.next().unwrap().as_str());

for form in &flag.forms {
flag_node
.entries_mut()
.push(KdlEntry::new(form.to_string()));
for form in form_iter {
flag_node.entries_mut().push(KdlEntry::new(form.as_str()));
}

if let Some(desc) = &flag.desc {
let mut description_node = KdlNode::new("desc");
description_node
.entries_mut()
.push(KdlEntry::new(desc.to_string()));
.push(KdlEntry::new(desc.as_str()));

let mut flag_children = KdlDocument::new();
flag_children.nodes_mut().push(description_node);
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ enum Commands {
/// File to generate completions from
conf: PathBuf,

/// File to generate completions to. Outputted to stdout if not given.
/// Folder to generate completions to. Outputted to stdout if not given.
out: Option<PathBuf>,
},
}
Expand Down

0 comments on commit 5fd02b2

Please sign in to comment.