Skip to content

fix: resolve block parameters named like context variables #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jsneedles wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve block parameters named like context variables #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions source/Handlebars.Test/BasicIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,21 @@ public void DictionaryEnumeratorWithBlockParams(IHandlebars handlebars)
Assert.Equal("hello foo world bar ", result);
}

[Theory, ClassData(typeof(HandlebarsEnvGenerator))]
public void BlockParamsNamedLikeContextVariables(IHandlebars handlebars)
{
// Block params sharing a name with @-variables used to be looked up by the @-variable's slot in a
// different dictionary, so whether they resolved depended on the process's string hash seed.
var data = new { items = new List<string> { "a", "b" } };

foreach (var name in new[] { "index", "key", "first", "last", "root", "parent" })
{
var template = handlebars.Compile($"{{{{#each items as |item {name}|}}}}{{{{{name}}}}}:{{{{item}}}};{{{{/each}}}}");

Assert.Equal("0:a;1:b;", template(data));
}
}

[Theory, ClassData(typeof(HandlebarsEnvGenerator))]
public void DictionaryWithLastEnumerator(IHandlebars handlebars)
{
Expand Down
11 changes: 3 additions & 8 deletions source/Handlebars/BindingContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,9 @@ out WellKnownVariables[(int) WellKnownVariable.Parent]

internal bool TryGetVariable(ChainSegment segment, [MaybeNullWhen(false)] out object value)
{
if (segment.WellKnownVariable != WellKnownVariable.None)
{
var wellKnownVariable = WellKnownVariables[(int) segment.WellKnownVariable];
return BlockParamsObject.TryGetValue(wellKnownVariable, out value)
|| (Descriptor.Value.MemberAccessor?.TryGetValue(Value!, segment, out value) ?? false);
}

return BlockParamsObject.TryGetValue(segment, out value)
// Block params are looked up by segment even for well-known names (e.g. `as |item index|`):
// WellKnownVariables holds entry indexes into ContextDataObject, not BlockParamsObject.
return BlockParamsObject.TryGetValue(segment, out value)
|| (Descriptor.Value.MemberAccessor?.TryGetValue(Value!, segment, out value) ?? false);
}

Expand Down
Loading