From a75adc7d1bc7780c7f4c31045a5955f365fa108d Mon Sep 17 00:00:00 2001
From: jgcodes2020 <j349guo@uwaterloo.ca>
Date: Sat, 14 Dec 2024 14:00:09 -0500
Subject: [PATCH] add variant support for menus

---
 blueprintcompiler/language/gtk_menu.py    | 12 ++++++++----
 blueprintcompiler/language/values.py      |  6 ++++--
 blueprintcompiler/outputs/xml/__init__.py | 24 ++++++++++++++++-------
 variant-test.blp                          | 10 ++++++++++
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index c7ef5f2..9e76d61 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -19,7 +19,7 @@
 
 import typing as T
 
-from blueprintcompiler.language.values import StringValue
+from blueprintcompiler.language.values import StringValue, VariantValue
 
 from .common import *
 from .contexts import ValueTypeCtx
@@ -98,8 +98,12 @@ class MenuAttribute(AstNode):
         return self.tokens["name"]
 
     @property
-    def value(self) -> StringValue:
-        return self.children[StringValue][0]
+    def value(self) -> StringValue | VariantValue:
+        if len(self.children[StringValue]) > 0:
+            return self.children[StringValue][0]
+        elif len(self.children[VariantValue]) > 0:
+            return self.children[VariantValue][0]
+        raise CompilerBugError()
 
     @property
     def document_symbol(self) -> DocumentSymbol:
@@ -133,7 +137,7 @@ menu_attribute = Group(
     [
         UseIdent("name"),
         ":",
-        Err(StringValue, "Expected string or translated string"),
+        Err(AnyOf(StringValue, VariantValue), "Expected string or translated string"),
         Match(";").expected(),
     ],
 )
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 9b8eb18..41a4c5e 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -393,7 +393,9 @@ class VariantValue(AstNode):
     @validate()
     def validate_for_type(self) -> None:
         expected_type = self.context[ValueTypeCtx].value_type
-        if (
+        if expected_type is None:
+            pass
+        elif (
             isinstance(expected_type, gir.IntType)
             or isinstance(expected_type, gir.UIntType)
             or isinstance(expected_type, gir.FloatType)
@@ -402,7 +404,7 @@ class VariantValue(AstNode):
             raise CompileError(f"Cannot convert variant to number")
         elif isinstance(expected_type, gir.StringType):
             raise CompileError("Cannot convert variant to string")
-        if isinstance(expected_type, gir.Boxed) and expected_type.full_name == "GLib.Variant":
+        elif isinstance(expected_type, gir.Boxed) and expected_type.full_name == "GLib.Variant":
             pass
         else:
             raise CompileError(f"Cannot convert variant into {expected_type.full_name}")
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index c3735eb..4faeaff 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -85,13 +85,23 @@ class XmlOutput(OutputFormat):
             if isinstance(child, Menu):
                 self._emit_menu(child, xml)
             elif isinstance(child, MenuAttribute):
-                xml.start_tag(
-                    "attribute",
-                    name=child.name,
-                    **self._translated_string_attrs(child.value.child),
-                )
-                xml.put_text(child.value.string)
-                xml.end_tag()
+                if isinstance(child.value, StringValue):
+                    xml.start_tag(
+                        "attribute",
+                        name=child.name,
+                        **self._translated_string_attrs(child.value.child),
+                    )
+                    xml.put_text(child.value.string)
+                    xml.end_tag()
+                elif isinstance(child.value, VariantValue):
+                    xml.start_tag(
+                        "attribute",
+                        name=child.name,
+                        type=child.value.var_type,
+                    )
+                    xml.put_text(child.value.var_value)
+                    xml.end_tag()
+
             else:
                 raise CompilerBugError()
         xml.end_tag()
diff --git a/variant-test.blp b/variant-test.blp
index 52a397d..f69522f 100644
--- a/variant-test.blp
+++ b/variant-test.blp
@@ -1,5 +1,15 @@
 using Gtk 4.0;
 
+menu root {
+  submenu {
+    name: "one";
+    item {
+      action: "app.foo_bar";
+      target: variant<"s">("\"one\"");
+    }
+  }
+}
+
 Button {
   action-name: "app.shave_yak";
   action-target: variant<"y">("8");