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

fix(diag): Add span to default values of custom widgets

Browse source
This commit is contained in:
elkowar 2021-08-21 16:59:59 +02:00
parent c380313ba7
commit 77055b80e7
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/eww/src/widgets/widget_node.rs
View file

@ -2,7 +2,7 @@ use crate::eww_state::EwwState;
use anyhow::*; use anyhow::*;
use dyn_clone; use dyn_clone;
use eww_shared_util::{AttrName, Span, Spanned, VarName}; use eww_shared_util::{AttrName, Span, Spanned, VarName};
use simplexpr::{dynval::DynVal, SimplExpr}; use simplexpr::SimplExpr;
use std::collections::HashMap; use std::collections::HashMap;
use yuck::{ use yuck::{
config::{validate::ValidationError, widget_definition::WidgetDefinition, widget_use::WidgetUse}, config::{validate::ValidationError, widget_definition::WidgetDefinition, widget_use::WidgetUse},
@ -123,10 +123,11 @@ pub fn generate_generic_widget_node(
.map(|(name, value)| Ok((VarName(name.0), value.value.as_simplexpr()?.resolve_one_level(local_env)))) .map(|(name, value)| Ok((VarName(name.0), value.value.as_simplexpr()?.resolve_one_level(local_env))))
.collect::<AstResult<HashMap<VarName, _>>>()?; .collect::<AstResult<HashMap<VarName, _>>>()?;
// handle default value for optional arguments
for expected in def.expected_args.iter().filter(|x| x.optional) { for expected in def.expected_args.iter().filter(|x| x.optional) {
let var_name = VarName(expected.name.clone().0); let var_name = VarName(expected.name.clone().0);
if !new_local_env.contains_key(&var_name) { if !new_local_env.contains_key(&var_name) {
new_local_env.insert(var_name, SimplExpr::Literal(DynVal::from(String::new()))); new_local_env.insert(var_name, SimplExpr::literal(expected.span, String::new()));
} }
} }