From 31cf444021cae42c4a02adb9f1f9d61830a92a6a Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sun, 28 Jul 2019 23:24:13 -0700 Subject: [PATCH] Fix chain building. --- .../Avalonia.Markup/Markup/Parsers/ExpressionParser.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs index 44dc9704a6..0eb28c2aa6 100644 --- a/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs +++ b/src/Markup/Avalonia.Markup/Markup/Parsers/ExpressionParser.cs @@ -26,6 +26,7 @@ namespace Avalonia.Markup.Parsers public (ExpressionNode Node, SourceMode Mode) Parse(ref CharacterReader r) { + ExpressionNode rootNode = null; ExpressionNode node = null; var (astNodes, mode) = BindingExpressionGrammar.Parse(ref r); @@ -62,9 +63,9 @@ namespace Avalonia.Markup.Parsers nextNode = new ElementNameNode(_nameScope, elementName.Name); break; } - if (node is null) + if (rootNode is null) { - node = nextNode; + rootNode = node = nextNode; } else { @@ -73,7 +74,7 @@ namespace Avalonia.Markup.Parsers } } - return (node, mode); + return (rootNode, mode); } private FindAncestorNode ParseFindAncestor(BindingExpressionGrammar.AncestorNode node)