pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(layouts): error on mixed nodes (#1791)

Browse source 
* fix(layouts): error on mixed nodes

* style(fmt): rustfmt

* style(clippy): make clippy happy
This commit is contained in:
Aram Drevekenin 2022-10-12 13:03:21 +02:00 • committed by GitHub
parent 694afd2239
commit a13aacf583
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
zellij-utils/src/kdl/kdl_layout_parser.rs
View file

@ -212,6 +212,7 @@ impl<'a> KdlLayoutParser<'a> {
Some(children) => self.parse_child_pane_nodes_for_pane(&children)?,
None => (None, vec![]),
};
self.assert_no_mixed_children_and_properties(kdl_node)?;
Ok(PaneLayout {
borderless: borderless.unwrap_or_default(),
focus,
@ -304,6 +305,7 @@ impl<'a> KdlLayoutParser<'a> {
Some(children) => self.parse_child_pane_nodes_for_pane(&children)?,
None => (None, vec![]),
};
self.assert_no_mixed_children_and_properties(kdl_node)?;
self.pane_templates.insert(
template_name,
(
@ -414,6 +416,25 @@ impl<'a> KdlLayoutParser<'a> {
}
Ok((external_children_index, nodes))
}
fn has_child_panes_tabs_or_templates(&self, kdl_node: &KdlNode) -> bool {
if let Some(children) = kdl_children_nodes!(kdl_node) {
for child in children {
let child_node_name = kdl_name!(child);
if child_node_name == "pane"
|| child_node_name == "children"
|| child_node_name == "tab"
|| child_node_name == "children"
{
return true;
} else if let Some((_pane_template, _pane_template_kdl_node)) =
self.pane_templates.get(child_node_name).cloned()
{
return true;
}
}
}
false
}
fn assert_one_children_block(
&self,
layout: &PaneLayout,
@ -465,6 +486,42 @@ impl<'a> KdlLayoutParser<'a> {
}
Ok(())
}
fn assert_no_mixed_children_and_properties(
&self,
kdl_node: &KdlNode,
) -> Result<(), ConfigError> {
let has_borderless_prop =
kdl_get_bool_property_or_child_value_with_error!(kdl_node, "borderless").is_some();
let has_focus_prop =
kdl_get_bool_property_or_child_value_with_error!(kdl_node, "focus").is_some();
let has_run_prop = self.parse_command_or_plugin_block(kdl_node)?.is_some();
let has_nested_nodes_or_children_block = self.has_child_panes_tabs_or_templates(kdl_node);
if has_nested_nodes_or_children_block
&& (has_borderless_prop || has_focus_prop || has_run_prop)
{
let mut offending_nodes = vec![];
if has_borderless_prop {
offending_nodes.push("borderless");
}
if has_focus_prop {
offending_nodes.push("focus");
}
if has_run_prop {
offending_nodes.push("command/plugin");
}
Err(ConfigError::new_kdl_error(
format!(
"Cannot have both properties ({}) and nested children",
offending_nodes.join(", ")
),
kdl_node.span().offset(),
kdl_node.span().len(),
))
} else {
Ok(())
}
}
fn insert_layout_children_or_error(
&self,
layout: &mut PaneLayout,