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

fix(layouts): various bugs and better errors (#1831)

Browse source 
* fix(layout): error on percent size 0

* fix(command): better error on invalid commands

* fix(layouts): better error on unknown pane nodes

* fix(layouts): disallow certain template names

* style(fmt): rustfmt
This commit is contained in:
Aram Drevekenin 2022-10-20 20:16:46 +02:00 • committed by GitHub
parent ebc4222d6a
commit e62bb93df3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zellij-server/src/os_input_output.rs
View file

@ -104,12 +104,13 @@ fn command_exists(cmd: &RunCommand) -> bool {
let command = &cmd.command;
match cmd.cwd.as_ref() {
Some(cwd) => {
if cwd.join(&command).exists() {
let full_command = cwd.join(&command);
if full_command.exists() && full_command.is_file() {
return true;
}
},
None => {
if command.exists() {
if command.exists() && command.is_file() {
return true;
}
},
@ -117,7 +118,8 @@ fn command_exists(cmd: &RunCommand) -> bool {
if let Some(paths) = env::var_os("PATH") {
for path in env::split_paths(&paths) {
if path.join(command).exists() {
let full_command = path.join(command);
if full_command.exists() && full_command.is_file() {
return true;
}
}

6
zellij-utils/src/input/layout.rs
View file

@ -575,7 +575,11 @@ impl FromStr for SplitSize {
if s.chars().last() == Some('%') {
let char_count = s.chars().count();
let percent_size = usize::from_str_radix(&s[..char_count.saturating_sub(1)], 10)?;
Ok(SplitSize::Percent(percent_size))
if percent_size > 0 && percent_size <= 100 {
Ok(SplitSize::Percent(percent_size))
} else {
Err("Percent must be between 0 and 100".into())
}
} else {
let fixed_size = usize::from_str_radix(s, 10)?;
Ok(SplitSize::Fixed(fixed_size))

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

@ -97,6 +97,38 @@ impl<'a> KdlLayoutParser<'a> {
Ok(())
}
}
fn assert_legal_template_name(
&self,
name: &str,
kdl_node: &KdlNode,
) -> Result<(), ConfigError> {
if name.is_empty() {
Err(ConfigError::new_kdl_error(
format!("Template names cannot be empty"),
kdl_node.span().offset(),
kdl_node.span().len(),
))
} else if name.contains(')') || name.contains('(') {
Err(ConfigError::new_kdl_error(
format!("Template names cannot contain parantheses"),
kdl_node.span().offset(),
kdl_node.span().len(),
))
} else if name
.chars()
.next()
.map(|first_char| first_char.is_numeric())
.unwrap_or(false)
{
Err(ConfigError::new_kdl_error(
format!("Template names cannot start with numbers"),
kdl_node.span().offset(),
kdl_node.span().len(),
))
} else {
Ok(())
}
}
fn parse_split_size(&self, kdl_node: &KdlNode) -> Result<Option<SplitSize>, ConfigError> {
if let Some(size) = kdl_get_string_property_or_child_value!(kdl_node, "size") {
match SplitSize::from_str(size) {
@ -404,6 +436,7 @@ impl<'a> KdlLayoutParser<'a> {
kdl_node.span().len(),
))?;
self.assert_legal_node_name(&template_name, kdl_node)?;
self.assert_legal_template_name(&template_name, kdl_node)?;
let borderless = kdl_get_bool_property_or_child_value_with_error!(kdl_node, "borderless");
let focus = kdl_get_bool_property_or_child_value_with_error!(kdl_node, "focus");
let split_size = self.parse_split_size(kdl_node)?;
@ -731,6 +764,7 @@ impl<'a> KdlLayoutParser<'a> {
kdl_node.span().len(),
))?;
self.assert_legal_node_name(&template_name, kdl_node)?;
self.assert_legal_template_name(&template_name, kdl_node)?;
if self.tab_templates.contains_key(&template_name) {
return Err(ConfigError::new_kdl_error(
format!(
@ -854,6 +888,10 @@ impl<'a> KdlLayoutParser<'a> {
dependency_tree.insert(template_name, template_children);
}
}
let all_pane_template_names: HashSet<&str> = dependency_tree.keys().cloned().collect();
for (_pane_template_name, dependencies) in dependency_tree.iter_mut() {
dependencies.retain(|d| all_pane_template_names.contains(d));
}
Ok(dependency_tree)
}
fn get_pane_template_dependencies(