From 9f633b84118ea447c54d12d218dcb638c75f586b Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 22 Dec 2022 16:33:20 -0500
Subject: [PATCH] Fix OnPlatform-like extensions with a single input parameter

---
 .../AvaloniaXamlIlOptionMarkupExtensionTransformer.cs           | 1 +
 .../MarkupExtensions/OptionsMarkupExtensionTests.cs             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlOptionMarkupExtensionTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlOptionMarkupExtensionTransformer.cs
index 5004e594f7..13de455b96 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlOptionMarkupExtensionTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlOptionMarkupExtensionTransformer.cs
@@ -366,6 +366,7 @@ internal class AvaloniaXamlIlOptionMarkupExtensionTransformer : IXamlAstTransfor
             foreach (var branch in ExtensionNodeContainer.Branches)
             {
                 var next = codeGen.DefineLabel();
+                codeGen.Emit(OpCodes.Nop);
                 if (branch.HasContext)
                 {
                     codeGen.Ldloc(context.ContextLocal);
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OptionsMarkupExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OptionsMarkupExtensionTests.cs
index 2d1f961743..0c67f385e1 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OptionsMarkupExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/OptionsMarkupExtensionTests.cs
@@ -434,7 +434,7 @@ public class OptionsMarkupExtensionTests : XamlTestBase
 <TextBlock xmlns='https://github.com/avaloniaui'
            xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.MarkupExtensions;assembly=Avalonia.Markup.Xaml.UnitTests'
            xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-           Text='{local:OptionsMarkupExtensionNoServiceProvider OptionB=""Im Option 2""}' />";
+           Text='{local:OptionsMarkupExtensionNoServiceProvider OptionB=""Im Option 2"", OptionA=""Im Option 1""}' />";
 
         var textBlock = (TextBlock)AvaloniaRuntimeXamlLoader.Load(xaml);