shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle _ and - args interchangably

Browse Source
This commit is contained in:
ConnorSkees 2020-03-31 01:22:41 -04:00
parent 5bbf070b95
commit 75b896fe3d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/args.rs
View File

@ -77,7 +77,7 @@ pub(crate) fn eat_func_args<I: Iterator<Item = Token>>(
',' => { ',' => {
toks.next(); toks.next();
args.push(FuncArg { args.push(FuncArg {
name, name: name.replace('_', "-"),
default: Some(Value::from_tokens( default: Some(Value::from_tokens(
&mut default.into_iter().peekable(), &mut default.into_iter().peekable(),
scope, scope,
@ -88,7 +88,7 @@ pub(crate) fn eat_func_args<I: Iterator<Item = Token>>(
} }
')' => { ')' => {
args.push(FuncArg { args.push(FuncArg {
name, name: name.replace('_', "-"),
default: Some(Value::from_tokens( default: Some(Value::from_tokens(
&mut default.into_iter().peekable(), &mut default.into_iter().peekable(),
scope, scope,
@ -107,7 +107,7 @@ pub(crate) fn eat_func_args<I: Iterator<Item = Token>>(
'.' => todo!("handle varargs"), '.' => todo!("handle varargs"),
')' => { ')' => {
args.push(FuncArg { args.push(FuncArg {
name, name: name.replace('_', "-"),
default: if default.is_empty() { default: if default.is_empty() {
None None
} else { } else {
@ -121,7 +121,7 @@ pub(crate) fn eat_func_args<I: Iterator<Item = Token>>(
break; break;
} }
',' => args.push(FuncArg { ',' => args.push(FuncArg {
name, name: name.replace('_', "-"),
default: None, default: None,
}), }),
_ => {} _ => {}

7
tests/mixins.rs
View File

@ -190,7 +190,12 @@ test!(
"a {\n color: red;\n}\n" "a {\n color: red;\n}\n"
); );
test!( test!(
args_interchangable_hypen_underscore, args_hyphen_arg_allows_underscore,
"@mixin foo($a-b) {\n color: $a-b;\n color: $a_b;\n}\na {\n @include foo($a_b: a);\n @include foo($a-b: a);\n}\n", "@mixin foo($a-b) {\n color: $a-b;\n color: $a_b;\n}\na {\n @include foo($a_b: a);\n @include foo($a-b: a);\n}\n",
"a {\n color: a;\n color: a;\n color: a;\n color: a;\n}\n" "a {\n color: a;\n color: a;\n color: a;\n color: a;\n}\n"
); );
test!(
args_underscore_arg_allows_hyphen,
"@mixin foo($a_b) {\n color: $a-b;\n color: $a_b;\n}\na {\n @include foo($a_b: a);\n @include foo($a-b: a);\n}\n",
"a {\n color: a;\n color: a;\n color: a;\n color: a;\n}\n"
);