From f93d5d2acd53365f70e48a0002e91e94be37f733 Mon Sep 17 00:00:00 2001
From: Tom Greig <tom@tomg.xyz>
Date: Fri, 28 Mar 2025 20:26:19 +0000
Subject: [PATCH 1/2]  Handle nested CDATA from nested templates

When putting CDATA into the output, any instances of ']]>' in the text
are replaced with ']]]]><![CDATA[>'.  This allows nested templates, e.g.
from list views inside list views to work properly.
---
 blueprintcompiler/outputs/xml/xml_emitter.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blueprintcompiler/outputs/xml/xml_emitter.py b/blueprintcompiler/outputs/xml/xml_emitter.py
index ea91e03..d34eff4 100644
--- a/blueprintcompiler/outputs/xml/xml_emitter.py
+++ b/blueprintcompiler/outputs/xml/xml_emitter.py
@@ -73,6 +73,7 @@ class XmlEmitter:
         self._needs_newline = False
 
     def put_cdata(self, text: str):
+        text = text.replace("]]>", "]]]]><![CDATA[>")
         self.result += f"<![CDATA[{text}]]>"
         self._needs_newline = False
 

From cc09f3d3bb8e6f273072c1b4727929bf7b0bad83 Mon Sep 17 00:00:00 2001
From: Tom Greig <tom@tomg.xyz>
Date: Sun, 30 Mar 2025 10:27:11 +0100
Subject: [PATCH 2/2] Add tests for nested templates

Basically just a copy of the list_factory test, but with an extra copy
of the list factory inside it.
---
 tests/samples/list_factory_nested.blp     | 17 +++++++++
 tests/samples/list_factory_nested.ui      | 44 +++++++++++++++++++++++
 tests/samples/list_factory_nested_dec.blp | 18 ++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 tests/samples/list_factory_nested.blp
 create mode 100644 tests/samples/list_factory_nested.ui
 create mode 100644 tests/samples/list_factory_nested_dec.blp

diff --git a/tests/samples/list_factory_nested.blp b/tests/samples/list_factory_nested.blp
new file mode 100644
index 0000000..86a59b3
--- /dev/null
+++ b/tests/samples/list_factory_nested.blp
@@ -0,0 +1,17 @@
+using Gtk 4.0;
+
+Gtk.ListView {
+  factory: Gtk.BuilderListItemFactory list_item_factory {
+    template ListItem {
+      child: Gtk.ListView {
+        factory: Gtk.BuilderListItemFactory list_item_factory {
+          template ListItem {
+            child: Gtk.Label {
+              label: bind template.item as <$MyObject>.name;
+            };
+          }
+        };
+      };
+    }
+  };
+}
diff --git a/tests/samples/list_factory_nested.ui b/tests/samples/list_factory_nested.ui
new file mode 100644
index 0000000..44cdb2b
--- /dev/null
+++ b/tests/samples/list_factory_nested.ui
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT EDIT!
+This file was @generated by blueprint-compiler. Instead, edit the
+corresponding .blp file and regenerate this file with blueprint-compiler.
+-->
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkListView">
+    <property name="factory">
+      <object class="GtkBuilderListItemFactory" id="list_item_factory">
+        <property name="bytes"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkListView">
+        <property name="factory">
+          <object class="GtkBuilderListItemFactory" id="list_item_factory">
+            <property name="bytes"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkLabel">
+        <binding name="label">
+          <lookup name="name" type="MyObject">
+            <lookup name="item" type="GtkListItem">
+              <constant>GtkListItem</constant>
+            </lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>]]]]><![CDATA[></property>
+          </object>
+        </property>
+      </object>
+    </property>
+  </template>
+</interface>]]></property>
+      </object>
+    </property>
+  </object>
+</interface>
diff --git a/tests/samples/list_factory_nested_dec.blp b/tests/samples/list_factory_nested_dec.blp
new file mode 100644
index 0000000..755491c
--- /dev/null
+++ b/tests/samples/list_factory_nested_dec.blp
@@ -0,0 +1,18 @@
+using Gtk 4.0;
+
+ListView {
+  factory: BuilderListItemFactory list_item_factory {
+    template ListItem {
+      child: ListView {
+        factory: BuilderListItemFactory list_item_factory {
+          template ListItem {
+            child: Label {
+              label: bind template.item as <$MyObject>.name;
+            };
+          }
+        };
+      };
+    }
+  };
+}
+