From 08da6f79c7a4fee9212ef82d8c6c8095fc7644ce Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 16 Jul 2022 21:16:45 -0500
Subject: [PATCH] Fix referencing template by ID

---
 blueprintcompiler/language/gtkbuilder_template.py | 6 +++---
 tests/samples/template.blp                        | 4 ++++
 tests/samples/template.ui                         | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index ffee11c..6ab6c5a 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -26,7 +26,7 @@ from .types import ClassName
 class Template(Object):
     grammar = [
         "template",
-        UseIdent("name").expected("template class name"),
+        UseIdent("id").expected("template class name"),
         Optional([
             Match(":"),
             to_parse_node(ClassName).expected("parent class"),
@@ -40,7 +40,7 @@ class Template(Object):
         if len(self.children[ClassName]):
             return self.children[ClassName][0].gir_type
 
-    @validate("name")
+    @validate("id")
     def unique_in_parent(self):
         self.validate_unique_in_parent(f"Only one template may be defined per file, but this file contains {len(self.parent.children[Template])}",)
 
@@ -52,7 +52,7 @@ class Template(Object):
 
         xml.start_tag(
             "template",
-            **{"class": self.tokens["name"]},
+            **{"class": self.tokens["id"]},
             parent=parent
         )
 
diff --git a/tests/samples/template.blp b/tests/samples/template.blp
index 570dca7..7773e25 100644
--- a/tests/samples/template.blp
+++ b/tests/samples/template.blp
@@ -4,3 +4,7 @@ template TestTemplate : ApplicationWindow {
   test-property: "Hello, world";
   test-signal => on_test_signal();
 }
+
+Dialog {
+  transient-for: TestTemplate;
+}
\ No newline at end of file
diff --git a/tests/samples/template.ui b/tests/samples/template.ui
index 095fbd8..aebec5e 100644
--- a/tests/samples/template.ui
+++ b/tests/samples/template.ui
@@ -5,4 +5,7 @@
     <property name="test-property">Hello, world</property>
     <signal name="test-signal" handler="on_test_signal"/>
   </template>
+  <object class="GtkDialog">
+    <property name="transient-for">TestTemplate</property>
+  </object>
 </interface>