From 7e4f80523d2471067fc25e7fbd12849d0e46b2ff Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Thu, 21 Mar 2024 20:40:18 +0100
Subject: [PATCH 01/82] Post-release version bump

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 6e19cab..b91fd8c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.12.0',
+  version: '0.12.1',
 )
 
 subdir('docs')

From 729939ad9386ba4c45eb2c9e451473fa0be5a37f Mon Sep 17 00:00:00 2001
From: Dexter Reed <dreed4470@proton.me>
Date: Tue, 26 Mar 2024 18:30:23 +0000
Subject: [PATCH 02/82] docs: Fix misspelt `Doggo`, fix duplicate `Maniatic
 Launcher`

---
 docs/index.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 20e71b6..1837e2a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -93,7 +93,7 @@ Built with Blueprint
 - `Dev Toolbox <https://github.com/aleiepure/devtoolbox>`_
 - `Dialect <https://github.com/dialect-app/dialect>`_
 - `Diccionario de la Lengua <https://codeberg.org/rafaelmardojai/diccionario-lengua>`_
-- `Dogg <https://gitlab.gnome.org/sungsphinx/Doggo>`_
+- `Doggo <https://gitlab.gnome.org/sungsphinx/Doggo>`_
 - `Dosage <https://github.com/diegopvlk/Dosage>`_
 - `Dynamic Wallpaper <https://github.com/dusansimic/dynamic-wallpaper>`_
 - `Extension Manager <https://github.com/mjakeman/extension-manager>`_
@@ -119,7 +119,6 @@ Built with Blueprint
 - `Letterpress <https://gitlab.gnome.org/World/Letterpress>`_
 - `Login Manager Settings <https://github.com/realmazharhussain/gdm-settings>`_
 - `Maniatic Launcher <https://github.com/santiagocezar/maniatic-launcher/>`_
-- `Maniatic Launcher <https://github.com/santiagocezar/maniatic-launcher/>`_
 - `Master Key <https://gitlab.com/guillermop/master-key/>`_
 - `Misson Center <https://github.com/flathub/io.missioncenter.MissionCenter>`_
 - `NewCaw <https://github.com/CodedOre/NewCaw>`_

From 6a078ee075e7ff0818d03234600b166ccb2b50cb Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 6 Apr 2024 14:30:48 -0500
Subject: [PATCH 03/82] Add warning for unused imports

---
 blueprintcompiler/ast_utils.py             |  2 +-
 blueprintcompiler/errors.py                |  4 ++++
 blueprintcompiler/language/common.py       |  1 +
 blueprintcompiler/language/imports.py      | 11 +++++++++++
 blueprintcompiler/language/types.py        |  3 ++-
 blueprintcompiler/language/ui.py           | 17 +++++++++++++++++
 blueprintcompiler/lsp.py                   |  3 +++
 blueprintcompiler/tokenizer.py             |  7 +++++++
 tests/sample_errors/deprecations.blp       |  1 -
 tests/sample_errors/deprecations.err       |  2 +-
 tests/sample_errors/warn_unused_import.blp |  5 +++++
 tests/sample_errors/warn_unused_import.err |  1 +
 tests/samples/parseable.blp                |  1 -
 13 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 tests/sample_errors/warn_unused_import.blp
 create mode 100644 tests/sample_errors/warn_unused_import.err

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index a63729d..c874358 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -125,7 +125,7 @@ class AstNode:
             return self.parent.root
 
     @property
-    def range(self):
+    def range(self) -> Range:
         return Range(self.group.start, self.group.end, self.group.text)
 
     def parent_by_type(self, type: T.Type[TType]) -> TType:
diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index a28c05d..01058fd 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -140,6 +140,10 @@ class DeprecatedWarning(CompileWarning):
     pass
 
 
+class UnusedWarning(CompileWarning):
+    pass
+
+
 class UpgradeWarning(CompileWarning):
     category = "upgrade"
     color = Colors.PURPLE
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index 8a6ce9b..29df47d 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -35,6 +35,7 @@ from ..errors import (
     CompileWarning,
     DeprecatedWarning,
     MultipleErrors,
+    UnusedWarning,
     UpgradeWarning,
 )
 from ..gir import (
diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index e34901c..bf5dddd 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -88,6 +88,17 @@ class Import(AstNode):
     def namespace_exists(self):
         gir.get_namespace(self.tokens["namespace"], self.tokens["version"])
 
+    @validate()
+    def unused(self):
+        if self.namespace not in self.root.used_imports:
+            raise UnusedWarning(
+                f"Unused import: {self.namespace}",
+                self.range,
+                actions=[
+                    CodeAction("Remove import", "", self.range.with_trailing_newline)
+                ],
+            )
+
     @property
     def gir_namespace(self):
         try:
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index b3fb586..fe45c4d 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -78,9 +78,10 @@ class TypeName(AstNode):
             )
 
     @property
-    def gir_ns(self):
+    def gir_ns(self) -> T.Optional[gir.Namespace]:
         if not self.tokens["extern"]:
             return self.root.gir.namespaces.get(self.tokens["namespace"] or "Gtk")
+        return None
 
     @property
     def gir_type(self) -> gir.GirType:
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index 8aaf359..d55a22a 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -27,6 +27,7 @@ from .gtk_menu import Menu, menu
 from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
 from .translation_domain import TranslationDomain
+from .types import TypeName
 
 
 class UI(AstNode):
@@ -121,6 +122,22 @@ class UI(AstNode):
             Range(pos, pos, self.group.text),
         )
 
+    @cached_property
+    def used_imports(self) -> T.Optional[T.Set[str]]:
+        def _iter_recursive(node: AstNode):
+            yield node
+            for child in node.children:
+                if isinstance(child, AstNode):
+                    yield from _iter_recursive(child)
+
+        result = set()
+        for node in _iter_recursive(self):
+            if isinstance(node, TypeName):
+                ns = node.gir_ns
+                if ns is not None:
+                    result.add(ns.name)
+        return result
+
     @context(ScopeCtx)
     def scope_ctx(self) -> ScopeCtx:
         return ScopeCtx(node=self)
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index cdf0c83..903bfb7 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -475,6 +475,9 @@ class LanguageServer:
         if isinstance(err, DeprecationWarning):
             result["tags"] = [DiagnosticTag.Deprecated]
 
+        if isinstance(err, UnusedWarning):
+            result["tags"] = [DiagnosticTag.Unnecessary]
+
         if len(err.references) > 0:
             result["relatedInformation"] = [
                 {
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 6cc0761..85bce95 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -127,6 +127,13 @@ class Range:
     def text(self) -> str:
         return self.original_text[self.start : self.end]
 
+    @property
+    def with_trailing_newline(self) -> "Range":
+        if len(self.original_text) > self.end and self.original_text[self.end] == "\n":
+            return Range(self.start, self.end + 1, self.original_text)
+        else:
+            return self
+
     @staticmethod
     def join(a: T.Optional["Range"], b: T.Optional["Range"]) -> T.Optional["Range"]:
         if a is None:
diff --git a/tests/sample_errors/deprecations.blp b/tests/sample_errors/deprecations.blp
index 1554a0b..f67f002 100644
--- a/tests/sample_errors/deprecations.blp
+++ b/tests/sample_errors/deprecations.blp
@@ -1,5 +1,4 @@
 using Gtk 4.0;
-using Gio 2.0;
 
 Dialog {
   use-header-bar: 1;
diff --git a/tests/sample_errors/deprecations.err b/tests/sample_errors/deprecations.err
index 6059412..e3abd61 100644
--- a/tests/sample_errors/deprecations.err
+++ b/tests/sample_errors/deprecations.err
@@ -1 +1 @@
-4,1,6,Gtk.Dialog is deprecated
\ No newline at end of file
+3,1,6,Gtk.Dialog is deprecated
\ No newline at end of file
diff --git a/tests/sample_errors/warn_unused_import.blp b/tests/sample_errors/warn_unused_import.blp
new file mode 100644
index 0000000..bcfd1f6
--- /dev/null
+++ b/tests/sample_errors/warn_unused_import.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+using GLib 2.0;
+using Gio 2.0;
+
+Gio.Cancellable {}
diff --git a/tests/sample_errors/warn_unused_import.err b/tests/sample_errors/warn_unused_import.err
new file mode 100644
index 0000000..d779e56
--- /dev/null
+++ b/tests/sample_errors/warn_unused_import.err
@@ -0,0 +1 @@
+2,1,15,Unused import: GLib
\ No newline at end of file
diff --git a/tests/samples/parseable.blp b/tests/samples/parseable.blp
index f4e8c2f..5320baf 100644
--- a/tests/samples/parseable.blp
+++ b/tests/samples/parseable.blp
@@ -1,5 +1,4 @@
 using Gtk 4.0;
-using Gio 2.0;
 
 Gtk.Shortcut {
   trigger: "Escape";

From 1c8d7daea27a25685e1ecd4f2c9813a9b7801de7 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 6 Apr 2024 14:31:36 -0500
Subject: [PATCH 04/82] lsp: Fix deprecation warnings

---
 blueprintcompiler/lsp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 903bfb7..25705d1 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -472,7 +472,7 @@ class LanguageServer:
             ),
         }
 
-        if isinstance(err, DeprecationWarning):
+        if isinstance(err, DeprecatedWarning):
             result["tags"] = [DiagnosticTag.Deprecated]
 
         if isinstance(err, UnusedWarning):

From 84e529a4a81d5e9c29e9a65318ff44b81b09ced6 Mon Sep 17 00:00:00 2001
From: Gregor Niehl <gregorniehl@web.de>
Date: Sat, 27 Apr 2024 12:04:44 +0000
Subject: [PATCH 05/82] Formatter CLI: Provide option to suppress diff

---
 blueprintcompiler/main.py | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 1a9bd98..5b4cad8 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -90,6 +90,13 @@ class BlueprintApp:
             default=2,
             type=int,
         )
+        format.add_argument(
+            "-n",
+            "--no-diff",
+            help="Do not print a full diff of the changes",
+            default=False,
+            action="store_true",
+        )
         format.add_argument(
             "inputs",
             nargs="+",
@@ -221,23 +228,25 @@ class BlueprintApp:
                         file.write(formatted_str)
                         happened = "Formatted"
 
-                    diff_lines = []
-                    a_lines = data.splitlines(keepends=True)
-                    b_lines = formatted_str.splitlines(keepends=True)
+                    if not opts.no_diff:
+                        diff_lines = []
+                        a_lines = data.splitlines(keepends=True)
+                        b_lines = formatted_str.splitlines(keepends=True)
 
-                    for line in difflib.unified_diff(
-                        a_lines, b_lines, fromfile=file.name, tofile=file.name, n=5
-                    ):
-                        # Work around https://bugs.python.org/issue2142
-                        # See:
-                        # https://www.gnu.org/software/diffutils/manual/html_node/Incomplete-Lines.html
-                        if line[-1] == "\n":
-                            diff_lines.append(line)
-                        else:
-                            diff_lines.append(line + "\n")
-                            diff_lines.append("\\ No newline at end of file\n")
+                        for line in difflib.unified_diff(
+                            a_lines, b_lines, fromfile=file.name, tofile=file.name, n=5
+                        ):
+                            # Work around https://bugs.python.org/issue2142
+                            # See:
+                            # https://www.gnu.org/software/diffutils/manual/html_node/Incomplete-Lines.html
+                            if line[-1] == "\n":
+                                diff_lines.append(line)
+                            else:
+                                diff_lines.append(line + "\n")
+                                diff_lines.append("\\ No newline at end of file\n")
+
+                        print("".join(diff_lines))
 
-                    print("".join(diff_lines))
                     to_print = Colors.BOLD
                     if errored:
                         to_print += f"{Colors.RED}Skipped {file.name}: Will not overwrite file with compile errors"

From 988e69ab25140eb1773cf0eabfaa52b62b21d93c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 2 May 2024 20:10:40 -0500
Subject: [PATCH 06/82] lang: Allow ColumnView widgets to be built

Allow BuilderListItemFactory to contain Gtk.ColumnViewRow or
Gtk.ColumnViewCell templates, in addition to Gtk.ListItem templates.
This is necessary for people to use Gtk.ColumnView idiomatically in
Blueprint.

Fixes #157.
---
 .../language/gtk_list_item_factory.py         | 15 ++++--
 blueprintcompiler/outputs/xml/__init__.py     |  2 +-
 docs/reference/extensions.rst                 |  2 +-
 tests/sample_errors/list_factory.err          |  2 +-
 tests/samples/gtkcolumnview.blp               | 17 ++++++
 tests/samples/gtkcolumnview.ui                | 53 +++++++++++++++++++
 6 files changed, 85 insertions(+), 6 deletions(-)
 create mode 100644 tests/samples/gtkcolumnview.blp
 create mode 100644 tests/samples/gtkcolumnview.ui

diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index 7d05422..5b6177f 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -39,7 +39,10 @@ class ExtListItemFactory(AstNode):
 
     @property
     def gir_class(self):
-        return self.root.gir.get_type("ListItem", "Gtk")
+        if self.type_name is not None:
+            return self.type_name.gir_type
+        else:
+            return self.root.gir.get_type("ListItem", "Gtk")
 
     @validate("template")
     def container_is_builder_list(self):
@@ -57,8 +60,14 @@ class ExtListItemFactory(AstNode):
     @validate()
     def type_is_list_item(self):
         if self.type_name is not None:
-            if self.type_name.glib_type_name != "GtkListItem":
-                raise CompileError(f"Only Gtk.ListItem is allowed as a type here")
+            if self.type_name.glib_type_name not in (
+                "GtkListItem",
+                "GtkColumnViewRow",
+                "GtkColumnViewCell",
+            ):
+                raise CompileError(
+                    f"Only Gtk.ListItem, Gtk.ColumnViewRow, or Gtk.ColumnViewCell is allowed as a type here"
+                )
 
     @validate("template")
     def type_name_upgrade(self):
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 8707ee6..f23dacb 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -377,7 +377,7 @@ class XmlOutput(OutputFormat):
         elif isinstance(extension, ExtListItemFactory):
             child_xml = XmlEmitter()
             child_xml.start_tag("interface")
-            child_xml.start_tag("template", **{"class": "GtkListItem"})
+            child_xml.start_tag("template", **{"class": extension.gir_class})
             self._emit_object_or_template(extension, child_xml)
             child_xml.end_tag()
             child_xml.end_tag()
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index 744326f..a7b7b93 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -224,7 +224,7 @@ Valid in `Gtk.BuilderListItemFactory <https://docs.gtk.org/gtk4/class.BuilderLis
 
 The ``template`` block defines the template that will be used to create list items. This block is unique within Blueprint because it defines a completely separate sub-blueprint which is used to create each list item. The sub-blueprint may not reference objects in the main blueprint or vice versa.
 
-The template type must be `Gtk.ListItem <https://docs.gtk.org/gtk4/class.ListItem.html>`_. The template object can be referenced with the ``template`` keyword.
+The template type must be `Gtk.ListItem <https://docs.gtk.org/gtk4/class.ListItem.html>`_, `Gtk.ColumnViewRow <https://docs.gtk.org/gtk4/class.ColumnViewRow.html>`_, or `Gtk.ColumnViewCell <https://docs.gtk.org/gtk4/class.ColumnViewCell.html>`_ The template object can be referenced with the ``template`` keyword.
 
 .. code-block:: blueprint
 
diff --git a/tests/sample_errors/list_factory.err b/tests/sample_errors/list_factory.err
index adfd57b..1d4dfaa 100644
--- a/tests/sample_errors/list_factory.err
+++ b/tests/sample_errors/list_factory.err
@@ -1 +1 @@
-4,3,17,Only Gtk.ListItem is allowed as a type here
\ No newline at end of file
+4,3,17,Only Gtk.ListItem, Gtk.ColumnViewRow, or Gtk.ColumnViewCell is allowed as a type here
\ No newline at end of file
diff --git a/tests/samples/gtkcolumnview.blp b/tests/samples/gtkcolumnview.blp
new file mode 100644
index 0000000..9f11dd3
--- /dev/null
+++ b/tests/samples/gtkcolumnview.blp
@@ -0,0 +1,17 @@
+using Gtk 4.0;
+
+ColumnView {
+  row-factory: BuilderListItemFactory {
+    template ColumnViewRow {}
+  };
+
+  ColumnViewColumn {
+    factory: BuilderListItemFactory {
+      template ColumnViewCell {
+        child: Label {
+          label: bind template.item as <$MyObject>.name;
+        };
+      }
+    };
+  }
+}
diff --git a/tests/samples/gtkcolumnview.ui b/tests/samples/gtkcolumnview.ui
new file mode 100644
index 0000000..53126b0
--- /dev/null
+++ b/tests/samples/gtkcolumnview.ui
@@ -0,0 +1,53 @@
+<?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="GtkColumnView">
+    <property name="row-factory">
+      <object class="GtkBuilderListItemFactory">
+        <property name="bytes"><![CDATA[<?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>
+  <template class="GtkColumnViewRow"></template>
+</interface>]]></property>
+      </object>
+    </property>
+    <child>
+      <object class="GtkColumnViewColumn">
+        <property name="factory">
+          <object class="GtkBuilderListItemFactory">
+            <property name="bytes"><![CDATA[<?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>
+  <template class="GtkColumnViewCell">
+    <property name="child">
+      <object class="GtkLabel">
+        <binding name="label">
+          <lookup name="name" type="MyObject">
+            <lookup name="item" type="GtkColumnViewCell">
+              <constant>GtkColumnViewCell</constant>
+            </lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>]]></property>
+          </object>
+        </property>
+      </object>
+    </child>
+  </object>
+</interface>
\ No newline at end of file

From c502dee36bebe38efe0fe8534540ba62c743cc4c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 2 May 2024 20:16:37 -0500
Subject: [PATCH 07/82] output: Don't add @generated notice to subtemplates

There's already a notice at the top of the file, it doesn't need to be
in subtemplates.

Fixes #158.
---
 blueprintcompiler/outputs/xml/__init__.py |  2 +-
 tests/samples/gtkcolumnview.ui            | 10 ----------
 tests/samples/list_factory.ui             |  5 -----
 tests/samples/subscope.ui                 |  5 -----
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index f23dacb..862df14 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -375,7 +375,7 @@ class XmlOutput(OutputFormat):
             xml.end_tag()
 
         elif isinstance(extension, ExtListItemFactory):
-            child_xml = XmlEmitter()
+            child_xml = XmlEmitter(generated_notice=False)
             child_xml.start_tag("interface")
             child_xml.start_tag("template", **{"class": extension.gir_class})
             self._emit_object_or_template(extension, child_xml)
diff --git a/tests/samples/gtkcolumnview.ui b/tests/samples/gtkcolumnview.ui
index 53126b0..22c09e8 100644
--- a/tests/samples/gtkcolumnview.ui
+++ b/tests/samples/gtkcolumnview.ui
@@ -10,11 +10,6 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
     <property name="row-factory">
       <object class="GtkBuilderListItemFactory">
         <property name="bytes"><![CDATA[<?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>
   <template class="GtkColumnViewRow"></template>
 </interface>]]></property>
@@ -25,11 +20,6 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
         <property name="factory">
           <object class="GtkBuilderListItemFactory">
             <property name="bytes"><![CDATA[<?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>
   <template class="GtkColumnViewCell">
     <property name="child">
diff --git a/tests/samples/list_factory.ui b/tests/samples/list_factory.ui
index a1e7c27..8b9ff88 100644
--- a/tests/samples/list_factory.ui
+++ b/tests/samples/list_factory.ui
@@ -10,11 +10,6 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
     <property name="factory">
       <object class="GtkBuilderListItemFactory" id="list_item_factory">
         <property name="bytes"><![CDATA[<?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>
   <template class="GtkListItem">
     <property name="child">
diff --git a/tests/samples/subscope.ui b/tests/samples/subscope.ui
index 693a774..3513650 100644
--- a/tests/samples/subscope.ui
+++ b/tests/samples/subscope.ui
@@ -8,11 +8,6 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <requires lib="gtk" version="4.0"/>
   <object class="GtkBuilderListItemFactory">
     <property name="bytes"><![CDATA[<?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>
   <template class="GtkListItem">
     <property name="child">

From 07e824d8e7b2273166acbe6d58e130b3487d8074 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 4 May 2024 12:27:12 -0500
Subject: [PATCH 08/82] lang: Also allow Gtk.ListHeader in factory template

---
 blueprintcompiler/language/gtk_list_item_factory.py | 13 ++++++++++---
 tests/sample_errors/list_factory.err                |  2 +-
 tests/samples/gtkcolumnview.blp                     |  4 ++++
 tests/samples/gtkcolumnview.ui                      |  8 ++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index 5b6177f..c54547f 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -11,7 +11,13 @@ from .types import TypeName
 
 
 class ExtListItemFactory(AstNode):
-    grammar = [UseExact("id", "template"), Optional(TypeName), ObjectContent]
+    grammar = [
+        UseExact("id", "template"),
+        Mark("typename_start"),
+        Optional(TypeName),
+        Mark("typename_end"),
+        ObjectContent,
+    ]
 
     @property
     def id(self) -> str:
@@ -57,16 +63,17 @@ class ExtListItemFactory(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate template block")
 
-    @validate()
+    @validate("typename_start", "typename_end")
     def type_is_list_item(self):
         if self.type_name is not None:
             if self.type_name.glib_type_name not in (
                 "GtkListItem",
+                "GtkListHeader",
                 "GtkColumnViewRow",
                 "GtkColumnViewCell",
             ):
                 raise CompileError(
-                    f"Only Gtk.ListItem, Gtk.ColumnViewRow, or Gtk.ColumnViewCell is allowed as a type here"
+                    f"Only Gtk.ListItem, Gtk.ListHeader, Gtk.ColumnViewRow, or Gtk.ColumnViewCell is allowed as a type here"
                 )
 
     @validate("template")
diff --git a/tests/sample_errors/list_factory.err b/tests/sample_errors/list_factory.err
index 1d4dfaa..344e5dd 100644
--- a/tests/sample_errors/list_factory.err
+++ b/tests/sample_errors/list_factory.err
@@ -1 +1 @@
-4,3,17,Only Gtk.ListItem, Gtk.ColumnViewRow, or Gtk.ColumnViewCell is allowed as a type here
\ No newline at end of file
+4,11,6,Only Gtk.ListItem, Gtk.ListHeader, Gtk.ColumnViewRow, or Gtk.ColumnViewCell is allowed as a type here
\ No newline at end of file
diff --git a/tests/samples/gtkcolumnview.blp b/tests/samples/gtkcolumnview.blp
index 9f11dd3..3f5bee9 100644
--- a/tests/samples/gtkcolumnview.blp
+++ b/tests/samples/gtkcolumnview.blp
@@ -1,6 +1,10 @@
 using Gtk 4.0;
 
 ColumnView {
+  header-factory: BuilderListItemFactory {
+    template ListHeader {}
+  };
+
   row-factory: BuilderListItemFactory {
     template ColumnViewRow {}
   };
diff --git a/tests/samples/gtkcolumnview.ui b/tests/samples/gtkcolumnview.ui
index 22c09e8..c6d4ddb 100644
--- a/tests/samples/gtkcolumnview.ui
+++ b/tests/samples/gtkcolumnview.ui
@@ -7,6 +7,14 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GtkColumnView">
+    <property name="header-factory">
+      <object class="GtkBuilderListItemFactory">
+        <property name="bytes"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListHeader"></template>
+</interface>]]></property>
+      </object>
+    </property>
     <property name="row-factory">
       <object class="GtkBuilderListItemFactory">
         <property name="bytes"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>

From 25d08e56cb21b158c1cf881a94ec71154b07123b Mon Sep 17 00:00:00 2001
From: Gregor Niehl <gregorniehl@web.de>
Date: Thu, 30 May 2024 22:34:05 +0000
Subject: [PATCH 09/82] signals: Support `after` keyword

---
 blueprintcompiler/language/gobject_signal.py | 15 +++++++++++----
 blueprintcompiler/outputs/xml/__init__.py    |  1 +
 tests/samples/signal.blp                     |  2 +-
 tests/samples/signal.ui                      |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 063b2e8..9348321 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -166,11 +166,18 @@ class Signal(AstNode):
 
 
 @decompiler("signal")
-def decompile_signal(ctx, gir, name, handler, swapped="false", object=None):
+def decompile_signal(
+    ctx, gir, name, handler, swapped="false", after="false", object=None
+):
     object_name = object or ""
     name = name.replace("_", "-")
+    line = f"{name} => ${handler}({object_name})"
+
     if decompile.truthy(swapped):
-        ctx.print(f"{name} => ${handler}({object_name}) swapped;")
-    else:
-        ctx.print(f"{name} => ${handler}({object_name});")
+        line += " swapped"
+    if decompile.truthy(after):
+        line += " after"
+
+    line += ";"
+    ctx.print(line)
     return gir
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 862df14..22ca9e4 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -161,6 +161,7 @@ class XmlOutput(OutputFormat):
             name=name,
             handler=signal.handler,
             swapped=signal.is_swapped or None,
+            after=signal.is_after or None,
             object=(
                 self._object_id(signal, signal.object_id) if signal.object_id else None
             ),
diff --git a/tests/samples/signal.blp b/tests/samples/signal.blp
index 5f3aa7f..c299825 100644
--- a/tests/samples/signal.blp
+++ b/tests/samples/signal.blp
@@ -5,6 +5,6 @@ Entry {
 }
 
 Button button {
-  clicked => $on_button_clicked() swapped;
+  clicked => $on_button_clicked() swapped after;
   notify::visible => $on_button_notify_visible();
 }
diff --git a/tests/samples/signal.ui b/tests/samples/signal.ui
index 8163ca3..6ffa0e7 100644
--- a/tests/samples/signal.ui
+++ b/tests/samples/signal.ui
@@ -10,7 +10,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
     <signal name="activate" handler="click" object="button"/>
   </object>
   <object class="GtkButton" id="button">
-    <signal name="clicked" handler="on_button_clicked" swapped="True"/>
+    <signal name="clicked" handler="on_button_clicked" swapped="True" after="True"/>
     <signal name="notify::visible" handler="on_button_notify_visible"/>
   </object>
 </interface>

From 442fff69b60ae058720d3e9742de935a9483943f Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 30 May 2024 17:51:40 -0500
Subject: [PATCH 10/82] Fix crash in validate_parent_type

If the type being checked for is not found (e.g. the library is not
installed or is out of date), parent.full_name would be None.
---
 blueprintcompiler/language/gobject_object.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 16c92e7..2fdbb6a 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -110,7 +110,7 @@ def validate_parent_type(node, ns: str, name: str, err_msg: str):
     container_type = node.parent_by_type(Object).gir_class
     if container_type and not container_type.assignable_to(parent):
         raise CompileError(
-            f"{container_type.full_name} is not a {parent.full_name}, so it doesn't have {err_msg}"
+            f"{container_type.full_name} is not a {ns}.{name}, so it doesn't have {err_msg}"
         )
 
 

From aac834e1c588a0a77b27e97a9b1b476d88a44e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9ry=20Febvre?= <vfebvre@easter-eggs.com>
Date: Mon, 22 Apr 2024 21:17:20 +0000
Subject: [PATCH 11/82] docs: Fix misspelt `Komikku` and repo URL

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index 1837e2a..e5601ea 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -115,7 +115,7 @@ Built with Blueprint
 - `Identity <https://gitlab.gnome.org/YaLTeR/identity>`_
 - `Jogger <https://codeberg.org/baarkerlounger/jogger>`_
 - `Junction <https://github.com/sonnyp/Junction/>`_
-- `Komiku <https://github.com/flathub/info.febvre.Komikku>`_
+- `Komikku <https://codeberg.org/valos/Komikku>`_
 - `Letterpress <https://gitlab.gnome.org/World/Letterpress>`_
 - `Login Manager Settings <https://github.com/realmazharhussain/gdm-settings>`_
 - `Maniatic Launcher <https://github.com/santiagocezar/maniatic-launcher/>`_

From 6bae8603264f2d9c790d5f302849c094592ab7dc Mon Sep 17 00:00:00 2001
From: Szepesi Tibor <sztibi023@gmail.com>
Date: Thu, 20 Jun 2024 13:38:12 +0200
Subject: [PATCH 12/82] lsp: Fix semantic token positions

---
 blueprintcompiler/lsp.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 25705d1..25b289f 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -102,10 +102,10 @@ class OpenFile:
         ]
 
         # convert line, column numbers to deltas
-        for i, token_list in enumerate(token_lists[1:]):
-            token_list[0] -= token_lists[i][0]
-            if token_list[0] == 0:
-                token_list[1] -= token_lists[i][1]
+        for a, b in zip(token_lists[-2::-1], token_lists[:0:-1]):
+            b[0] -= a[0]
+            if b[0] == 0:
+                b[1] -= a[1]
 
         # flatten the list
         return [x for y in token_lists for x in y]

From e44494e6e2de0389945d7a4b15a1f9d1d35d110c Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sun, 16 Jun 2024 14:20:54 +0200
Subject: [PATCH 13/82] decompiler: Use bind instead of bind-property

---
 blueprintcompiler/decompiler.py        | 2 +-
 tests/samples/property_binding_dec.blp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 7e6c53b..483d6f6 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -295,7 +295,7 @@ def decompile_property(
             flags += " inverted"
         if "bidirectional" in bind_flags:
             flags += " bidirectional"
-        ctx.print(f"{name}: bind-property {bind_source}.{bind_property}{flags};")
+        ctx.print(f"{name}: bind {bind_source}.{bind_property}{flags};")
     elif truthy(translatable):
         comments, translatable = decompile_translatable(
             cdata, translatable, context, comments
diff --git a/tests/samples/property_binding_dec.blp b/tests/samples/property_binding_dec.blp
index 7e74ab8..39e4458 100644
--- a/tests/samples/property_binding_dec.blp
+++ b/tests/samples/property_binding_dec.blp
@@ -1,9 +1,9 @@
 using Gtk 4.0;
 
 Box {
-  visible: bind-property box2.visible inverted;
-  orientation: bind-property box2.orientation;
-  spacing: bind-property box2.spacing no-sync-create;
+  visible: bind box2.visible inverted;
+  orientation: bind box2.orientation;
+  spacing: bind box2.spacing no-sync-create;
 }
 
 Box box2 {

From 85630bc9752369a9ab49337d1f98532d0cb6a4bb Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 12 Jun 2024 12:50:00 +0200
Subject: [PATCH 14/82] tests: fix tests when used as subproject

`meson.source_root()` will return the source root of the parent
project, not the current project when it's used as subproject.
---
 tests/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/meson.build b/tests/meson.build
index 8e51a47..8a5a634 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1 +1 @@
-test('tests', py, args: ['-m', 'unittest'], workdir: meson.source_root())
+test('tests', py, args: ['-m', 'unittest'], workdir: meson.project_source_root())

From f1cf70b6eb2de45745eef36a67b6871224070f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Capypara=20K=C3=B6pcke?= <hello@capypara.de>
Date: Mon, 30 Oct 2023 19:16:45 +0100
Subject: [PATCH 15/82] xgettext compatibility: Output 'yes' for translatable

---
 .gitlab-ci.yml                               | 2 +-
 blueprintcompiler/outputs/xml/__init__.py    | 2 +-
 tests/samples/accessibility.ui               | 2 +-
 tests/samples/action_widgets.ui              | 8 ++++----
 tests/samples/adw_alertdialog_responses.ui   | 4 ++--
 tests/samples/adw_breakpoint.ui              | 2 +-
 tests/samples/adw_messagedialog_responses.ui | 4 ++--
 tests/samples/combo_box_text.ui              | 2 +-
 tests/samples/comments.ui                    | 2 +-
 tests/samples/menu.ui                        | 2 +-
 tests/samples/scale_marks.ui                 | 2 +-
 tests/samples/string_list.ui                 | 2 +-
 tests/samples/translated.ui                  | 4 ++--
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcac278..1ec071e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build:
     - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
-    - git checkout 71522af3607e08143671ee0d224e65e9b9eb9f30
+    - git checkout 5f9e155c1333e84e6f683cdb26b02a5925fd8db3
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 22ca9e4..f10fadf 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -150,7 +150,7 @@ class XmlOutput(OutputFormat):
         elif isinstance(translated, QuotedLiteral):
             return {}
         else:
-            return {"translatable": "true", "context": translated.translate_context}
+            return {"translatable": "yes", "context": translated.translate_context}
 
     def _emit_signal(self, signal: Signal, xml: XmlEmitter):
         name = signal.name
diff --git a/tests/samples/accessibility.ui b/tests/samples/accessibility.ui
index 7732a14..1482164 100644
--- a/tests/samples/accessibility.ui
+++ b/tests/samples/accessibility.ui
@@ -8,7 +8,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <requires lib="gtk" version="4.0"/>
   <object class="GtkBox">
     <accessibility>
-      <property name="label" translatable="true">Hello, world!</property>
+      <property name="label" translatable="yes">Hello, world!</property>
       <relation name="labelled-by">my_label</relation>
       <state name="checked">1</state>
     </accessibility>
diff --git a/tests/samples/action_widgets.ui b/tests/samples/action_widgets.ui
index ac730a2..c0d304d 100644
--- a/tests/samples/action_widgets.ui
+++ b/tests/samples/action_widgets.ui
@@ -9,17 +9,17 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <object class="GtkDialog">
     <child type="action">
       <object class="GtkButton" id="cancel_button">
-        <property name="label" translatable="true">Cancel</property>
+        <property name="label" translatable="yes">Cancel</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="custom_response_button">
-        <property name="label" translatable="true">Reinstall Windows</property>
+        <property name="label" translatable="yes">Reinstall Windows</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="ok_button">
-        <property name="label" translatable="true">Ok</property>
+        <property name="label" translatable="yes">Ok</property>
       </object>
     </child>
     <action-widgets>
@@ -31,7 +31,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <object class="GtkInfoBar">
     <child type="action">
       <object class="GtkButton" id="ok_info_button">
-        <property name="label" translatable="true">Ok</property>
+        <property name="label" translatable="yes">Ok</property>
       </object>
     </child>
     <action-widgets>
diff --git a/tests/samples/adw_alertdialog_responses.ui b/tests/samples/adw_alertdialog_responses.ui
index 0418751..1b8bb0d 100644
--- a/tests/samples/adw_alertdialog_responses.ui
+++ b/tests/samples/adw_alertdialog_responses.ui
@@ -8,8 +8,8 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <requires lib="gtk" version="4.0"/>
   <object class="AdwAlertDialog">
     <responses>
-      <response id="cancel" translatable="true">Cancel</response>
-      <response id="discard" translatable="true" appearance="destructive">Discard</response>
+      <response id="cancel" translatable="yes">Cancel</response>
+      <response id="discard" translatable="yes" appearance="destructive">Discard</response>
       <response id="save" enabled="false" appearance="suggested">Save</response>
     </responses>
   </object>
diff --git a/tests/samples/adw_breakpoint.ui b/tests/samples/adw_breakpoint.ui
index f667958..29cbf9b 100644
--- a/tests/samples/adw_breakpoint.ui
+++ b/tests/samples/adw_breakpoint.ui
@@ -9,7 +9,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <object class="GtkLabel" id="label"></object>
   <object class="AdwBreakpoint">
     <condition>max-width: 600px</condition>
-    <setter object="label" property="label" translatable="true">Hello, world!</setter>
+    <setter object="label" property="label" translatable="yes">Hello, world!</setter>
     <setter object="label" property="visible">false</setter>
     <setter object="label" property="extra-menu"></setter>
   </object>
diff --git a/tests/samples/adw_messagedialog_responses.ui b/tests/samples/adw_messagedialog_responses.ui
index 48122ca..6cbf5ef 100644
--- a/tests/samples/adw_messagedialog_responses.ui
+++ b/tests/samples/adw_messagedialog_responses.ui
@@ -8,8 +8,8 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <requires lib="gtk" version="4.0"/>
   <object class="AdwMessageDialog">
     <responses>
-      <response id="cancel" translatable="true">Cancel</response>
-      <response id="discard" translatable="true" appearance="destructive">Discard</response>
+      <response id="cancel" translatable="yes">Cancel</response>
+      <response id="discard" translatable="yes" appearance="destructive">Discard</response>
       <response id="save" enabled="false" appearance="suggested">Save</response>
     </responses>
   </object>
diff --git a/tests/samples/combo_box_text.ui b/tests/samples/combo_box_text.ui
index c160d80..8a38fe8 100644
--- a/tests/samples/combo_box_text.ui
+++ b/tests/samples/combo_box_text.ui
@@ -9,7 +9,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <object class="GtkComboBoxText">
     <items>
       <item>Hello, world!</item>
-      <item translatable="true">Hello!</item>
+      <item translatable="yes">Hello!</item>
       <item id="item_id">item</item>
     </items>
   </object>
diff --git a/tests/samples/comments.ui b/tests/samples/comments.ui
index bd3378a..9f7e004 100644
--- a/tests/samples/comments.ui
+++ b/tests/samples/comments.ui
@@ -8,7 +8,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <requires lib="gtk" version="4.0"/>
   <object class="GObject"></object>
   <object class="GtkLabel">
-    <property name="label" translatable="true">Test</property>
+    <property name="label" translatable="yes">Test</property>
     <property name="visible">false</property>
   </object>
 </interface>
diff --git a/tests/samples/menu.ui b/tests/samples/menu.ui
index 71c3fd2..a59b8d2 100644
--- a/tests/samples/menu.ui
+++ b/tests/samples/menu.ui
@@ -12,7 +12,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
         <attribute name="label">test section</attribute>
       </section>
       <item>
-        <attribute name="label" translatable="true" context="context">test translated item</attribute>
+        <attribute name="label" translatable="yes" context="context">test translated item</attribute>
       </item>
       <item>
         <attribute name="label">test item shorthand 1</attribute>
diff --git a/tests/samples/scale_marks.ui b/tests/samples/scale_marks.ui
index 36956f5..c08afb4 100644
--- a/tests/samples/scale_marks.ui
+++ b/tests/samples/scale_marks.ui
@@ -9,7 +9,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <object class="GtkScale">
     <marks>
       <mark value="-1" position="bottom"></mark>
-      <mark value="0" position="top" translatable="true">Hello, world!</mark>
+      <mark value="0" position="top" translatable="yes">Hello, world!</mark>
       <mark value="2"></mark>
     </marks>
   </object>
diff --git a/tests/samples/string_list.ui b/tests/samples/string_list.ui
index 74de992..a21d747 100644
--- a/tests/samples/string_list.ui
+++ b/tests/samples/string_list.ui
@@ -9,7 +9,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <object class="GtkStringList" id="greetings">
     <items>
       <item>Hello, world!</item>
-      <item translatable="true">Hello!</item>
+      <item translatable="yes">Hello!</item>
     </items>
   </object>
   <object class="GtkDropDown">
diff --git a/tests/samples/translated.ui b/tests/samples/translated.ui
index 66102a0..4afeddd 100644
--- a/tests/samples/translated.ui
+++ b/tests/samples/translated.ui
@@ -7,9 +7,9 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GtkLabel">
-    <property name="label" translatable="true">Hello, world!</property>
+    <property name="label" translatable="yes">Hello, world!</property>
   </object>
   <object class="GtkLabel">
-    <property name="label" translatable="true" context="translation context">Hello</property>
+    <property name="label" translatable="yes" context="translation context">Hello</property>
   </object>
 </interface>

From da5b9909fca16d2989e029678acb7582962d7090 Mon Sep 17 00:00:00 2001
From: Diego Augusto <diegocastro169169@gmail.com>
Date: Thu, 4 Jul 2024 22:02:51 +0000
Subject: [PATCH 16/82] Support array type

---
 blueprintcompiler/gir.py                      |  4 ++
 blueprintcompiler/language/__init__.py        |  1 +
 .../language/gobject_property.py              |  8 ++-
 blueprintcompiler/language/values.py          | 55 +++++++++++++++++++
 blueprintcompiler/outputs/xml/__init__.py     |  9 +++
 docs/reference/values.rst                     | 12 +++-
 tests/sample_errors/array_wrong_type.blp      |  5 ++
 tests/sample_errors/array_wrong_type.err      |  1 +
 .../sample_errors/array_wrong_type_value.blp  |  6 ++
 .../sample_errors/array_wrong_type_value.err  |  1 +
 .../sample_errors/newline_in_string_array.blp |  6 ++
 .../sample_errors/newline_in_string_array.err |  1 +
 .../newline_in_string_array_multi.blp         |  6 ++
 .../newline_in_string_array_multi.err         |  2 +
 tests/samples/string_array.blp                |  6 ++
 tests/samples/string_array.ui                 | 14 +++++
 16 files changed, 133 insertions(+), 4 deletions(-)
 create mode 100644 tests/sample_errors/array_wrong_type.blp
 create mode 100644 tests/sample_errors/array_wrong_type.err
 create mode 100644 tests/sample_errors/array_wrong_type_value.blp
 create mode 100644 tests/sample_errors/array_wrong_type_value.err
 create mode 100644 tests/sample_errors/newline_in_string_array.blp
 create mode 100644 tests/sample_errors/newline_in_string_array.err
 create mode 100644 tests/sample_errors/newline_in_string_array_multi.blp
 create mode 100644 tests/sample_errors/newline_in_string_array_multi.err
 create mode 100644 tests/samples/string_array.blp
 create mode 100644 tests/samples/string_array.ui

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 142bbd2..35be84e 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -200,6 +200,10 @@ class ArrayType(GirType):
     def assignable_to(self, other: GirType) -> bool:
         return isinstance(other, ArrayType) and self._inner.assignable_to(other._inner)
 
+    @property
+    def inner(self) -> GirType:
+        return self._inner
+
     @property
     def name(self) -> str:
         return self._inner.name + "[]"
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 1e183c9..b302686 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -41,6 +41,7 @@ from .imports import GtkDirective, Import
 from .types import ClassName
 from .ui import UI
 from .values import (
+    ArrayValue,
     Flag,
     Flags,
     IdentLiteral,
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 3d2ac5b..5d0c867 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -22,18 +22,20 @@ from .binding import Binding
 from .common import *
 from .contexts import ValueTypeCtx
 from .gtkbuilder_template import Template
-from .values import ObjectValue, Value
+from .values import ArrayValue, ObjectValue, Value
 
 
 class Property(AstNode):
-    grammar = Statement(UseIdent("name"), ":", AnyOf(Binding, ObjectValue, Value))
+    grammar = Statement(
+        UseIdent("name"), ":", AnyOf(Binding, ObjectValue, Value, ArrayValue)
+    )
 
     @property
     def name(self) -> str:
         return self.tokens["name"]
 
     @property
-    def value(self) -> T.Union[Binding, ObjectValue, Value]:
+    def value(self) -> T.Union[Binding, ObjectValue, Value, ArrayValue]:
         return self.children[0]
 
     @property
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index b9d719f..73a1084 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -19,6 +19,8 @@
 
 import typing as T
 
+from blueprintcompiler.gir import ArrayType
+
 from .common import *
 from .contexts import ScopeCtx, ValueTypeCtx
 from .gobject_object import Object
@@ -395,6 +397,59 @@ class Value(AstNode):
         return self.children[0]
 
 
+class ArrayValue(AstNode):
+    grammar = ["[", Delimited(Value, ","), "]"]
+
+    @validate()
+    def validate_for_type(self) -> None:
+        expected_type = self.gir_type
+        if expected_type is not None and not isinstance(expected_type, gir.ArrayType):
+            raise CompileError(f"Cannot assign array to {expected_type.full_name}")
+
+        if expected_type is not None and not isinstance(
+            expected_type.inner, StringType
+        ):
+            raise CompileError("Only string arrays are supported")
+
+    @validate()
+    def validate_invalid_newline(self) -> None:
+        expected_type = self.gir_type
+        if isinstance(expected_type, gir.ArrayType) and isinstance(
+            expected_type.inner, StringType
+        ):
+            errors = []
+            for value in self.values:
+                if isinstance(value.child, Literal) and isinstance(
+                    value.child.value, QuotedLiteral
+                ):
+                    quoted_literal = value.child.value
+                    literal_value = quoted_literal.value
+                    if "\n" in literal_value:
+                        errors.append(
+                            CompileError(
+                                "String literals inside arrays can't contain newlines",
+                                range=quoted_literal.range,
+                            )
+                        )
+            if len(errors) > 0:
+                raise MultipleErrors(errors)
+
+    @property
+    def values(self) -> T.List[Value]:
+        return self.children
+
+    @property
+    def gir_type(self):
+        return self.parent.context[ValueTypeCtx].value_type
+
+    @context(ValueTypeCtx)
+    def child_value(self):
+        if self.gir_type is None or not isinstance(self.gir_type, ArrayType):
+            return ValueTypeCtx(None)
+        else:
+            return ValueTypeCtx(self.gir_type.inner)
+
+
 class StringValue(AstNode):
     grammar = AnyOf(Translated, QuotedLiteral)
 
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index f10fadf..a7f4b4b 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -139,6 +139,15 @@ class XmlOutput(OutputFormat):
             self._emit_object(value.object, xml)
             xml.end_tag()
 
+        elif isinstance(value, ArrayValue):
+            xml.start_tag("property", **props)
+            values = list(value.values)
+            for value in values[:-1]:
+                self._emit_value(value, xml)
+                xml.put_text("\n")
+            self._emit_value(values[-1], xml)
+            xml.end_tag()
+
         else:
             raise CompilerBugError()
 
diff --git a/docs/reference/values.rst b/docs/reference/values.rst
index 7c61d78..95f6bc8 100644
--- a/docs/reference/values.rst
+++ b/docs/reference/values.rst
@@ -145,7 +145,6 @@ Example
      label: _("This is an advanced feature. Use with caution!");
    }
 
-
 .. _Syntax ObjectValue:
 
 Object Values
@@ -170,3 +169,14 @@ String Values
    StringValue = :ref:`Translated<Syntax Translated>` | :ref:`QuotedLiteral<Syntax Literal>`
 
 Menus, as well as some :ref:`extensions<Syntax Extension>`, have properties that can only be string literals or translated strings.
+
+.. _Syntax ArrayValue:
+
+Array Values
+-------------
+
+.. rst-class:: grammar-block
+
+    ArrayValue = '[' (:ref:`StringValue<Syntax StringValue>`),* ']'
+
+For now, it only supports :ref:`Strings<Syntax StringValue>`. This is because Gtk.Builder only supports string arrays.
diff --git a/tests/sample_errors/array_wrong_type.blp b/tests/sample_errors/array_wrong_type.blp
new file mode 100644
index 0000000..c8cdd9b
--- /dev/null
+++ b/tests/sample_errors/array_wrong_type.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+    label: [1];
+}
diff --git a/tests/sample_errors/array_wrong_type.err b/tests/sample_errors/array_wrong_type.err
new file mode 100644
index 0000000..20e8e0d
--- /dev/null
+++ b/tests/sample_errors/array_wrong_type.err
@@ -0,0 +1 @@
+4,12,3,Cannot assign array to string
\ No newline at end of file
diff --git a/tests/sample_errors/array_wrong_type_value.blp b/tests/sample_errors/array_wrong_type_value.blp
new file mode 100644
index 0000000..9b39e00
--- /dev/null
+++ b/tests/sample_errors/array_wrong_type_value.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+
+AboutDialog about {
+    valign: center;
+    authors: [1];
+}
diff --git a/tests/sample_errors/array_wrong_type_value.err b/tests/sample_errors/array_wrong_type_value.err
new file mode 100644
index 0000000..7ba59a8
--- /dev/null
+++ b/tests/sample_errors/array_wrong_type_value.err
@@ -0,0 +1 @@
+5,15,1,Cannot convert number to string
\ No newline at end of file
diff --git a/tests/sample_errors/newline_in_string_array.blp b/tests/sample_errors/newline_in_string_array.blp
new file mode 100644
index 0000000..5a6278b
--- /dev/null
+++ b/tests/sample_errors/newline_in_string_array.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+
+AboutDialog about {
+    valign: center;
+    authors: ["Olimar\n"];
+}
diff --git a/tests/sample_errors/newline_in_string_array.err b/tests/sample_errors/newline_in_string_array.err
new file mode 100644
index 0000000..451f28e
--- /dev/null
+++ b/tests/sample_errors/newline_in_string_array.err
@@ -0,0 +1 @@
+5,15,10,String literals inside arrays can't contain newlines
diff --git a/tests/sample_errors/newline_in_string_array_multi.blp b/tests/sample_errors/newline_in_string_array_multi.blp
new file mode 100644
index 0000000..627f886
--- /dev/null
+++ b/tests/sample_errors/newline_in_string_array_multi.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+
+AboutDialog about {
+    valign: center;
+    authors: ["Olimar\n", "Luie\nPresident"];
+}
diff --git a/tests/sample_errors/newline_in_string_array_multi.err b/tests/sample_errors/newline_in_string_array_multi.err
new file mode 100644
index 0000000..6f37d31
--- /dev/null
+++ b/tests/sample_errors/newline_in_string_array_multi.err
@@ -0,0 +1,2 @@
+5,15,10,String literals inside arrays can't contain newlines
+5,27,17,String literals inside arrays can't contain newlines
diff --git a/tests/samples/string_array.blp b/tests/samples/string_array.blp
new file mode 100644
index 0000000..4f8ac5b
--- /dev/null
+++ b/tests/samples/string_array.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+
+AboutDialog about {
+    valign: center;
+    authors: ["Jane doe <jane-doe@email.com>", "Jhonny D <jd@email.com>"];
+}
diff --git a/tests/samples/string_array.ui b/tests/samples/string_array.ui
new file mode 100644
index 0000000..03f60ac
--- /dev/null
+++ b/tests/samples/string_array.ui
@@ -0,0 +1,14 @@
+<?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="GtkAboutDialog" id="about">
+    <property name="valign">3</property>
+    <property name="authors">Jane doe &lt;jane-doe@email.com&gt;
+Jhonny D &lt;jd@email.com&gt;</property>
+  </object>
+</interface>

From a075b26769e6f6c2c0aed6e62320f91655dd59fd Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sun, 16 Jun 2024 14:18:08 +0200
Subject: [PATCH 17/82] lsp: Extend completion documentation

---
 blueprintcompiler/completions.py | 37 +++++++++++++++++++++++++-------
 blueprintcompiler/gir.py         |  9 ++++++++
 blueprintcompiler/lsp_utils.py   |  5 ++++-
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index 0a43388..cfe5c51 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -17,6 +17,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+import sys
 import typing as T
 
 from . import gir, language
@@ -30,6 +31,9 @@ from .tokenizer import Token, TokenType
 Pattern = T.List[T.Tuple[TokenType, T.Optional[str]]]
 
 
+def debug(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
+
 def _complete(
     lsp, ast_node: AstNode, tokens: T.List[Token], idx: int, token_idx: int
 ) -> T.Iterator[Completion]:
@@ -72,7 +76,9 @@ def complete(
 
 @completer([language.GtkDirective])
 def using_gtk(lsp, ast_node, match_variables):
-    yield Completion("using Gtk 4.0;", CompletionItemKind.Keyword)
+    yield Completion(
+        "using Gtk 4.0", CompletionItemKind.Keyword, snippet="using Gtk 4.0;\n"
+    )
 
 
 @completer(
@@ -101,7 +107,7 @@ def object_completer(lsp, ast_node, match_variables):
     ns = ast_node.root.gir.namespaces.get(match_variables[0])
     if ns is not None:
         for c in ns.classes.values():
-            yield Completion(c.name, CompletionItemKind.Class, docs=c.doc)
+            yield Completion(c.name, CompletionItemKind.Class, docs=c.doc, detail=c.detail)
 
 
 @completer(
@@ -112,7 +118,7 @@ def gtk_object_completer(lsp, ast_node, match_variables):
     ns = ast_node.root.gir.namespaces.get("Gtk")
     if ns is not None:
         for c in ns.classes.values():
-            yield Completion(c.name, CompletionItemKind.Class, docs=c.doc)
+            yield Completion(c.name, CompletionItemKind.Class, docs=c.doc, detail=c.detail)
 
 
 @completer(
@@ -131,6 +137,8 @@ def property_completer(lsp, ast_node, match_variables):
                     CompletionItemKind.Property,
                     sort_text=f"0 {prop_name}",
                     snippet=f"{prop_name}: ${{1|true,false|}};",
+                    docs=prop.doc,
+                    detail=prop.detail,
                 )
             elif isinstance(prop.type, gir.StringType):
                 yield Completion(
@@ -138,6 +146,8 @@ def property_completer(lsp, ast_node, match_variables):
                     CompletionItemKind.Property,
                     sort_text=f"0 {prop_name}",
                     snippet=f'{prop_name}: "$0";',
+                    docs=prop.doc,
+                    detail=prop.detail,
                 )
             elif (
                 isinstance(prop.type, gir.Enumeration)
@@ -150,6 +160,8 @@ def property_completer(lsp, ast_node, match_variables):
                     CompletionItemKind.Property,
                     sort_text=f"0 {prop_name}",
                     snippet=f"{prop_name}: ${{1|{choices}|}};",
+                    docs=prop.doc,
+                    detail=prop.detail,
                 )
             else:
                 yield Completion(
@@ -157,6 +169,8 @@ def property_completer(lsp, ast_node, match_variables):
                     CompletionItemKind.Property,
                     sort_text=f"0 {prop_name}",
                     snippet=f"{prop_name}: $0;",
+                    docs=prop.doc,
+                    detail=prop.detail,
                 )
 
 
@@ -168,7 +182,12 @@ def prop_value_completer(lsp, ast_node, match_variables):
     if (vt := ast_node.value_type) is not None:
         if isinstance(vt.value_type, gir.Enumeration):
             for name, member in vt.value_type.members.items():
-                yield Completion(name, CompletionItemKind.EnumMember, docs=member.doc)
+                yield Completion(
+                    name,
+                    CompletionItemKind.EnumMember,
+                    docs=member.doc,
+                    detail=member.detail,
+                )
 
         elif isinstance(vt.value_type, gir.BoolType):
             yield Completion("true", CompletionItemKind.Constant)
@@ -181,7 +200,7 @@ def prop_value_completer(lsp, ast_node, match_variables):
 )
 def signal_completer(lsp, ast_node, match_variables):
     if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.ExternType):
-        for signal in ast_node.gir_class.signals:
+        for signal_name, signal in ast_node.gir_class.signals.items():
             if not isinstance(ast_node.parent, language.Object):
                 name = "on"
             else:
@@ -192,10 +211,12 @@ def signal_completer(lsp, ast_node, match_variables):
                     .lower()
                 )
             yield Completion(
-                signal,
+                signal_name,
                 CompletionItemKind.Event,
-                sort_text=f"1 {signal}",
-                snippet=f"{signal} => \$${{1:{name}_{signal.replace('-', '_')}}}()$0;",
+                sort_text=f"1 {signal_name}",
+                snippet=f"{signal_name} => \$${{1:{name}_{signal_name.replace('-', '_')}}}()$0;",
+                docs=signal.doc,
+                detail=signal.detail,
             )
 
 
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 35be84e..f569f0a 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -336,6 +336,15 @@ class GirNode:
     def available_in(self) -> str:
         return self.xml.get("version")
 
+    @cached_property
+    def detail(self) -> T.Optional[str]:
+        try:
+            el = self.xml.get_elements("doc")
+            if len(el) == 1:
+                return el[0].cdata.strip().partition("\n")[0]
+        except:
+            return None
+
     @cached_property
     def doc(self) -> T.Optional[str]:
         sections = []
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 34b0949..9362e8c 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -84,6 +84,7 @@ class Completion:
     docs: T.Optional[str] = None
     text: T.Optional[str] = None
     snippet: T.Optional[str] = None
+    detail: T.Optional[str] = None
 
     def to_json(self, snippets: bool):
         insert_text = self.text or self.label
@@ -96,7 +97,8 @@ class Completion:
             "label": self.label,
             "kind": self.kind,
             "tags": [CompletionItemTag.Deprecated] if self.deprecated else None,
-            "detail": self.signature,
+            # https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#completionItemLabelDetails
+            "labelDetails": ({"detail": self.signature} if self.signature else None),
             "documentation": (
                 {
                     "kind": "markdown",
@@ -109,6 +111,7 @@ class Completion:
             "sortText": self.sort_text,
             "insertText": insert_text,
             "insertTextFormat": insert_text_format,
+            "detail": self.detail if self.detail else None,
         }
         return {k: v for k, v in result.items() if v is not None}
 

From 8c102cf9dc94fc8ff0daf8328f1c9c798926cf1f Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Mon, 3 Jun 2024 21:54:09 +0300
Subject: [PATCH 18/82] lsp: Fix syntax for signal completion

---
 blueprintcompiler/completions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index cfe5c51..b8d7990 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -214,7 +214,7 @@ def signal_completer(lsp, ast_node, match_variables):
                 signal_name,
                 CompletionItemKind.Event,
                 sort_text=f"1 {signal_name}",
-                snippet=f"{signal_name} => \$${{1:{name}_{signal_name.replace('-', '_')}}}()$0;",
+                snippet=f"{signal_name} => \$${{1:${name}_{signal_name.replace('-', '_')}}}()$0;",
                 docs=signal.doc,
                 detail=signal.detail,
             )

From b76f4eef5047135baffe721d08d2901313e05196 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sat, 1 Jun 2024 12:50:47 +0300
Subject: [PATCH 19/82] lsp: Use snippet for object completion

---
 blueprintcompiler/completions.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index b8d7990..fd203c5 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -107,7 +107,13 @@ def object_completer(lsp, ast_node, match_variables):
     ns = ast_node.root.gir.namespaces.get(match_variables[0])
     if ns is not None:
         for c in ns.classes.values():
-            yield Completion(c.name, CompletionItemKind.Class, docs=c.doc, detail=c.detail)
+            yield Completion(
+                c.name,
+                CompletionItemKind.Class,
+                snippet=f"{c.name} {{\n  $0\n}}",
+                docs=c.doc,
+                detail=c.detail,
+            )
 
 
 @completer(
@@ -118,7 +124,13 @@ def gtk_object_completer(lsp, ast_node, match_variables):
     ns = ast_node.root.gir.namespaces.get("Gtk")
     if ns is not None:
         for c in ns.classes.values():
-            yield Completion(c.name, CompletionItemKind.Class, docs=c.doc, detail=c.detail)
+            yield Completion(
+                c.name,
+                CompletionItemKind.Class,
+                snippet=f"{c.name} {{\n  $0\n}}",
+                docs=c.doc,
+                detail=c.detail,
+            )
 
 
 @completer(

From 896dd7f824189db04684668244e9b62ed38ab770 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Mon, 17 Jun 2024 20:35:39 +0200
Subject: [PATCH 20/82] fix linter

---
 blueprintcompiler/completions.py | 1 +
 blueprintcompiler/gir.py         | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index fd203c5..ea58422 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -34,6 +34,7 @@ Pattern = T.List[T.Tuple[TokenType, T.Optional[str]]]
 def debug(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)
 
+
 def _complete(
     lsp, ast_node: AstNode, tokens: T.List[Token], idx: int, token_idx: int
 ) -> T.Iterator[Completion]:
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index f569f0a..336c0b1 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -342,6 +342,8 @@ class GirNode:
             el = self.xml.get_elements("doc")
             if len(el) == 1:
                 return el[0].cdata.strip().partition("\n")[0]
+            else:
+                return None
         except:
             return None
 

From adc2be14545289778179508ac1f9797a93bc2686 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sun, 16 Jun 2024 15:23:48 +0200
Subject: [PATCH 21/82] Support template without parent

---
 blueprintcompiler/gir.py                          |  6 +++++-
 blueprintcompiler/language/gtkbuilder_template.py |  5 ++++-
 tests/samples/template_orphan.blp                 |  5 +++++
 tests/samples/template_orphan.ui                  | 12 ++++++++++++
 tests/test_samples.py                             |  2 ++
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 tests/samples/template_orphan.blp
 create mode 100644 tests/samples/template_orphan.ui

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 336c0b1..029fe58 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -905,7 +905,11 @@ class Namespace(GirNode):
     def get_type_by_cname(self, cname: str) -> T.Optional[GirType]:
         """Gets a type from this namespace by its C name."""
         for item in self.entries.values():
-            if hasattr(item, "cname") and item.cname == cname:
+            if (
+                hasattr(item, "cname")
+                and item.cname is not None
+                and item.cname == cname
+            ):
                 return item
         return None
 
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index e1e2131..be8473c 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -97,7 +97,10 @@ def decompile_template(ctx: DecompileCtx, gir, klass, parent=None):
         else:
             return "$" + cname
 
-    ctx.print(f"template {class_name(klass)} : {class_name(parent)} {{")
+    if parent is None:
+        ctx.print(f"template {class_name(klass)} {{")
+    else:
+        ctx.print(f"template {class_name(klass)} : {class_name(parent)} {{")
 
     ctx.template_class = klass
 
diff --git a/tests/samples/template_orphan.blp b/tests/samples/template_orphan.blp
new file mode 100644
index 0000000..949e29f
--- /dev/null
+++ b/tests/samples/template_orphan.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+template $TestTemplate {
+  test-property: 'Hello, world';
+}
\ No newline at end of file
diff --git a/tests/samples/template_orphan.ui b/tests/samples/template_orphan.ui
new file mode 100644
index 0000000..62085ff
--- /dev/null
+++ b/tests/samples/template_orphan.ui
@@ -0,0 +1,12 @@
+<?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"/>
+  <template class="TestTemplate">
+    <property name="test-property">Hello, world</property>
+  </template>
+</interface>
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 0a525ca..fc7d0b8 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -186,6 +186,7 @@ class TestSamples(unittest.TestCase):
                 "template_bind_property",
                 "template_id",
                 "template_no_parent",
+                "template_orphan",
                 "template_simple_binding",
                 "typeof",
                 "unchecked_class",
@@ -235,6 +236,7 @@ class TestSamples(unittest.TestCase):
         self.assert_decompile("strings_dec")
         self.assert_decompile("style_dec")
         self.assert_decompile("template")
+        self.assert_decompile("template_orphan")
         self.assert_decompile("translated")
         self.assert_decompile("using")
         self.assert_decompile("unchecked_class_dec")

From b33cc7ccd74b6d72650d42d03bb2d139834556b5 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 22 Jul 2024 20:31:15 -0500
Subject: [PATCH 22/82] adw-breakpoint: Fix bug when setting template prop

When a breakpoint setter's target object was the template, the compiler
failed with an assertion error. Fixed by allowing TemplateType objects
there. The assertion is still needed to make the type checker happy.
---
 blueprintcompiler/language/adw_breakpoint.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/language/adw_breakpoint.py b/blueprintcompiler/language/adw_breakpoint.py
index aec4ab5..4927c11 100644
--- a/blueprintcompiler/language/adw_breakpoint.py
+++ b/blueprintcompiler/language/adw_breakpoint.py
@@ -98,7 +98,9 @@ class AdwBreakpointSetter(AstNode):
             and not isinstance(self.gir_class, ExternType)
             and self.property_name is not None
         ):
-            assert isinstance(self.gir_class, gir.Class)
+            assert isinstance(self.gir_class, gir.Class) or isinstance(
+                self.gir_class, gir.TemplateType
+            )
             return self.gir_class.properties.get(self.property_name)
         else:
             return None

From d0659a43c206f8237d8ad18a43a19300cb0d01ff Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 22 Jul 2024 20:38:28 -0500
Subject: [PATCH 23/82] Add test for recent bugfix

---
 tests/samples/adw_breakpoint_template.blp | 10 ++++++++++
 tests/samples/adw_breakpoint_template.ui  | 16 ++++++++++++++++
 tests/test_samples.py                     |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 tests/samples/adw_breakpoint_template.blp
 create mode 100644 tests/samples/adw_breakpoint_template.ui

diff --git a/tests/samples/adw_breakpoint_template.blp b/tests/samples/adw_breakpoint_template.blp
new file mode 100644
index 0000000..9561e7a
--- /dev/null
+++ b/tests/samples/adw_breakpoint_template.blp
@@ -0,0 +1,10 @@
+using Gtk 4.0;
+using Adw 1;
+
+template $MyTemplate {
+  Adw.Breakpoint {
+    setters {
+      template.some-prop: true;
+    }
+  }
+}
diff --git a/tests/samples/adw_breakpoint_template.ui b/tests/samples/adw_breakpoint_template.ui
new file mode 100644
index 0000000..e16d9ae
--- /dev/null
+++ b/tests/samples/adw_breakpoint_template.ui
@@ -0,0 +1,16 @@
+<?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"/>
+  <template class="MyTemplate">
+    <child>
+      <object class="AdwBreakpoint">
+        <setter object="MyTemplate" property="some-prop">true</setter>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index fc7d0b8..967be0d 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -176,6 +176,7 @@ class TestSamples(unittest.TestCase):
             REQUIRE_ADW_1_5 = ["adw_alertdialog_responses"]
 
             SKIP_RUN = [
+                "adw_breakpoint_template",
                 "expr_closure",
                 "expr_closure_args",
                 "parseable",

From 3a712af4ddf1d42def1f1d1d9560c7b860a461eb Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 26 Jul 2024 21:08:50 -0500
Subject: [PATCH 24/82] Fix crash with bad escape sequence in string array

Invalid escape sequences aren't a fatal parser error, so the AST can be
built even when one is present, in which case the string token is None.
---
 blueprintcompiler/language/values.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 73a1084..9b29d94 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -424,7 +424,8 @@ class ArrayValue(AstNode):
                 ):
                     quoted_literal = value.child.value
                     literal_value = quoted_literal.value
-                    if "\n" in literal_value:
+                    # literal_value can be None if there's an invalid escape sequence
+                    if literal_value is not None and "\n" in literal_value:
                         errors.append(
                             CompileError(
                                 "String literals inside arrays can't contain newlines",

From 24eed1048e10b6daef4166c5b9e109d669eb3a6c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 26 Jul 2024 21:38:17 -0500
Subject: [PATCH 25/82] gir: Fix assignable_to for template types

If we don't know the template's parent type, we should be able to assign
it to an extern type, since we don't know anything about that either.
---
 blueprintcompiler/gir.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 029fe58..459086e 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -721,7 +721,7 @@ class TemplateType(GirType):
             # we don't know the template type's interfaces, assume yes
             return True
         elif self.parent is None or isinstance(self.parent, ExternType):
-            return isinstance(other, Class)
+            return isinstance(other, Class) or isinstance(other, ExternType)
         else:
             return self.parent.assignable_to(other)
 

From 8dfa10019bd8302bee10217cb66a812de747e526 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 26 Jul 2024 21:50:50 -0500
Subject: [PATCH 26/82] lsp: Fix online docs links for interfaces

---
 blueprintcompiler/gir.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 459086e..9bcde22 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -549,7 +549,7 @@ class Interface(GirNode, GirType):
     @property
     def online_docs(self) -> T.Optional[str]:
         if ns := self.get_containing(Namespace).online_docs:
-            return f"{ns}interface.{self.name}.html"
+            return f"{ns}iface.{self.name}.html"
         else:
             return None
 

From 8d734f7bbd5216db3a79bda94fb2d717be953b72 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 26 Jul 2024 21:51:26 -0500
Subject: [PATCH 27/82] lsp: Add hover docs for lookup expression props

---
 blueprintcompiler/language/expression.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 10426fa..4c13b21 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -130,6 +130,17 @@ class LookupOp(InfixExpr):
 
         return None
 
+    @docs("property")
+    def property_docs(self):
+        if not (
+            isinstance(self.lhs.type, gir.Class)
+            or isinstance(self.lhs.type, gir.Interface)
+        ):
+            return None
+
+        if property := self.lhs.type.properties.get(self.property_name):
+            return property.doc
+
     @validate("property")
     def property_exists(self):
         if self.lhs.type is None:

From 9570dceaa8fd74b164b546aaf019f8388a9573a7 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 26 Jul 2024 22:08:22 -0500
Subject: [PATCH 28/82] errors: In suggestions, use "insert" or "remove"

Previously it always said "replace", leading to incorrect wording.
---
 blueprintcompiler/errors.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 01058fd..a799e80 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -113,9 +113,17 @@ at {filename} line {line_num} column {col_num}:
                 if action.edit_range is not None
                 else self.range.text
             )
-            stream.write(
-                f"suggestion: replace {Colors.RED}{old}{Colors.CLEAR} with {Colors.GREEN}{action.replace_with}{Colors.CLEAR}\n"
-            )
+
+            if old == "":
+                stream.write(
+                    f"suggestion: insert {Colors.GREEN}{action.replace_with}{Colors.CLEAR}\n"
+                )
+            elif action.replace_with == "":
+                stream.write(f"suggestion: remove {Colors.RED}{old}{Colors.CLEAR}\n")
+            else:
+                stream.write(
+                    f"suggestion: replace {Colors.RED}{old}{Colors.CLEAR} with {Colors.GREEN}{action.replace_with}{Colors.CLEAR}\n"
+                )
 
         for ref in self.references:
             line_num, col_num = utils.idx_to_pos(ref.range.start + 1, code)

From 2dcf0c154bf016495999a311d3ea3523ed26adee Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 26 Jul 2024 22:13:51 -0500
Subject: [PATCH 29/82] errors: Fix caret when tabs are present

Replace all tabs with two spaces and account for that when positioning
the caret under the error location.
---
 blueprintcompiler/errors.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index a799e80..d6d57dd 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -98,10 +98,13 @@ class CompileError(PrintableError):
         # Display 1-based line numbers
         line_num += 1
 
+        removed_tabs = line.count("\t", 0, col_num - 1)
+        line = line.replace("\t", "  ")
+
         stream.write(
             f"""{self.color}{Colors.BOLD}{self.category}: {self.message}{Colors.CLEAR}
 at {filename} line {line_num} column {col_num}:
-{Colors.FAINT}{line_num :>4} |{Colors.CLEAR}{line.rstrip()}\n     {Colors.FAINT}|{" "*(col_num-1)}^{Colors.CLEAR}\n"""
+{Colors.FAINT}{line_num :>4} |{Colors.CLEAR}{line.rstrip()}\n     {Colors.FAINT}|{" "*(col_num-1+removed_tabs)}^{Colors.CLEAR}\n"""
         )
 
         for hint in self.hints:

From ea4c7245be6f1b355b9ae9629d9ce9d60e7d2f07 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 26 Jul 2024 22:35:04 -0500
Subject: [PATCH 30/82] errors: Show error length with carets

Use multiple carets to show the span of the error (up to the end of the
first line), rather than just a caret on the first character.
---
 blueprintcompiler/errors.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index d6d57dd..1e7297c 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -93,18 +93,28 @@ class CompileError(PrintableError):
         assert self.range is not None
 
         line_num, col_num = utils.idx_to_pos(self.range.start + 1, code)
+        end_line_num, end_col_num = utils.idx_to_pos(self.range.end + 1, code)
         line = code.splitlines(True)[line_num] if code != "" else ""
 
         # Display 1-based line numbers
         line_num += 1
+        end_line_num += 1
 
-        removed_tabs = line.count("\t", 0, col_num - 1)
+        n_spaces = col_num - 1
+        n_carets = (
+            (end_col_num - col_num)
+            if line_num == end_line_num
+            else (len(line) - n_spaces - 1)
+        )
+
+        n_spaces += line.count("\t", 0, col_num)
+        n_carets += line.count("\t", col_num, col_num + n_carets)
         line = line.replace("\t", "  ")
 
         stream.write(
             f"""{self.color}{Colors.BOLD}{self.category}: {self.message}{Colors.CLEAR}
 at {filename} line {line_num} column {col_num}:
-{Colors.FAINT}{line_num :>4} |{Colors.CLEAR}{line.rstrip()}\n     {Colors.FAINT}|{" "*(col_num-1+removed_tabs)}^{Colors.CLEAR}\n"""
+{Colors.FAINT}{line_num :>4} |{Colors.CLEAR}{line.rstrip()}\n     {Colors.FAINT}|{" "*n_spaces}{"^"*n_carets}{Colors.CLEAR}\n"""
         )
 
         for hint in self.hints:

From c1a82a034b20ae659d010f550e6c01ed6c547e20 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 6 Apr 2024 13:36:22 -0500
Subject: [PATCH 31/82] decompiler: Add more decompilable tags

Add more tags to the list of things the decompiler can handle. This
required some changes to track the containing object class in the
DecompileCtx, since some objects use the same tag names.

The improved support means we can test the decompiler on most of the
test suite. Any new test samples will by default be tested to ensure the
decompiler produces the original blueprint file.

Also, updated the decompiler to always use double quotes.
---
 blueprintcompiler/decompiler.py               | 124 +++++++++++++-----
 blueprintcompiler/gir.py                      |   4 +
 blueprintcompiler/language/binding.py         |   6 +
 blueprintcompiler/language/expression.py      |  68 +++++++++-
 blueprintcompiler/language/gobject_object.py  |   3 +-
 .../language/gtk_combo_box_text.py            |  26 ++++
 blueprintcompiler/language/gtk_menu.py        |   2 +-
 blueprintcompiler/language/gtk_size_group.py  |  10 ++
 blueprintcompiler/language/gtk_string_list.py |  22 ++++
 blueprintcompiler/utils.py                    |   6 +-
 tests/samples/accessibility.blp               |   2 +-
 tests/samples/accessibility_dec.blp           |   2 +-
 tests/samples/action_widgets.blp              |  32 ++---
 tests/samples/adw_alertdialog_responses.blp   |   8 +-
 tests/samples/adw_messagedialog_responses.blp |   8 +-
 tests/samples/expr_closure.blp                |   2 +-
 tests/samples/expr_closure_args.blp           |   4 +-
 tests/samples/expr_closure_dec.blp            |   5 +
 tests/samples/expr_lookup.blp                 |   2 +-
 tests/samples/file_filter.blp                 |  10 +-
 tests/samples/issue_119.blp                   |   2 +-
 tests/samples/issue_119_dec.blp               |   5 +
 tests/samples/layout_dec.blp                  |   4 +-
 tests/samples/list_factory.blp                |  16 +--
 tests/samples/menu_dec.blp                    |  16 +--
 tests/samples/multiline_string_dec.blp        |   5 +
 tests/samples/numbers_dec.blp                 |   8 ++
 tests/samples/parseable.blp                   |   4 +-
 tests/samples/scale_marks.blp                 |   2 +-
 tests/samples/size_group.blp                  |   7 +-
 tests/samples/string_array.blp                |   8 +-
 tests/samples/string_list.blp                 |   2 +-
 tests/samples/strings_dec.blp                 |   2 +-
 tests/samples/style.blp                       |   5 +-
 tests/samples/subscope.blp                    |   2 +-
 tests/samples/template.blp                    |   4 +-
 tests/samples/template_bind_property.blp      |   2 +-
 tests/samples/template_binding.blp            |   4 +-
 tests/samples/template_binding_extern.blp     |   4 +-
 tests/samples/template_id.blp                 |   4 +-
 tests/samples/template_id_dec.blp             |   5 +
 tests/samples/template_no_parent.blp          |   2 +-
 tests/samples/template_orphan.blp             |   2 +-
 tests/samples/template_simple_binding.blp     |   2 +-
 tests/samples/translated.blp                  |   4 +-
 tests/samples/translation_domain.blp          |   1 -
 tests/samples/typeof.blp                      |   2 +-
 tests/samples/unchecked_class_dec.blp         |   2 +-
 tests/test_samples.py                         |  75 ++++++-----
 49 files changed, 396 insertions(+), 151 deletions(-)
 create mode 100644 tests/samples/expr_closure_dec.blp
 create mode 100644 tests/samples/issue_119_dec.blp
 create mode 100644 tests/samples/multiline_string_dec.blp
 create mode 100644 tests/samples/numbers_dec.blp
 create mode 100644 tests/samples/template_id_dec.blp

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 483d6f6..845a88d 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -17,8 +17,8 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-import re
 import typing as T
+from collections import defaultdict
 from dataclasses import dataclass
 from enum import Enum
 
@@ -30,7 +30,7 @@ from .xml_reader import Element, parse, parse_string
 __all__ = ["decompile"]
 
 
-_DECOMPILERS: T.Dict = {}
+_DECOMPILERS: dict[str, list] = defaultdict(list)
 _CLOSING = {
     "{": "}",
     "[": "]",
@@ -54,24 +54,25 @@ class DecompileCtx:
     def __init__(self) -> None:
         self._result: str = ""
         self.gir = GirContext()
-        self._indent: int = 0
         self._blocks_need_end: T.List[str] = []
         self._last_line_type: LineType = LineType.NONE
         self.template_class: T.Optional[str] = None
+        self._obj_type_stack: list[T.Optional[GirType]] = []
+        self._node_stack: list[Element] = []
 
         self.gir.add_namespace(get_namespace("Gtk", "4.0"))
 
     @property
     def result(self) -> str:
-        imports = "\n".join(
+        import_lines = sorted(
             [
                 f"using {ns} {namespace.version};"
                 for ns, namespace in self.gir.namespaces.items()
+                if ns != "Gtk"
             ]
         )
-        full_string = imports + "\n" + self._result
-        formatted_string = formatter.format(full_string)
-        return formatted_string
+        full_string = "\n".join(["using Gtk 4.0;", *import_lines]) + self._result
+        return formatter.format(full_string)
 
     def type_by_cname(self, cname: str) -> T.Optional[GirType]:
         if type := self.gir.get_type_by_cname(cname):
@@ -90,10 +91,26 @@ class DecompileCtx:
 
     def start_block(self) -> None:
         self._blocks_need_end.append("")
+        self._obj_type_stack.append(None)
 
     def end_block(self) -> None:
         if close := self._blocks_need_end.pop():
             self.print(close)
+        self._obj_type_stack.pop()
+
+    @property
+    def current_obj_type(self) -> T.Optional[GirType]:
+        return next((x for x in reversed(self._obj_type_stack) if x is not None), None)
+
+    def push_obj_type(self, type: T.Optional[GirType]) -> None:
+        self._obj_type_stack[-1] = type
+
+    @property
+    def current_node(self) -> T.Optional[Element]:
+        if len(self._node_stack) == 0:
+            return None
+        else:
+            return self._node_stack[-1]
 
     def end_block_with(self, text: str) -> None:
         self._blocks_need_end[-1] = text
@@ -105,7 +122,7 @@ class DecompileCtx:
             if len(self._blocks_need_end):
                 self._blocks_need_end[-1] = _CLOSING[line[-1]]
 
-    def print_attribute(self, name: str, value: str, type: GirType) -> None:
+    def print_value(self, value: str, type: T.Optional[GirType]) -> None:
         def get_enum_name(value):
             for member in type.members.values():
                 if (
@@ -117,12 +134,14 @@ class DecompileCtx:
             return value.replace("-", "_")
 
         if type is None:
-            self.print(f"{name}: {escape_quote(value)};")
+            self.print(f"{escape_quote(value)}")
         elif type.assignable_to(FloatType()):
-            self.print(f"{name}: {value};")
+            self.print(str(value))
         elif type.assignable_to(BoolType()):
             val = truthy(value)
-            self.print(f"{name}: {'true' if val else 'false'};")
+            self.print("true" if val else "false")
+        elif type.assignable_to(ArrayType(StringType())):
+            self.print(f"[{', '.join([escape_quote(x) for x in value.split('\n')])}]")
         elif (
             type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gdk.Pixbuf"))
             or type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gdk.Texture"))
@@ -136,30 +155,42 @@ class DecompileCtx:
                 self.gir.namespaces["Gtk"].lookup_type("Gtk.ShortcutTrigger")
             )
         ):
-            self.print(f"{name}: {escape_quote(value)};")
+            self.print(f"{escape_quote(value)}")
         elif value == self.template_class:
-            self.print(f"{name}: template;")
+            self.print("template")
         elif type.assignable_to(
             self.gir.namespaces["Gtk"].lookup_type("GObject.Object")
-        ):
-            self.print(f"{name}: {value};")
+        ) or isinstance(type, Interface):
+            self.print(value)
         elif isinstance(type, Bitfield):
             flags = [get_enum_name(flag) for flag in value.split("|")]
-            self.print(f"{name}: {' | '.join(flags)};")
+            self.print(" | ".join(flags))
         elif isinstance(type, Enumeration):
-            self.print(f"{name}: {get_enum_name(value)};")
+            self.print(get_enum_name(value))
+        elif isinstance(type, TypeType):
+            if t := self.type_by_cname(value):
+                self.print(f"typeof<{full_name(t)}>")
+            else:
+                self.print(f"typeof<${value}>")
         else:
-            self.print(f"{name}: {escape_quote(value)};")
+            self.print(f"{escape_quote(value)}")
+
+    def print_attribute(self, name: str, value: str, type: GirType) -> None:
+        self.print(f"{name}: ")
+        self.print_value(value, type)
+        self.print(";")
 
 
-def _decompile_element(
+def decompile_element(
     ctx: DecompileCtx, gir: T.Optional[GirContext], xml: Element
 ) -> None:
     try:
-        decompiler = _DECOMPILERS.get(xml.tag)
-        if decompiler is None:
+        decompilers = [d for d in _DECOMPILERS[xml.tag] if d._filter(ctx)]
+        if len(decompilers) == 0:
             raise UnsupportedError(f"unsupported XML tag: <{xml.tag}>")
 
+        decompiler = decompilers[0]
+
         args: T.Dict[str, T.Optional[str]] = {
             canon(name): value for name, value in xml.attrs.items()
         }
@@ -169,13 +200,16 @@ def _decompile_element(
             else:
                 args["cdata"] = xml.cdata
 
+        ctx._node_stack.append(xml)
         ctx.start_block()
         gir = decompiler(ctx, gir, **args)
 
-        for child in xml.children:
-            _decompile_element(ctx, gir, child)
+        if not decompiler._skip_children:
+            for child in xml.children:
+                decompile_element(ctx, gir, child)
 
         ctx.end_block()
+        ctx._node_stack.pop()
 
     except UnsupportedError as e:
         raise e
@@ -187,7 +221,7 @@ def decompile(data: str) -> str:
     ctx = DecompileCtx()
 
     xml = parse(data)
-    _decompile_element(ctx, None, xml)
+    decompile_element(ctx, None, xml)
 
     return ctx.result
 
@@ -196,7 +230,7 @@ def decompile_string(data):
     ctx = DecompileCtx()
 
     xml = parse_string(data)
-    _decompile_element(ctx, None, xml)
+    decompile_element(ctx, None, xml)
 
     return ctx.result
 
@@ -212,7 +246,7 @@ def truthy(string: str) -> bool:
     return string.lower() in ["yes", "true", "t", "y", "1"]
 
 
-def full_name(gir) -> str:
+def full_name(gir: GirType) -> str:
     return gir.name if gir.full_name.startswith("Gtk.") else gir.full_name
 
 
@@ -223,17 +257,43 @@ def lookup_by_cname(gir, cname: str) -> T.Optional[GirType]:
         return gir.get_containing(Repository).get_type_by_cname(cname)
 
 
-def decompiler(tag, cdata=False):
+def decompiler(
+    tag,
+    cdata=False,
+    parent_type: T.Optional[str] = None,
+    parent_tag: T.Optional[str] = None,
+    skip_children=False,
+):
     def decorator(func):
         func._cdata = cdata
-        _DECOMPILERS[tag] = func
+        func._skip_children = skip_children
+
+        def filter(ctx):
+            if parent_type is not None:
+                if (
+                    ctx.current_obj_type is None
+                    or ctx.current_obj_type.full_name != parent_type
+                ):
+                    return False
+
+            if parent_tag is not None:
+                if not any(x.tag == parent_tag for x in ctx._node_stack):
+                    return False
+
+            return True
+
+        func._filter = filter
+
+        _DECOMPILERS[tag].append(func)
         return func
 
     return decorator
 
 
 @decompiler("interface")
-def decompile_interface(ctx, gir):
+def decompile_interface(ctx, gir, domain=None):
+    if domain is not None:
+        ctx.print(f"translation-domain {escape_quote(domain)};")
     return gir
 
 
@@ -284,7 +344,7 @@ def decompile_property(
         ctx.print(f"/* Translators: {comments} */")
 
     if cdata is None:
-        ctx.print(f"{name}: ", False)
+        ctx.print(f"{name}: ")
         ctx.end_block_with(";")
     elif bind_source:
         flags = ""
@@ -295,6 +355,10 @@ def decompile_property(
             flags += " inverted"
         if "bidirectional" in bind_flags:
             flags += " bidirectional"
+
+        if bind_source == ctx.template_class:
+            bind_source = "template"
+
         ctx.print(f"{name}: bind {bind_source}.{bind_property}{flags};")
     elif truthy(translatable):
         comments, translatable = decompile_translatable(
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 9bcde22..30a5eaa 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -904,6 +904,10 @@ class Namespace(GirNode):
 
     def get_type_by_cname(self, cname: str) -> T.Optional[GirType]:
         """Gets a type from this namespace by its C name."""
+        for basic in _BASIC_TYPES.values():
+            if basic.glib_type_name == cname:
+                return basic()
+
         for item in self.entries.values():
             if (
                 hasattr(item, "cname")
diff --git a/blueprintcompiler/language/binding.py b/blueprintcompiler/language/binding.py
index 86beec0..3b9af97 100644
--- a/blueprintcompiler/language/binding.py
+++ b/blueprintcompiler/language/binding.py
@@ -107,3 +107,9 @@ class SimpleBinding:
     no_sync_create: bool = False
     bidirectional: bool = False
     inverted: bool = False
+
+
+@decompiler("binding")
+def decompile_binding(ctx: DecompileCtx, gir: gir.GirContext, name: str):
+    ctx.end_block_with(";")
+    ctx.print(f"{name}: bind ")
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 4c13b21..117fd30 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -18,9 +18,9 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
+from ..decompiler import decompile_element
 from .common import *
 from .contexts import ScopeCtx, ValueTypeCtx
-from .gtkbuilder_template import Template
 from .types import TypeName
 
 expr = Sequence()
@@ -274,3 +274,69 @@ expr.children = [
     AnyOf(ClosureExpr, LiteralExpr, ["(", Expression, ")"]),
     ZeroOrMore(AnyOf(LookupOp, CastExpr)),
 ]
+
+
+@decompiler("lookup", skip_children=True, cdata=True)
+def decompile_lookup(
+    ctx: DecompileCtx, gir: gir.GirContext, cdata: str, name: str, type: str
+):
+    if t := ctx.type_by_cname(type):
+        type = decompile.full_name(t)
+    else:
+        type = "$" + type
+
+    assert ctx.current_node is not None
+
+    constant = None
+    if len(ctx.current_node.children) == 0:
+        constant = cdata
+    elif (
+        len(ctx.current_node.children) == 1
+        and ctx.current_node.children[0].tag == "constant"
+    ):
+        constant = ctx.current_node.children[0].cdata
+
+    if constant is not None:
+        if constant == ctx.template_class:
+            ctx.print("template." + name)
+        else:
+            ctx.print(constant + "." + name)
+        return
+    else:
+        for child in ctx.current_node.children:
+            decompile.decompile_element(ctx, gir, child)
+
+    ctx.print(f" as <{type}>.{name}")
+
+
+@decompiler("constant", cdata=True)
+def decompile_constant(
+    ctx: DecompileCtx, gir: gir.GirContext, cdata: str, type: T.Optional[str] = None
+):
+    if type is None:
+        if cdata == ctx.template_class:
+            ctx.print("template")
+        else:
+            ctx.print(cdata)
+    else:
+        ctx.print_value(cdata, ctx.type_by_cname(type))
+
+
+@decompiler("closure", skip_children=True)
+def decompile_closure(ctx: DecompileCtx, gir: gir.GirContext, function: str, type: str):
+    if t := ctx.type_by_cname(type):
+        type = decompile.full_name(t)
+    else:
+        type = "$" + type
+
+    ctx.print(f"${function}(")
+
+    assert ctx.current_node is not None
+    for i, node in enumerate(ctx.current_node.children):
+        decompile_element(ctx, gir, node)
+
+        assert ctx.current_node is not None
+        if i < len(ctx.current_node.children) - 1:
+            ctx.print(", ")
+
+    ctx.end_block_with(f") as <{type}>")
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 2fdbb6a..54cb297 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -115,7 +115,7 @@ def validate_parent_type(node, ns: str, name: str, err_msg: str):
 
 
 @decompiler("object")
-def decompile_object(ctx, gir, klass, id=None):
+def decompile_object(ctx: DecompileCtx, gir, klass, id=None):
     gir_class = ctx.type_by_cname(klass)
     klass_name = (
         decompile.full_name(gir_class) if gir_class is not None else "$" + klass
@@ -124,4 +124,5 @@ def decompile_object(ctx, gir, klass, id=None):
         ctx.print(f"{klass_name} {{")
     else:
         ctx.print(f"{klass_name} {id} {{")
+    ctx.push_obj_type(gir_class)
     return gir_class
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index e514e4a..3a0d7c7 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -89,3 +89,29 @@ class ExtComboBoxItems(AstNode):
 )
 def items_completer(lsp, ast_node, match_variables):
     yield Completion("items", CompletionItemKind.Snippet, snippet="items [$0]")
+
+
+@decompiler("items", parent_type="Gtk.ComboBoxText")
+def decompile_items(ctx: DecompileCtx, gir: gir.GirContext):
+    ctx.print("items [")
+
+
+@decompiler("item", parent_type="Gtk.ComboBoxText", cdata=True)
+def decompile_item(
+    ctx: DecompileCtx,
+    gir: gir.GirContext,
+    cdata: str,
+    id: T.Optional[str] = None,
+    translatable="false",
+    comments=None,
+    context=None,
+):
+    comments, translatable = decompile_translatable(
+        cdata, translatable, context, comments
+    )
+    if comments:
+        ctx.print(comments)
+    if id:
+        ctx.print(f"{id}: ")
+    ctx.print(translatable)
+    ctx.print(",")
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 4b940af..a77484a 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -266,7 +266,7 @@ def decompile_submenu(ctx, gir, id=None):
         ctx.print("submenu {")
 
 
-@decompiler("item")
+@decompiler("item", parent_tag="menu")
 def decompile_item(ctx, gir, id=None):
     if id:
         ctx.print(f"item {id} {{")
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index baa4c30..0945e69 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -96,3 +96,13 @@ class ExtSizeGroupWidgets(AstNode):
 )
 def size_group_completer(lsp, ast_node, match_variables):
     yield Completion("widgets", CompletionItemKind.Snippet, snippet="widgets [$0]")
+
+
+@decompiler("widgets")
+def size_group_decompiler(ctx, gir: gir.GirContext):
+    ctx.print("widgets [")
+
+
+@decompiler("widget")
+def widget_decompiler(ctx, gir: gir.GirContext, name: str):
+    ctx.print(name + ",")
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index be01262..36a01f6 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -73,3 +73,25 @@ class ExtStringListStrings(AstNode):
 )
 def strings_completer(lsp, ast_node, match_variables):
     yield Completion("strings", CompletionItemKind.Snippet, snippet="strings [$0]")
+
+
+@decompiler("items", parent_type="Gtk.StringList")
+def decompile_strings(ctx: DecompileCtx, gir: gir.GirContext):
+    ctx.print("strings [")
+
+
+@decompiler("item", cdata=True, parent_type="Gtk.StringList")
+def decompile_item(
+    ctx: DecompileCtx,
+    gir: gir.GirContext,
+    translatable="false",
+    comments=None,
+    context=None,
+    cdata=None,
+):
+    comments, translatable = decompile_translatable(
+        cdata, translatable, context, comments
+    )
+    if comments is not None:
+        ctx.print(comments)
+    ctx.print(translatable + ",")
diff --git a/blueprintcompiler/utils.py b/blueprintcompiler/utils.py
index 6f2bd40..ea8102e 100644
--- a/blueprintcompiler/utils.py
+++ b/blueprintcompiler/utils.py
@@ -109,14 +109,14 @@ class UnescapeError(Exception):
 
 def escape_quote(string: str) -> str:
     return (
-        "'"
+        '"'
         + (
             string.replace("\\", "\\\\")
-            .replace("'", "\\'")
+            .replace('"', '\\"')
             .replace("\n", "\\n")
             .replace("\t", "\\t")
         )
-        + "'"
+        + '"'
     )
 
 
diff --git a/tests/samples/accessibility.blp b/tests/samples/accessibility.blp
index ec563b4..e9f7fc1 100644
--- a/tests/samples/accessibility.blp
+++ b/tests/samples/accessibility.blp
@@ -7,5 +7,5 @@ Gtk.Box {
     checked: true;
   }
 }
-Gtk.Label my_label {}
 
+Gtk.Label my_label {}
diff --git a/tests/samples/accessibility_dec.blp b/tests/samples/accessibility_dec.blp
index 4a370cb..9a2643c 100644
--- a/tests/samples/accessibility_dec.blp
+++ b/tests/samples/accessibility_dec.blp
@@ -2,7 +2,7 @@ using Gtk 4.0;
 
 Box {
   accessibility {
-    label: _('Hello, world!');
+    label: _("Hello, world!");
     labelled-by: my_label;
     checked: true;
   }
diff --git a/tests/samples/action_widgets.blp b/tests/samples/action_widgets.blp
index 2d4d6ae..98601f2 100644
--- a/tests/samples/action_widgets.blp
+++ b/tests/samples/action_widgets.blp
@@ -1,25 +1,25 @@
 using Gtk 4.0;
 
 Dialog {
-    [action response=cancel]
-    Button cancel_button {
-        label: _("Cancel");
-    }
+  [action response=cancel]
+  Button cancel_button {
+    label: _("Cancel");
+  }
 
-    [action response=9]
-    Button custom_response_button {
-        label: _("Reinstall Windows");
-    }
+  [action response=9]
+  Button custom_response_button {
+    label: _("Reinstall Windows");
+  }
 
-    [action response=ok default]
-    Button ok_button {
-        label: _("Ok");
-    }
+  [action response=ok default]
+  Button ok_button {
+    label: _("Ok");
+  }
 }
 
 InfoBar {
-    [action response=ok]
-    Button ok_info_button {
-        label: _("Ok");
-    }
+  [action response=ok]
+  Button ok_info_button {
+    label: _("Ok");
+  }
 }
diff --git a/tests/samples/adw_alertdialog_responses.blp b/tests/samples/adw_alertdialog_responses.blp
index 6680aa6..eefe951 100644
--- a/tests/samples/adw_alertdialog_responses.blp
+++ b/tests/samples/adw_alertdialog_responses.blp
@@ -3,8 +3,8 @@ using Adw 1;
 
 Adw.AlertDialog {
   responses [
-    cancel: _('Cancel'),
-    discard: _('Discard') destructive,
-    save: 'Save' suggested disabled,
+    cancel: _("Cancel"),
+    discard: _("Discard") destructive,
+    save: "Save" suggested disabled,
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/samples/adw_messagedialog_responses.blp b/tests/samples/adw_messagedialog_responses.blp
index be8c03b..5b35842 100644
--- a/tests/samples/adw_messagedialog_responses.blp
+++ b/tests/samples/adw_messagedialog_responses.blp
@@ -3,8 +3,8 @@ using Adw 1;
 
 Adw.MessageDialog {
   responses [
-    cancel: _('Cancel'),
-    discard: _('Discard') destructive,
-    save: 'Save' suggested disabled,
+    cancel: _("Cancel"),
+    discard: _("Discard") destructive,
+    save: "Save" suggested disabled,
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/samples/expr_closure.blp b/tests/samples/expr_closure.blp
index 81c3f2c..a67403e 100644
--- a/tests/samples/expr_closure.blp
+++ b/tests/samples/expr_closure.blp
@@ -2,4 +2,4 @@ using Gtk 4.0;
 
 Label my-label {
   label: bind ($my-closure(my-label.margin-bottom)) as <string>;
-}
\ No newline at end of file
+}
diff --git a/tests/samples/expr_closure_args.blp b/tests/samples/expr_closure_args.blp
index 5699094..136fb0c 100644
--- a/tests/samples/expr_closure_args.blp
+++ b/tests/samples/expr_closure_args.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 Label {
-  label: bind $my-closure (true, 10, "Hello") as <string>;
-}
\ No newline at end of file
+  label: bind $my-closure(true, 10, "Hello") as <string>;
+}
diff --git a/tests/samples/expr_closure_dec.blp b/tests/samples/expr_closure_dec.blp
new file mode 100644
index 0000000..ff6069e
--- /dev/null
+++ b/tests/samples/expr_closure_dec.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label my-label {
+  label: bind $my-closure(my-label.margin-bottom) as <string>;
+}
diff --git a/tests/samples/expr_lookup.blp b/tests/samples/expr_lookup.blp
index 12e2de1..679f600 100644
--- a/tests/samples/expr_lookup.blp
+++ b/tests/samples/expr_lookup.blp
@@ -5,5 +5,5 @@ Overlay {
 }
 
 Label {
-  label: bind (label.parent) as <Overlay>.child as <Label>.label;
+  label: bind label.parent as <Overlay>.child as <Label>.label;
 }
diff --git a/tests/samples/file_filter.blp b/tests/samples/file_filter.blp
index e9866d9..3a52c3f 100644
--- a/tests/samples/file_filter.blp
+++ b/tests/samples/file_filter.blp
@@ -1,18 +1,18 @@
 using Gtk 4.0;
 
 FileFilter {
-  name: 'File Filter Name';
+  name: "File Filter Name";
 
   mime-types [
-    'text/plain',
-    'image/ *',
+    "text/plain",
+    "image/ *",
   ]
 
   patterns [
-    '*.txt',
+    "*.txt",
   ]
 
   suffixes [
-    'png',
+    "png",
   ]
 }
diff --git a/tests/samples/issue_119.blp b/tests/samples/issue_119.blp
index 145a9f8..7a42fd9 100644
--- a/tests/samples/issue_119.blp
+++ b/tests/samples/issue_119.blp
@@ -2,4 +2,4 @@ using Gtk 4.0;
 
 Adjustment {
   value: bind 1.0 as <double>;
-}
\ No newline at end of file
+}
diff --git a/tests/samples/issue_119_dec.blp b/tests/samples/issue_119_dec.blp
new file mode 100644
index 0000000..2d648b0
--- /dev/null
+++ b/tests/samples/issue_119_dec.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Adjustment {
+  value: bind 1;
+}
diff --git a/tests/samples/layout_dec.blp b/tests/samples/layout_dec.blp
index 3754fe1..b0e66e0 100644
--- a/tests/samples/layout_dec.blp
+++ b/tests/samples/layout_dec.blp
@@ -3,8 +3,8 @@ using Gtk 4.0;
 Grid {
   Label {
     layout {
-      column: '0';
-      row: '1';
+      column: "0";
+      row: "1";
     }
   }
 }
diff --git a/tests/samples/list_factory.blp b/tests/samples/list_factory.blp
index 27c65f2..4d13881 100644
--- a/tests/samples/list_factory.blp
+++ b/tests/samples/list_factory.blp
@@ -1,11 +1,11 @@
 using Gtk 4.0;
 
 Gtk.ListView {
-    factory: Gtk.BuilderListItemFactory list_item_factory {
-        template ListItem {
-            child: Label {
-                label: bind template.item as <$MyObject>.name;
-            };
-        }
-    };
-}
\ No newline at end of file
+  factory: Gtk.BuilderListItemFactory list_item_factory {
+    template ListItem {
+      child: Label {
+        label: bind template.item as <$MyObject>.name;
+      };
+    }
+  };
+}
diff --git a/tests/samples/menu_dec.blp b/tests/samples/menu_dec.blp
index 44c244f..14b4df3 100644
--- a/tests/samples/menu_dec.blp
+++ b/tests/samples/menu_dec.blp
@@ -3,26 +3,26 @@ using Gtk 4.0;
 menu my-menu {
   submenu {
     section {
-      label: 'test section';
+      label: "test section";
     }
 
     item {
-      label: C_('context', 'test translated item');
+      label: C_("context", "test translated item");
     }
 
     item {
-      label: 'test item shorthand 1';
+      label: "test item shorthand 1";
     }
 
     item {
-      label: 'test item shorthand 2';
-      action: 'app.test-action';
+      label: "test item shorthand 2";
+      action: "app.test-action";
     }
 
     item {
-      label: 'test item shorthand 3';
-      action: 'app.test-action';
-      icon: 'test-symbolic';
+      label: "test item shorthand 3";
+      action: "app.test-action";
+      icon: "test-symbolic";
     }
   }
 }
diff --git a/tests/samples/multiline_string_dec.blp b/tests/samples/multiline_string_dec.blp
new file mode 100644
index 0000000..a5fd0e7
--- /dev/null
+++ b/tests/samples/multiline_string_dec.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: "Hello,\nworld!";
+}
diff --git a/tests/samples/numbers_dec.blp b/tests/samples/numbers_dec.blp
new file mode 100644
index 0000000..998e0aa
--- /dev/null
+++ b/tests/samples/numbers_dec.blp
@@ -0,0 +1,8 @@
+using Gtk 4.0;
+
+Label {
+  xalign: 0.5;
+  yalign: 0;
+  height-request: 1000000;
+  margin-top: 48;
+}
diff --git a/tests/samples/parseable.blp b/tests/samples/parseable.blp
index 5320baf..3c7c8c2 100644
--- a/tests/samples/parseable.blp
+++ b/tests/samples/parseable.blp
@@ -1,6 +1,6 @@
 using Gtk 4.0;
 
-Gtk.Shortcut {
+Shortcut {
   trigger: "Escape";
 }
 
@@ -10,4 +10,4 @@ Picture {
 
 ColorButton {
   rgba: "rgb(0, 0, 0)";
-}
\ No newline at end of file
+}
diff --git a/tests/samples/scale_marks.blp b/tests/samples/scale_marks.blp
index f75930c..a766cfa 100644
--- a/tests/samples/scale_marks.blp
+++ b/tests/samples/scale_marks.blp
@@ -3,7 +3,7 @@ using Gtk 4.0;
 Scale {
   marks [
     mark (-1, bottom),
-    mark (0, top, _('Hello, world!')),
+    mark (0, top, _("Hello, world!")),
     mark (2),
   ]
 }
diff --git a/tests/samples/size_group.blp b/tests/samples/size_group.blp
index a4226f6..f908abd 100644
--- a/tests/samples/size_group.blp
+++ b/tests/samples/size_group.blp
@@ -2,8 +2,13 @@ using Gtk 4.0;
 
 SizeGroup {
   mode: horizontal;
-  widgets [label, button]
+
+  widgets [
+    label,
+    button,
+  ]
 }
 
 Label label {}
+
 Button button {}
diff --git a/tests/samples/string_array.blp b/tests/samples/string_array.blp
index 4f8ac5b..2542d17 100644
--- a/tests/samples/string_array.blp
+++ b/tests/samples/string_array.blp
@@ -1,6 +1,10 @@
 using Gtk 4.0;
 
 AboutDialog about {
-    valign: center;
-    authors: ["Jane doe <jane-doe@email.com>", "Jhonny D <jd@email.com>"];
+  valign: center;
+
+  authors: [
+    "Jane doe <jane-doe@email.com>",
+    "Jhonny D <jd@email.com>"
+  ];
 }
diff --git a/tests/samples/string_list.blp b/tests/samples/string_list.blp
index 91af385..68e6aff 100644
--- a/tests/samples/string_list.blp
+++ b/tests/samples/string_list.blp
@@ -7,6 +7,6 @@ StringList greetings {
   ]
 }
 
-Gtk.DropDown {
+DropDown {
   model: greetings;
 }
diff --git a/tests/samples/strings_dec.blp b/tests/samples/strings_dec.blp
index 576ddb4..7540458 100644
--- a/tests/samples/strings_dec.blp
+++ b/tests/samples/strings_dec.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 Label {
-  label: '\\\\\'Test 1 2 3\n & 4 "5\' 6 \t';
+  label: "\\\\'Test 1 2 3\n & 4 \"5' 6 \t";
 }
diff --git a/tests/samples/style.blp b/tests/samples/style.blp
index c1cb091..fe20f52 100644
--- a/tests/samples/style.blp
+++ b/tests/samples/style.blp
@@ -1,5 +1,8 @@
 using Gtk 4.0;
 
 Label {
-  styles ["class-1", "class-2"]
+  styles [
+    "class-1",
+    "class-2"
+  ]
 }
diff --git a/tests/samples/subscope.blp b/tests/samples/subscope.blp
index 03643f4..08c5959 100644
--- a/tests/samples/subscope.blp
+++ b/tests/samples/subscope.blp
@@ -6,4 +6,4 @@ Gtk.BuilderListItemFactory {
   }
 }
 
-Gtk.Label label {}
\ No newline at end of file
+Gtk.Label label {}
diff --git a/tests/samples/template.blp b/tests/samples/template.blp
index aba76c1..1ce4d3f 100644
--- a/tests/samples/template.blp
+++ b/tests/samples/template.blp
@@ -1,10 +1,10 @@
 using Gtk 4.0;
 
 template $TestTemplate: ApplicationWindow {
-  test-property: 'Hello, world';
+  test-property: "Hello, world";
   test-signal => $on_test_signal();
 }
 
 Dialog {
   transient-for: template;
-}
\ No newline at end of file
+}
diff --git a/tests/samples/template_bind_property.blp b/tests/samples/template_bind_property.blp
index 834494e..a703368 100644
--- a/tests/samples/template_bind_property.blp
+++ b/tests/samples/template_bind_property.blp
@@ -2,4 +2,4 @@ using Gtk 4.0;
 
 template $MyTemplate {
   object: bind template.object2;
-}
\ No newline at end of file
+}
diff --git a/tests/samples/template_binding.blp b/tests/samples/template_binding.blp
index e295dc9..dac0f53 100644
--- a/tests/samples/template_binding.blp
+++ b/tests/samples/template_binding.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
-template $MyTemplate : Box {
+template $MyTemplate: Box {
   prop1: bind template.prop2 as <$MyObject>.prop3;
-}
\ No newline at end of file
+}
diff --git a/tests/samples/template_binding_extern.blp b/tests/samples/template_binding_extern.blp
index 3c66ce0..f71fa98 100644
--- a/tests/samples/template_binding_extern.blp
+++ b/tests/samples/template_binding_extern.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
-template $MyTemplate : $MyParentClass {
+template $MyTemplate: $MyParentClass {
   prop1: bind template.prop2 as <$MyObject>.prop3;
-}
\ No newline at end of file
+}
diff --git a/tests/samples/template_id.blp b/tests/samples/template_id.blp
index 7bdff61..cda3532 100644
--- a/tests/samples/template_id.blp
+++ b/tests/samples/template_id.blp
@@ -1,6 +1,6 @@
 using Gtk 4.0;
 
-template $MyTemplate : Gtk.Button {
+template $MyTemplate: Gtk.Button {
   /* this makes no actual sense, but it tests what I want to test */
   child: template;
-}
\ No newline at end of file
+}
diff --git a/tests/samples/template_id_dec.blp b/tests/samples/template_id_dec.blp
new file mode 100644
index 0000000..e4941f1
--- /dev/null
+++ b/tests/samples/template_id_dec.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+template $MyTemplate: Button {
+  child: template;
+}
diff --git a/tests/samples/template_no_parent.blp b/tests/samples/template_no_parent.blp
index 1164998..d660937 100644
--- a/tests/samples/template_no_parent.blp
+++ b/tests/samples/template_no_parent.blp
@@ -1,3 +1,3 @@
 using Gtk 4.0;
 
-template Gtk.ListItem {}
+template ListItem {}
diff --git a/tests/samples/template_orphan.blp b/tests/samples/template_orphan.blp
index 949e29f..15b0cf2 100644
--- a/tests/samples/template_orphan.blp
+++ b/tests/samples/template_orphan.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 template $TestTemplate {
-  test-property: 'Hello, world';
+  test-property: "Hello, world";
 }
\ No newline at end of file
diff --git a/tests/samples/template_simple_binding.blp b/tests/samples/template_simple_binding.blp
index 549f885..ad0533d 100644
--- a/tests/samples/template_simple_binding.blp
+++ b/tests/samples/template_simple_binding.blp
@@ -2,4 +2,4 @@ using Gtk 4.0;
 
 template $MyTemplate {
   prop: bind template.prop2;
-}
\ No newline at end of file
+}
diff --git a/tests/samples/translated.blp b/tests/samples/translated.blp
index 8c837d7..c7d4cd7 100644
--- a/tests/samples/translated.blp
+++ b/tests/samples/translated.blp
@@ -1,9 +1,9 @@
 using Gtk 4.0;
 
 Label {
-  label: _('Hello, world!');
+  label: _("Hello, world!");
 }
 
 Label {
-  label: C_('translation context', 'Hello');
+  label: C_("translation context", "Hello");
 }
diff --git a/tests/samples/translation_domain.blp b/tests/samples/translation_domain.blp
index 98d160d..dfa3616 100644
--- a/tests/samples/translation_domain.blp
+++ b/tests/samples/translation_domain.blp
@@ -1,3 +1,2 @@
 using Gtk 4.0;
-
 translation-domain "blueprint-tests";
diff --git a/tests/samples/typeof.blp b/tests/samples/typeof.blp
index 6f4bee9..41ca1cc 100644
--- a/tests/samples/typeof.blp
+++ b/tests/samples/typeof.blp
@@ -8,4 +8,4 @@ Gio.ListStore {
 
 Gio.ListStore {
   item-type: typeof<$MyObject>;
-}
\ No newline at end of file
+}
diff --git a/tests/samples/unchecked_class_dec.blp b/tests/samples/unchecked_class_dec.blp
index d9df875..dbbfe14 100644
--- a/tests/samples/unchecked_class_dec.blp
+++ b/tests/samples/unchecked_class_dec.blp
@@ -2,6 +2,6 @@ using Gtk 4.0;
 
 $MyComponent component {
   $MyComponent2 {
-    flags-value: 'a|b';
+    flags-value: "a|b";
   }
 }
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 967be0d..41d572f 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -18,6 +18,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
+import os
 import unittest
 from pathlib import Path
 
@@ -36,7 +37,6 @@ from blueprintcompiler.errors import (
 )
 from blueprintcompiler.lsp import LanguageServer
 from blueprintcompiler.outputs.xml import XmlOutput
-from blueprintcompiler.tokenizer import Token, TokenType, tokenize
 
 
 class TestSamples(unittest.TestCase):
@@ -150,17 +150,27 @@ class TestSamples(unittest.TestCase):
     def assert_decompile(self, name):
         print(f'assert_decompile("{name}")')
         try:
-            with open((Path(__file__).parent / f"samples/{name}.blp").resolve()) as f:
-                expected = f.read()
+            if os.path.exists(
+                (Path(__file__).parent / f"samples/{name}_dec.blp").resolve()
+            ):
+                with open(
+                    (Path(__file__).parent / f"samples/{name}_dec.blp").resolve()
+                ) as f:
+                    expected = f.read().strip()
+            else:
+                with open(
+                    (Path(__file__).parent / f"samples/{name}.blp").resolve()
+                ) as f:
+                    expected = f.read().strip()
 
             name = name.removesuffix("_dec")
             ui_path = (Path(__file__).parent / f"samples/{name}.ui").resolve()
 
-            actual = decompiler.decompile(ui_path)
+            actual = decompiler.decompile(ui_path).strip()
 
-            self.assertEqual(actual.strip(), expected.strip())
+            self.assertEqual(actual, expected)
         except PrintableError as e:  # pragma: no cover
-            e.pretty_print(name + ".blp", blueprint)
+            e.pretty_print(name + ".blp", expected)
             raise AssertionError()
 
     def test_samples(self):
@@ -173,7 +183,10 @@ class TestSamples(unittest.TestCase):
         samples.sort()
         for sample in samples:
             REQUIRE_ADW_1_4 = ["adw_breakpoint"]
-            REQUIRE_ADW_1_5 = ["adw_alertdialog_responses"]
+            REQUIRE_ADW_1_5 = [
+                "adw_alertdialog_responses",
+                "adw_alert_dialog_duplicate_flags",
+            ]
 
             SKIP_RUN = [
                 "adw_breakpoint_template",
@@ -193,6 +206,23 @@ class TestSamples(unittest.TestCase):
                 "unchecked_class",
             ]
 
+            SKIP_DECOMPILE = [
+                # Not implemented yet
+                "action_widgets",
+                # Not implemented yet
+                "adw_breakpoint",
+                # Not implemented yet
+                "adw_breakpoint_template",
+                # Not implemented yet
+                "gtkcolumnview",
+                # Comments are not preserved in either direction
+                "comments",
+                # Not implemented yet
+                "list_factory",
+                # Not implemented yet
+                "subscope",
+            ]
+
             if sample in REQUIRE_ADW_1_4 and not self.have_adw_1_4:
                 continue
             if sample in REQUIRE_ADW_1_5 and not self.have_adw_1_5:
@@ -201,15 +231,16 @@ class TestSamples(unittest.TestCase):
             with self.subTest(sample):
                 self.assert_sample(sample, skip_run=sample in SKIP_RUN)
 
+            with self.subTest("decompile/" + sample):
+                if sample not in SKIP_DECOMPILE:
+                    self.assert_decompile(sample)
+
         # list the sample_errors directory
         sample_errors = [
             f.stem for f in Path(__file__).parent.glob("sample_errors/*.blp")
         ]
         sample_errors.sort()
         for sample_error in sample_errors:
-            REQUIRE_ADW_1_4 = ["adw_breakpoint"]
-            REQUIRE_ADW_1_5 = ["adw_alert_dialog_duplicate_flags"]
-
             if sample_error in REQUIRE_ADW_1_4 and not self.have_adw_1_4:
                 continue
             if sample_error in REQUIRE_ADW_1_5 and not self.have_adw_1_5:
@@ -217,27 +248,3 @@ class TestSamples(unittest.TestCase):
 
             with self.subTest(sample_error):
                 self.assert_sample_error(sample_error)
-
-    def test_decompiler(self):
-        self.assert_decompile("accessibility_dec")
-        if self.have_adw_1_5:
-            self.assert_decompile("adw_alertdialog_responses")
-        self.assert_decompile("adw_messagedialog_responses")
-        self.assert_decompile("child_type")
-        self.assert_decompile("file_filter")
-        self.assert_decompile("flags")
-        self.assert_decompile("id_prop")
-        self.assert_decompile("layout_dec")
-        self.assert_decompile("menu_dec")
-        self.assert_decompile("property")
-        self.assert_decompile("property_binding_dec")
-        self.assert_decompile("placeholder_dec")
-        self.assert_decompile("scale_marks")
-        self.assert_decompile("signal")
-        self.assert_decompile("strings_dec")
-        self.assert_decompile("style_dec")
-        self.assert_decompile("template")
-        self.assert_decompile("template_orphan")
-        self.assert_decompile("translated")
-        self.assert_decompile("using")
-        self.assert_decompile("unchecked_class_dec")

From 22514b96dc13c05334d8a097f9483027dd4db725 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 29 Jul 2024 17:36:41 -0500
Subject: [PATCH 32/82] completions: Fix invalid escape sequence

---
 blueprintcompiler/completions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index ea58422..e05d6ee 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -227,7 +227,7 @@ def signal_completer(lsp, ast_node, match_variables):
                 signal_name,
                 CompletionItemKind.Event,
                 sort_text=f"1 {signal_name}",
-                snippet=f"{signal_name} => \$${{1:${name}_{signal_name.replace('-', '_')}}}()$0;",
+                snippet=f"{signal_name} => \\$${{1:${name}_{signal_name.replace('-', '_')}}}()$0;",
                 docs=signal.doc,
                 detail=signal.detail,
             )

From b308adc3af939b27bd18941710b4499b1131e090 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 15 Aug 2024 18:28:29 -0500
Subject: [PATCH 33/82] Remove backslash from f-string expression

This restriction was removed in Python 3.12, but plenty of users still
have older versions.
---
 blueprintcompiler/decompiler.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 845a88d..3048d32 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -141,7 +141,8 @@ class DecompileCtx:
             val = truthy(value)
             self.print("true" if val else "false")
         elif type.assignable_to(ArrayType(StringType())):
-            self.print(f"[{', '.join([escape_quote(x) for x in value.split('\n')])}]")
+            items = ", ".join([escape_quote(x) for x in value.split("\n")])
+            self.print(f"[{items}]")
         elif (
             type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gdk.Pixbuf"))
             or type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gdk.Texture"))

From 3dfce3bbe063f599f03f1a1c7d8bf7a7bc6dcd2c Mon Sep 17 00:00:00 2001
From: Julian Schmidhuber <git@schmidhuberj.de>
Date: Tue, 13 Aug 2024 10:25:16 +0200
Subject: [PATCH 34/82] Allow for multiple a11y properties

---
 blueprintcompiler/language/gtk_a11y.py        | 34 ++++++++++++++++---
 blueprintcompiler/outputs/xml/__init__.py     |  7 ++--
 docs/reference/extensions.rst                 |  5 ++-
 tests/sample_errors/a11y_list_empty.blp       |  9 +++++
 tests/sample_errors/a11y_list_empty.err       |  1 +
 .../sample_errors/a11y_non_list_property.blp  | 15 ++++++++
 .../sample_errors/a11y_non_list_property.err  |  1 +
 .../accessibility_multiple_labelled_by.blp    | 15 ++++++++
 .../accessibility_multiple_labelled_by.ui     | 21 ++++++++++++
 tests/test_samples.py                         |  2 ++
 10 files changed, 103 insertions(+), 7 deletions(-)
 create mode 100644 tests/sample_errors/a11y_list_empty.blp
 create mode 100644 tests/sample_errors/a11y_list_empty.err
 create mode 100644 tests/sample_errors/a11y_non_list_property.blp
 create mode 100644 tests/sample_errors/a11y_non_list_property.err
 create mode 100644 tests/samples/accessibility_multiple_labelled_by.blp
 create mode 100644 tests/samples/accessibility_multiple_labelled_by.ui

diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index a4c3415..c4438cb 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+import typing as T
+
 from ..decompiler import escape_quote
 from .attributes import BaseAttribute
 from .common import *
@@ -97,6 +99,16 @@ def get_types(gir):
     }
 
 
+allow_duplicates = [
+    "controls",
+    "described-by",
+    "details",
+    "flow-to",
+    "labelled-by",
+    "owns",
+]
+
+
 def _get_docs(gir, name):
     name = name.replace("-", "_")
     if gir_type := (
@@ -111,7 +123,7 @@ class A11yProperty(BaseAttribute):
     grammar = Statement(
         UseIdent("name"),
         ":",
-        Value,
+        AnyOf(Value, ["[", UseLiteral("list_form", True), Delimited(Value, ","), "]"]),
     )
 
     @property
@@ -132,8 +144,8 @@ class A11yProperty(BaseAttribute):
         return self.tokens["name"].replace("_", "-")
 
     @property
-    def value(self) -> Value:
-        return self.children[0]
+    def values(self) -> T.List[Value]:
+        return list(self.children)
 
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
@@ -146,7 +158,7 @@ class A11yProperty(BaseAttribute):
             SymbolKind.Field,
             self.range,
             self.group.tokens["name"].range,
-            self.value.range.text,
+            ", ".join(v.range.text for v in self.values),
         )
 
     @validate("name")
@@ -165,6 +177,20 @@ class A11yProperty(BaseAttribute):
             check=lambda child: child.tokens["name"] == self.tokens["name"],
         )
 
+    @validate("name")
+    def list_only_allowed_for_subset(self):
+        if self.tokens["list_form"] and self.tokens["name"] not in allow_duplicates:
+            raise CompileError(
+                f"'{self.tokens['name']}' does not allow a list of values",
+            )
+
+    @validate("name")
+    def list_non_empty(self):
+        if len(self.values) == 0:
+            raise CompileError(
+                f"'{self.tokens['name']}' may not be empty",
+            )
+
     @docs("name")
     def prop_docs(self):
         if self.tokens["name"] in get_types(self.root.gir):
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index a7f4b4b..5e43834 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -292,8 +292,11 @@ class XmlOutput(OutputFormat):
     def _emit_extensions(self, extension, xml: XmlEmitter):
         if isinstance(extension, ExtAccessibility):
             xml.start_tag("accessibility")
-            for prop in extension.properties:
-                self._emit_attribute(prop.tag_name, "name", prop.name, prop.value, xml)
+            for property in extension.properties:
+                for val in property.values:
+                    self._emit_attribute(
+                        property.tag_name, "name", property.name, val, xml
+                    )
             xml.end_tag()
 
         elif isinstance(extension, AdwBreakpointCondition):
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index a7b7b93..93ed0fc 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -37,12 +37,15 @@ Accessibility Properties
 .. rst-class:: grammar-block
 
    ExtAccessibility = 'accessibility' '{' ExtAccessibilityProp* '}'
-   ExtAccessibilityProp = <name::ref:`IDENT<Syntax IDENT>`> ':' :ref:`Value <Syntax Value>` ';'
+   ExtAccessibilityProp = <name::ref:`IDENT<Syntax IDENT>`> ':' (:ref:`Value <Syntax Value>` | ('[' (:ref: Value <Syntax Value>),* ']') ) ';'
 
 Valid in any `Gtk.Widget <https://docs.gtk.org/gtk4/class.Widget.html>`_.
 
 The ``accessibility`` block defines values relevant to accessibility software. The property names and acceptable values are described in the `Gtk.AccessibleRelation <https://docs.gtk.org/gtk4/enum.AccessibleRelation.html>`_, `Gtk.AccessibleState <https://docs.gtk.org/gtk4/enum.AccessibleState.html>`_, and `Gtk.AccessibleProperty <https://docs.gtk.org/gtk4/enum.AccessibleProperty.html>`_ enums.
 
+.. note::
+
+   Relations which allow for a list of values, for example `labelled-by`, must be given as a single relation with a list of values instead of duplicating the relation like done in Gtk.Builder.
 
 .. _Syntax ExtAdwBreakpoint:
 
diff --git a/tests/sample_errors/a11y_list_empty.blp b/tests/sample_errors/a11y_list_empty.blp
new file mode 100644
index 0000000..401c912
--- /dev/null
+++ b/tests/sample_errors/a11y_list_empty.blp
@@ -0,0 +1,9 @@
+using Gtk 4.0;
+
+Box {
+  accessibility {
+    label: _("Hello, world!");
+    labelled-by: [];
+    checked: true;
+  }
+}
diff --git a/tests/sample_errors/a11y_list_empty.err b/tests/sample_errors/a11y_list_empty.err
new file mode 100644
index 0000000..d2b0c86
--- /dev/null
+++ b/tests/sample_errors/a11y_list_empty.err
@@ -0,0 +1 @@
+6,5,11,'labelled-by' may not be empty
diff --git a/tests/sample_errors/a11y_non_list_property.blp b/tests/sample_errors/a11y_non_list_property.blp
new file mode 100644
index 0000000..daa3a96
--- /dev/null
+++ b/tests/sample_errors/a11y_non_list_property.blp
@@ -0,0 +1,15 @@
+using Gtk 4.0;
+
+Box {
+  accessibility {
+    label: _("Hello, world!");
+    active-descendant: [my_label1, my_label2, my_label3];
+    checked: true;
+  }
+}
+
+Label my_label1 {}
+
+Label my_label2 {}
+
+Label my_label3 {}
diff --git a/tests/sample_errors/a11y_non_list_property.err b/tests/sample_errors/a11y_non_list_property.err
new file mode 100644
index 0000000..038da92
--- /dev/null
+++ b/tests/sample_errors/a11y_non_list_property.err
@@ -0,0 +1 @@
+6,5,17,'active-descendant' does not allow a list of values
diff --git a/tests/samples/accessibility_multiple_labelled_by.blp b/tests/samples/accessibility_multiple_labelled_by.blp
new file mode 100644
index 0000000..78e8b74
--- /dev/null
+++ b/tests/samples/accessibility_multiple_labelled_by.blp
@@ -0,0 +1,15 @@
+using Gtk 4.0;
+
+Box {
+  accessibility {
+    label: _("Hello, world!");
+    labelled-by: [my_label1, my_label2, my_label3];
+    checked: true;
+  }
+}
+
+Label my_label1 {}
+
+Label my_label2 {}
+
+Label my_label3 {}
diff --git a/tests/samples/accessibility_multiple_labelled_by.ui b/tests/samples/accessibility_multiple_labelled_by.ui
new file mode 100644
index 0000000..0e8ab5a
--- /dev/null
+++ b/tests/samples/accessibility_multiple_labelled_by.ui
@@ -0,0 +1,21 @@
+<?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="GtkBox">
+    <accessibility>
+      <property name="label" translatable="yes">Hello, world!</property>
+      <relation name="labelled-by">my_label1</relation>
+      <relation name="labelled-by">my_label2</relation>
+      <relation name="labelled-by">my_label3</relation>
+      <state name="checked">1</state>
+    </accessibility>
+  </object>
+  <object class="GtkLabel" id="my_label1"></object>
+  <object class="GtkLabel" id="my_label2"></object>
+  <object class="GtkLabel" id="my_label3"></object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 41d572f..b8a3812 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -221,6 +221,8 @@ class TestSamples(unittest.TestCase):
                 "list_factory",
                 # Not implemented yet
                 "subscope",
+                # Not implemented yet
+                "accessibility_multiple_labelled_by",
             ]
 
             if sample in REQUIRE_ADW_1_4 and not self.have_adw_1_4:

From 4d3dc9244883985b29da005560b5406f1d8df68b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 23 Aug 2024 18:16:02 -0500
Subject: [PATCH 35/82] decompiler: Support list accessibility properties

---
 blueprintcompiler/decompiler.py               | 23 ++++++-----
 blueprintcompiler/language/gtk_a11y.py        | 40 +++++++++++++------
 tests/samples/accessibility_dec.blp           |  6 ++-
 .../accessibility_multiple_labelled_by.blp    |  8 +++-
 tests/test_samples.py                         |  2 -
 5 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 3048d32..f5c45fb 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -192,18 +192,21 @@ def decompile_element(
 
         decompiler = decompilers[0]
 
-        args: T.Dict[str, T.Optional[str]] = {
-            canon(name): value for name, value in xml.attrs.items()
-        }
-        if decompiler._cdata:
-            if len(xml.children):
-                args["cdata"] = None
-            else:
-                args["cdata"] = xml.cdata
+        if decompiler._element:
+            args = [ctx, gir, xml]
+            kwargs: T.Dict[str, T.Optional[str]] = {}
+        else:
+            args = [ctx, gir]
+            kwargs = {canon(name): value for name, value in xml.attrs.items()}
+            if decompiler._cdata:
+                if len(xml.children):
+                    kwargs["cdata"] = None
+                else:
+                    kwargs["cdata"] = xml.cdata
 
         ctx._node_stack.append(xml)
         ctx.start_block()
-        gir = decompiler(ctx, gir, **args)
+        gir = decompiler(*args, **kwargs)
 
         if not decompiler._skip_children:
             for child in xml.children:
@@ -264,10 +267,12 @@ def decompiler(
     parent_type: T.Optional[str] = None,
     parent_tag: T.Optional[str] = None,
     skip_children=False,
+    element=False,
 ):
     def decorator(func):
         func._cdata = cdata
         func._skip_children = skip_children
+        func._element = element
 
         def filter(ctx):
             if parent_type is not None:
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index c4438cb..ec49002 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -249,19 +249,35 @@ def a11y_name_completer(lsp, ast_node, match_variables):
         )
 
 
-@decompiler("relation", cdata=True)
-def decompile_relation(ctx, gir, name, cdata):
-    ctx.print_attribute(name, cdata, get_types(ctx.gir).get(name))
-
-
-@decompiler("state", cdata=True)
-def decompile_state(ctx, gir, name, cdata, translatable="false"):
-    if decompile.truthy(translatable):
-        ctx.print(f"{name}: _({escape_quote(cdata)});")
+def decompile_attr(ctx: DecompileCtx, attr):
+    if attr["translatable"] is not None and decompile.truthy(attr["translatable"]):
+        ctx.print(f"_({escape_quote(attr.cdata)})")
     else:
-        ctx.print_attribute(name, cdata, get_types(ctx.gir).get(name))
+        ctx.print_value(attr.cdata, get_types(ctx.gir).get(attr["name"]))
 
 
-@decompiler("accessibility")
-def decompile_accessibility(ctx, gir):
+@decompiler("accessibility", skip_children=True, element=True)
+def decompile_accessibility(ctx: DecompileCtx, _gir, element):
     ctx.print("accessibility {")
+    already_printed = set()
+    for child in element.children:
+        name = child["name"]
+
+        if name in allow_duplicates:
+            if name in already_printed:
+                continue
+
+            ctx.print(f"{name}: [")
+            for value in element.children:
+                if value["name"] == name:
+                    decompile_attr(ctx, value)
+                    ctx.print(", ")
+            ctx.print("];")
+        else:
+            ctx.print(f"{name}:")
+            decompile_attr(ctx, child)
+            ctx.print(";")
+
+        already_printed.add(name)
+    ctx.print("}")
+    ctx.end_block_with("")
diff --git a/tests/samples/accessibility_dec.blp b/tests/samples/accessibility_dec.blp
index 9a2643c..30f7ec2 100644
--- a/tests/samples/accessibility_dec.blp
+++ b/tests/samples/accessibility_dec.blp
@@ -3,7 +3,11 @@ using Gtk 4.0;
 Box {
   accessibility {
     label: _("Hello, world!");
-    labelled-by: my_label;
+
+    labelled-by: [
+      my_label,
+    ];
+
     checked: true;
   }
 }
diff --git a/tests/samples/accessibility_multiple_labelled_by.blp b/tests/samples/accessibility_multiple_labelled_by.blp
index 78e8b74..188592e 100644
--- a/tests/samples/accessibility_multiple_labelled_by.blp
+++ b/tests/samples/accessibility_multiple_labelled_by.blp
@@ -3,7 +3,13 @@ using Gtk 4.0;
 Box {
   accessibility {
     label: _("Hello, world!");
-    labelled-by: [my_label1, my_label2, my_label3];
+
+    labelled-by: [
+      my_label1,
+      my_label2,
+      my_label3,
+    ];
+
     checked: true;
   }
 }
diff --git a/tests/test_samples.py b/tests/test_samples.py
index b8a3812..41d572f 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -221,8 +221,6 @@ class TestSamples(unittest.TestCase):
                 "list_factory",
                 # Not implemented yet
                 "subscope",
-                # Not implemented yet
-                "accessibility_multiple_labelled_by",
             ]
 
             if sample in REQUIRE_ADW_1_4 and not self.have_adw_1_4:

From 078ce2f5b882ee04f4060c4e4270b768ebca3718 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 23 Aug 2024 18:29:34 -0500
Subject: [PATCH 36/82] cli: Add decompile command

This command converts .ui files to Blueprint, similar to the porting
tool, but on individual files.
---
 blueprintcompiler/main.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 5b4cad8..1c3a1c6 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -25,6 +25,7 @@ import sys
 import typing as T
 
 from . import formatter, interactive_port, parser, tokenizer
+from .decompiler import decompile_string
 from .errors import CompileError, CompilerBugError, PrintableError, report_bug
 from .gir import add_typelib_search_path
 from .lsp import LanguageServer
@@ -103,6 +104,15 @@ class BlueprintApp:
             metavar="filenames",
         )
 
+        decompile = self.add_subcommand(
+            "decompile", "Convert .ui XML files to blueprint", self.cmd_decompile
+        )
+        decompile.add_argument("--output", dest="output", default="-")
+        decompile.add_argument("--typelib-path", nargs="?", action="append")
+        decompile.add_argument(
+            "input", metavar="filename", default=sys.stdin, type=argparse.FileType("r")
+        )
+
         port = self.add_subcommand("port", "Interactive porting tool", self.cmd_port)
 
         lsp = self.add_subcommand(
@@ -300,6 +310,24 @@ class BlueprintApp:
         if panic:
             sys.exit(1)
 
+    def cmd_decompile(self, opts):
+        if opts.typelib_path != None:
+            for typelib_path in opts.typelib_path:
+                add_typelib_search_path(typelib_path)
+
+        data = opts.input.read()
+        try:
+            decompiled = decompile_string(data)
+
+            if opts.output == "-":
+                print(decompiled)
+            else:
+                with open(opts.output, "w") as file:
+                    file.write(decompiled)
+        except PrintableError as e:
+            e.pretty_print(opts.input.name, data, stream=sys.stderr)
+            sys.exit(1)
+
     def cmd_lsp(self, opts):
         langserv = LanguageServer()
         langserv.run()

From a12ac1b976807dd553e99ca87c678b75cf302002 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 24 Aug 2024 12:21:32 -0500
Subject: [PATCH 37/82] decompiler: Support Adw.Breakpoint syntax

Also, improve handling of translated strings.
---
 blueprintcompiler/decompiler.py               | 96 ++++++++++++++-----
 blueprintcompiler/language/adw_breakpoint.py  | 39 ++++++++
 blueprintcompiler/language/expression.py      |  3 +-
 blueprintcompiler/language/gtk_a11y.py        | 26 ++---
 .../language/gtkbuilder_template.py           |  2 -
 tests/samples/adw_breakpoint.blp              |  7 +-
 tests/samples/adw_breakpoint.ui               |  2 +-
 tests/samples/adw_breakpoint_template_dec.blp | 10 ++
 tests/test_samples.py                         |  4 -
 9 files changed, 141 insertions(+), 48 deletions(-)
 create mode 100644 tests/samples/adw_breakpoint_template_dec.blp

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index f5c45fb..81072d9 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -56,7 +56,6 @@ class DecompileCtx:
         self.gir = GirContext()
         self._blocks_need_end: T.List[str] = []
         self._last_line_type: LineType = LineType.NONE
-        self.template_class: T.Optional[str] = None
         self._obj_type_stack: list[T.Optional[GirType]] = []
         self._node_stack: list[Element] = []
 
@@ -112,6 +111,45 @@ class DecompileCtx:
         else:
             return self._node_stack[-1]
 
+    @property
+    def parent_node(self) -> T.Optional[Element]:
+        if len(self._node_stack) < 2:
+            return None
+        else:
+            return self._node_stack[-2]
+
+    @property
+    def root_node(self) -> T.Optional[Element]:
+        if len(self._node_stack) == 0:
+            return None
+        else:
+            return self._node_stack[0]
+
+    @property
+    def template_class(self) -> T.Optional[str]:
+        assert self.root_node is not None
+        for child in self.root_node.children:
+            if child.tag == "template":
+                return child["class"]
+        return None
+
+    def find_object(self, id: str) -> T.Optional[Element]:
+        assert self.root_node is not None
+        for child in self.root_node.children:
+            if child.tag == "template" and child["class"] == id:
+                return child
+
+        def find_in_children(node: Element) -> T.Optional[Element]:
+            if node.tag in ["object", "menu"] and node["id"] == id:
+                return node
+            else:
+                for child in node.children:
+                    if result := find_in_children(child):
+                        return result
+            return None
+
+        return find_in_children(self.root_node)
+
     def end_block_with(self, text: str) -> None:
         self._blocks_need_end[-1] = text
 
@@ -122,7 +160,15 @@ class DecompileCtx:
             if len(self._blocks_need_end):
                 self._blocks_need_end[-1] = _CLOSING[line[-1]]
 
-    def print_value(self, value: str, type: T.Optional[GirType]) -> None:
+    # Converts a value from an XML element to a blueprint string
+    # based on the given type. Returns a tuple of translator comments
+    # (if any) and the decompiled syntax.
+    def decompile_value(
+        self,
+        value: str,
+        type: T.Optional[GirType],
+        translatable: T.Optional[T.Tuple[str, str, str]] = None,
+    ) -> T.Tuple[str, str]:
         def get_enum_name(value):
             for member in type.members.values():
                 if (
@@ -133,16 +179,18 @@ class DecompileCtx:
                     return member.name
             return value.replace("-", "_")
 
-        if type is None:
-            self.print(f"{escape_quote(value)}")
+        if translatable is not None and truthy(translatable[0]):
+            return decompile_translatable(value, *translatable)
+        elif type is None:
+            return "", f"{escape_quote(value)}"
         elif type.assignable_to(FloatType()):
-            self.print(str(value))
+            return "", str(value)
         elif type.assignable_to(BoolType()):
             val = truthy(value)
-            self.print("true" if val else "false")
+            return "", ("true" if val else "false")
         elif type.assignable_to(ArrayType(StringType())):
             items = ", ".join([escape_quote(x) for x in value.split("\n")])
-            self.print(f"[{items}]")
+            return "", f"[{items}]"
         elif (
             type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gdk.Pixbuf"))
             or type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gdk.Texture"))
@@ -156,30 +204,25 @@ class DecompileCtx:
                 self.gir.namespaces["Gtk"].lookup_type("Gtk.ShortcutTrigger")
             )
         ):
-            self.print(f"{escape_quote(value)}")
+            return "", escape_quote(value)
         elif value == self.template_class:
-            self.print("template")
+            return "", "template"
         elif type.assignable_to(
             self.gir.namespaces["Gtk"].lookup_type("GObject.Object")
         ) or isinstance(type, Interface):
-            self.print(value)
+            return "", ("null" if value == "" else value)
         elif isinstance(type, Bitfield):
             flags = [get_enum_name(flag) for flag in value.split("|")]
-            self.print(" | ".join(flags))
+            return "", " | ".join(flags)
         elif isinstance(type, Enumeration):
-            self.print(get_enum_name(value))
+            return "", get_enum_name(value)
         elif isinstance(type, TypeType):
             if t := self.type_by_cname(value):
-                self.print(f"typeof<{full_name(t)}>")
+                return "", f"typeof<{full_name(t)}>"
             else:
-                self.print(f"typeof<${value}>")
+                return "", f"typeof<${value}>"
         else:
-            self.print(f"{escape_quote(value)}")
-
-    def print_attribute(self, name: str, value: str, type: GirType) -> None:
-        self.print(f"{name}: ")
-        self.print_value(value, type)
-        self.print(";")
+            return "", escape_quote(value)
 
 
 def decompile_element(
@@ -247,7 +290,7 @@ def canon(string: str) -> str:
 
 
 def truthy(string: str) -> bool:
-    return string.lower() in ["yes", "true", "t", "y", "1"]
+    return string is not None and string.lower() in ["yes", "true", "t", "y", "1"]
 
 
 def full_name(gir: GirType) -> str:
@@ -318,9 +361,11 @@ def decompile_translatable(
     translatable: T.Optional[str],
     context: T.Optional[str],
     comments: T.Optional[str],
-) -> T.Tuple[T.Optional[str], str]:
+) -> T.Tuple[str, str]:
     if translatable is not None and truthy(translatable):
-        if comments is not None:
+        if comments is None:
+            comments = ""
+        else:
             comments = comments.replace("/*", " ").replace("*/", " ")
             comments = f"/* Translators: {comments} */"
 
@@ -329,7 +374,7 @@ def decompile_translatable(
         else:
             return comments, f"_({escape_quote(string)})"
     else:
-        return comments, f"{escape_quote(string)}"
+        return "", f"{escape_quote(string)}"
 
 
 @decompiler("property", cdata=True)
@@ -376,7 +421,8 @@ def decompile_property(
     elif gir is None or gir.properties.get(name) is None:
         ctx.print(f"{name}: {escape_quote(cdata)};")
     else:
-        ctx.print_attribute(name, cdata, gir.properties.get(name).type)
+        _, string = ctx.decompile_value(cdata, gir.properties.get(name).type)
+        ctx.print(f"{name}: {string};")
     return gir
 
 
diff --git a/blueprintcompiler/language/adw_breakpoint.py b/blueprintcompiler/language/adw_breakpoint.py
index 4927c11..eec7c7e 100644
--- a/blueprintcompiler/language/adw_breakpoint.py
+++ b/blueprintcompiler/language/adw_breakpoint.py
@@ -195,3 +195,42 @@ class AdwBreakpointSetters(AstNode):
     @validate()
     def unique(self):
         self.validate_unique_in_parent("Duplicate setters block")
+
+
+@decompiler("condition", cdata=True)
+def decompile_condition(ctx: DecompileCtx, gir, cdata):
+    ctx.print(f"condition({escape_quote(cdata)})")
+
+
+@decompiler("setter", element=True)
+def decompile_setter(ctx: DecompileCtx, gir, element):
+    assert ctx.parent_node is not None
+    # only run for the first setter
+    for child in ctx.parent_node.children:
+        if child.tag == "setter":
+            if child != element:
+                # already decompiled
+                return
+            else:
+                break
+
+    ctx.print("setters {")
+    for child in ctx.parent_node.children:
+        if child.tag == "setter":
+            object_id = child["object"]
+            property_name = child["property"]
+            obj = ctx.find_object(object_id)
+            if obj is not None:
+                gir_class = ctx.type_by_cname(obj["class"])
+            else:
+                gir_class = None
+
+            if object_id == ctx.template_class:
+                object_id = "template"
+
+            comments, string = ctx.decompile_value(
+                child.cdata,
+                gir_class,
+                (child["translatable"], child["context"], child["comments"]),
+            )
+            ctx.print(f"{comments} {object_id}.{property_name}: {string};")
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 117fd30..37e73e8 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -319,7 +319,8 @@ def decompile_constant(
         else:
             ctx.print(cdata)
     else:
-        ctx.print_value(cdata, ctx.type_by_cname(type))
+        _, string = ctx.decompile_value(cdata, ctx.type_by_cname(type))
+        ctx.print(string)
 
 
 @decompiler("closure", skip_children=True)
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index ec49002..8870a74 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -249,17 +249,12 @@ def a11y_name_completer(lsp, ast_node, match_variables):
         )
 
 
-def decompile_attr(ctx: DecompileCtx, attr):
-    if attr["translatable"] is not None and decompile.truthy(attr["translatable"]):
-        ctx.print(f"_({escape_quote(attr.cdata)})")
-    else:
-        ctx.print_value(attr.cdata, get_types(ctx.gir).get(attr["name"]))
-
-
 @decompiler("accessibility", skip_children=True, element=True)
 def decompile_accessibility(ctx: DecompileCtx, _gir, element):
     ctx.print("accessibility {")
     already_printed = set()
+    types = get_types(ctx.gir)
+
     for child in element.children:
         name = child["name"]
 
@@ -270,13 +265,20 @@ def decompile_accessibility(ctx: DecompileCtx, _gir, element):
             ctx.print(f"{name}: [")
             for value in element.children:
                 if value["name"] == name:
-                    decompile_attr(ctx, value)
-                    ctx.print(", ")
+                    comments, string = ctx.decompile_value(
+                        value.cdata,
+                        types.get(value["name"]),
+                        (value["translatable"], value["context"], value["comments"]),
+                    )
+                    ctx.print(f"{comments} {string},")
             ctx.print("];")
         else:
-            ctx.print(f"{name}:")
-            decompile_attr(ctx, child)
-            ctx.print(";")
+            comments, string = ctx.decompile_value(
+                child.cdata,
+                types.get(child["name"]),
+                (child["translatable"], child["context"], child["comments"]),
+            )
+            ctx.print(f"{comments} {name}: {string};")
 
         already_printed.add(name)
     ctx.print("}")
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index be8473c..29f7b37 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -102,6 +102,4 @@ def decompile_template(ctx: DecompileCtx, gir, klass, parent=None):
     else:
         ctx.print(f"template {class_name(klass)} : {class_name(parent)} {{")
 
-    ctx.template_class = klass
-
     return ctx.type_by_cname(klass) or ctx.type_by_cname(parent)
diff --git a/tests/samples/adw_breakpoint.blp b/tests/samples/adw_breakpoint.blp
index 1d085e4..dfdfd9f 100644
--- a/tests/samples/adw_breakpoint.blp
+++ b/tests/samples/adw_breakpoint.blp
@@ -1,13 +1,14 @@
 using Gtk 4.0;
 using Adw 1;
 
-Gtk.Label label {}
+Label label {}
 
 Adw.Breakpoint {
   condition ("max-width: 600px")
+
   setters {
-    label.label: _("Hello, world!");
+    label.label: C_("test", "Hello, world!");
     label.visible: false;
     label.extra-menu: null;
   }
-}
\ No newline at end of file
+}
diff --git a/tests/samples/adw_breakpoint.ui b/tests/samples/adw_breakpoint.ui
index 29cbf9b..8b7dc0e 100644
--- a/tests/samples/adw_breakpoint.ui
+++ b/tests/samples/adw_breakpoint.ui
@@ -9,7 +9,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
   <object class="GtkLabel" id="label"></object>
   <object class="AdwBreakpoint">
     <condition>max-width: 600px</condition>
-    <setter object="label" property="label" translatable="yes">Hello, world!</setter>
+    <setter object="label" property="label" translatable="yes" context="test">Hello, world!</setter>
     <setter object="label" property="visible">false</setter>
     <setter object="label" property="extra-menu"></setter>
   </object>
diff --git a/tests/samples/adw_breakpoint_template_dec.blp b/tests/samples/adw_breakpoint_template_dec.blp
new file mode 100644
index 0000000..dc8afb2
--- /dev/null
+++ b/tests/samples/adw_breakpoint_template_dec.blp
@@ -0,0 +1,10 @@
+using Gtk 4.0;
+using Adw 1;
+
+template $MyTemplate {
+  Adw.Breakpoint {
+    setters {
+      template.some-prop: "true";
+    }
+  }
+}
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 41d572f..11fe6f8 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -210,10 +210,6 @@ class TestSamples(unittest.TestCase):
                 # Not implemented yet
                 "action_widgets",
                 # Not implemented yet
-                "adw_breakpoint",
-                # Not implemented yet
-                "adw_breakpoint_template",
-                # Not implemented yet
                 "gtkcolumnview",
                 # Comments are not preserved in either direction
                 "comments",

From 25d9826aea9ef76018bd38a6fdf6bcdcd9235902 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 24 Aug 2024 12:40:04 -0500
Subject: [PATCH 38/82] decompiler: Fix translator comments in properties

---
 blueprintcompiler/decompiler.py       |  3 ---
 tests/samples/translator_comments.blp |  6 ++++++
 tests/samples/translator_comments.ui  | 12 ++++++++++++
 tests/test_samples.py                 |  6 +++++-
 4 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 tests/samples/translator_comments.blp
 create mode 100644 tests/samples/translator_comments.ui

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 81072d9..99901c1 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -391,9 +391,6 @@ def decompile_property(
     context=None,
 ):
     name = name.replace("_", "-")
-    if comments is not None:
-        ctx.print(f"/* Translators: {comments} */")
-
     if cdata is None:
         ctx.print(f"{name}: ")
         ctx.end_block_with(";")
diff --git a/tests/samples/translator_comments.blp b/tests/samples/translator_comments.blp
new file mode 100644
index 0000000..b95e0c0
--- /dev/null
+++ b/tests/samples/translator_comments.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+
+Label {
+  /* Translators: This is a test comment. */
+  label: C_("test", "Hello, world!");
+}
diff --git a/tests/samples/translator_comments.ui b/tests/samples/translator_comments.ui
new file mode 100644
index 0000000..ec3efd3
--- /dev/null
+++ b/tests/samples/translator_comments.ui
@@ -0,0 +1,12 @@
+<?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="GtkLabel">
+    <property name="label" translatable="yes" comments="This is a test comment." context="test">Hello, world!</property>
+  </object>
+</interface>
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 11fe6f8..265a716 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -206,6 +206,9 @@ class TestSamples(unittest.TestCase):
                 "unchecked_class",
             ]
 
+            # Decompiler-only tests
+            SKIP_COMPILE = ["translator_comments"]
+
             SKIP_DECOMPILE = [
                 # Not implemented yet
                 "action_widgets",
@@ -225,7 +228,8 @@ class TestSamples(unittest.TestCase):
                 continue
 
             with self.subTest(sample):
-                self.assert_sample(sample, skip_run=sample in SKIP_RUN)
+                if sample not in SKIP_COMPILE:
+                    self.assert_sample(sample, skip_run=sample in SKIP_RUN)
 
             with self.subTest("decompile/" + sample):
                 if sample not in SKIP_DECOMPILE:

From 21d5ce86e92cc5b491a3655dc4124283901fdf80 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 24 Aug 2024 13:04:21 -0500
Subject: [PATCH 39/82] decompiler: Support sub-templates

Support GtkBuilderListItemFactory syntax by decompiling the nested XML,
rather than preserving it as a string literal.
---
 blueprintcompiler/decompiler.py    | 40 +++++++++++++++++++++---------
 tests/samples/list_factory_dec.blp | 11 ++++++++
 tests/samples/subscope.blp         |  5 +++-
 tests/samples/subscope.ui          |  6 ++++-
 tests/samples/subscope_dec.blp     | 12 +++++++++
 tests/test_samples.py              |  6 -----
 6 files changed, 60 insertions(+), 20 deletions(-)
 create mode 100644 tests/samples/list_factory_dec.blp
 create mode 100644 tests/samples/subscope_dec.blp

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 99901c1..de6c06f 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -51,9 +51,10 @@ class LineType(Enum):
 
 
 class DecompileCtx:
-    def __init__(self) -> None:
+    def __init__(self, parent_gir: T.Optional[GirContext] = None) -> None:
+        self.sub_decompiler = parent_gir is not None
         self._result: str = ""
-        self.gir = GirContext()
+        self.gir = parent_gir or GirContext()
         self._blocks_need_end: T.List[str] = []
         self._last_line_type: LineType = LineType.NONE
         self._obj_type_stack: list[T.Optional[GirType]] = []
@@ -63,15 +64,19 @@ class DecompileCtx:
 
     @property
     def result(self) -> str:
-        import_lines = sorted(
-            [
-                f"using {ns} {namespace.version};"
-                for ns, namespace in self.gir.namespaces.items()
-                if ns != "Gtk"
-            ]
-        )
-        full_string = "\n".join(["using Gtk 4.0;", *import_lines]) + self._result
-        return formatter.format(full_string)
+        imports = ""
+
+        if not self.sub_decompiler:
+            import_lines = sorted(
+                [
+                    f"using {ns} {namespace.version};"
+                    for ns, namespace in self.gir.namespaces.items()
+                    if ns != "Gtk"
+                ]
+            )
+            imports += "\n".join(["using Gtk 4.0;", *import_lines])
+
+        return formatter.format(imports + self._result)
 
     def type_by_cname(self, cname: str) -> T.Optional[GirType]:
         if type := self.gir.get_type_by_cname(cname):
@@ -131,6 +136,7 @@ class DecompileCtx:
         for child in self.root_node.children:
             if child.tag == "template":
                 return child["class"]
+
         return None
 
     def find_object(self, id: str) -> T.Optional[Element]:
@@ -273,7 +279,7 @@ def decompile(data: str) -> str:
     return ctx.result
 
 
-def decompile_string(data):
+def decompile_string(data: str) -> str:
     ctx = DecompileCtx()
 
     xml = parse_string(data)
@@ -417,6 +423,16 @@ def decompile_property(
         ctx.print(f"{name}: {translatable};")
     elif gir is None or gir.properties.get(name) is None:
         ctx.print(f"{name}: {escape_quote(cdata)};")
+    elif (
+        gir.assignable_to(ctx.gir.get_class("BuilderListItemFactory", "Gtk"))
+        and name == "bytes"
+    ):
+        sub_ctx = DecompileCtx(ctx.gir)
+
+        xml = parse_string(cdata)
+        decompile_element(sub_ctx, None, xml)
+
+        ctx.print(sub_ctx.result)
     else:
         _, string = ctx.decompile_value(cdata, gir.properties.get(name).type)
         ctx.print(f"{name}: {string};")
diff --git a/tests/samples/list_factory_dec.blp b/tests/samples/list_factory_dec.blp
new file mode 100644
index 0000000..0ef0835
--- /dev/null
+++ b/tests/samples/list_factory_dec.blp
@@ -0,0 +1,11 @@
+using Gtk 4.0;
+
+ListView {
+  factory: BuilderListItemFactory list_item_factory {
+    template ListItem {
+      child: Label {
+        label: bind template.item as <$MyObject>.name;
+      };
+    }
+  };
+}
diff --git a/tests/samples/subscope.blp b/tests/samples/subscope.blp
index 08c5959..0748089 100644
--- a/tests/samples/subscope.blp
+++ b/tests/samples/subscope.blp
@@ -1,8 +1,11 @@
 using Gtk 4.0;
+using Adw 1;
 
 Gtk.BuilderListItemFactory {
   template ListItem {
-    child: Gtk.Label label {};
+    child: Adw.Bin {
+      Gtk.Label label {}
+    };
   }
 }
 
diff --git a/tests/samples/subscope.ui b/tests/samples/subscope.ui
index 3513650..ef4e4db 100644
--- a/tests/samples/subscope.ui
+++ b/tests/samples/subscope.ui
@@ -11,7 +11,11 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
   <template class="GtkListItem">
     <property name="child">
-      <object class="GtkLabel" id="label"></object>
+      <object class="AdwBin">
+        <child>
+          <object class="GtkLabel" id="label"></object>
+        </child>
+      </object>
     </property>
   </template>
 </interface>]]></property>
diff --git a/tests/samples/subscope_dec.blp b/tests/samples/subscope_dec.blp
new file mode 100644
index 0000000..8d10855
--- /dev/null
+++ b/tests/samples/subscope_dec.blp
@@ -0,0 +1,12 @@
+using Gtk 4.0;
+using Adw 1;
+
+BuilderListItemFactory {
+  template ListItem {
+    child: Adw.Bin {
+      Label label {}
+    };
+  }
+}
+
+Label label {}
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 265a716..05dfb95 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -212,14 +212,8 @@ class TestSamples(unittest.TestCase):
             SKIP_DECOMPILE = [
                 # Not implemented yet
                 "action_widgets",
-                # Not implemented yet
-                "gtkcolumnview",
                 # Comments are not preserved in either direction
                 "comments",
-                # Not implemented yet
-                "list_factory",
-                # Not implemented yet
-                "subscope",
             ]
 
             if sample in REQUIRE_ADW_1_4 and not self.have_adw_1_4:

From 65d4612b51bc26681c1548cc367a2a8694869036 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 24 Aug 2024 13:24:27 -0500
Subject: [PATCH 40/82] decompiler: Support action widgets

---
 .../language/gtkbuilder_child.py              | 15 ++++++----
 blueprintcompiler/language/response_id.py     | 29 +++++++++++++++++++
 tests/test_samples.py                         |  2 --
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/blueprintcompiler/language/gtkbuilder_child.py b/blueprintcompiler/language/gtkbuilder_child.py
index 3f19fa5..b0563ba 100644
--- a/blueprintcompiler/language/gtkbuilder_child.py
+++ b/blueprintcompiler/language/gtkbuilder_child.py
@@ -22,7 +22,7 @@ from functools import cached_property
 
 from .common import *
 from .gobject_object import Object
-from .response_id import ExtResponse
+from .response_id import ExtResponse, decompile_response_type
 
 ALLOWED_PARENTS: T.List[T.Tuple[str, str]] = [
     ("Gtk", "Buildable"),
@@ -127,10 +127,15 @@ class Child(AstNode):
                 )
 
 
-@decompiler("child")
-def decompile_child(ctx, gir, type=None, internal_child=None):
-    if type is not None:
+@decompiler("child", element=True)
+def decompile_child(ctx, gir, element):
+    if type := element["type"]:
+        if type == "action":
+            if decompiled := decompile_response_type(ctx.parent_node, element):
+                ctx.print(decompiled)
+                return
+
         ctx.print(f"[{type}]")
-    elif internal_child is not None:
+    elif internal_child := element["internal-child"]:
         ctx.print(f"[internal-child {internal_child}]")
     return gir
diff --git a/blueprintcompiler/language/response_id.py b/blueprintcompiler/language/response_id.py
index 7de197c..8c0c807 100644
--- a/blueprintcompiler/language/response_id.py
+++ b/blueprintcompiler/language/response_id.py
@@ -123,3 +123,32 @@ class ExtResponse(AstNode):
 
         object = self.parent_by_type(Child).object
         return object.id
+
+
+def decompile_response_type(parent_element, child_element):
+    obj_id = None
+    for obj in child_element.children:
+        if obj.tag == "object":
+            obj_id = obj["id"]
+            break
+
+    if obj_id is None:
+        return None
+
+    for child in parent_element.children:
+        if child.tag == "action-widgets":
+            for action_widget in child.children:
+                if action_widget.cdata == obj_id:
+                    response_id = action_widget["response"]
+                    is_default = (
+                        " default" if decompile.truthy(action_widget["default"]) else ""
+                    )
+                    return f"[action response={response_id}{is_default}]"
+
+    return None
+
+
+@decompiler("action-widgets", skip_children=True)
+def decompile_action_widgets(ctx, gir):
+    # This is handled in the <child> decompiler and decompile_response_type above
+    pass
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 05dfb95..1d1e17f 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -210,8 +210,6 @@ class TestSamples(unittest.TestCase):
             SKIP_COMPILE = ["translator_comments"]
 
             SKIP_DECOMPILE = [
-                # Not implemented yet
-                "action_widgets",
                 # Comments are not preserved in either direction
                 "comments",
             ]

From 8e10fcf8692108b9d4ab78f41086c5d7773ef864 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 24 Aug 2024 14:26:46 -0500
Subject: [PATCH 41/82] Release v0.14.0

---
 NEWS.md          | 41 +++++++++++++++++++++++++++++++++++++++++
 docs/flatpak.rst |  2 +-
 meson.build      |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 5bb0864..389f82c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,44 @@
+# v0.14.0
+
+## Added
+- Added a warning for unused imports.
+- Added an option to not print the diff when formatting with the CLI. (Gregor Niehl)
+- Added support for building Gtk.ColumnViewRow, Gtk.ColumnViewCell, and Gtk.ListHeader widgets with Gtk.BuilderListItemFactory.
+- Added support for the `after` keyword for signals. This was previously documented but not implemented. (Gregor Niehl)
+- Added support for string arrays. (Diego Augusto)
+- Added hover documentation for properties in lookup expressions.
+- The decompiler supports action widgets, translation domains, `typeof<>` syntax, and expressions. It also supports extension syntax for Adw.Breakpoint, Gtk.BuilderListItemFactory, Gtk.ComboBoxText, Gtk.SizeGroup, and Gtk.StringList.
+- Added a `decompile` subcommand to the CLI, which decompiles an XML .ui file to blueprint.
+- Accessibility relations that allow multiple values are supported using list syntax. (Julian Schmidhuber)
+
+## Changed
+- The decompiler sorts imports alphabetically.
+- Translatable strings use `translatable="yes"` instead of `translatable="true"` for compatibility with xgettext. (Marco Köpcke)
+- The first line of the documentation is shown in the completion list when using the language server. (Sonny Piers)
+- Object autocomplete uses a snippet to add the braces and position the cursor inside them. (Sonny Piers)
+- The carets in the CLI diagnostic output now span the whole error message up to the end of the first line, rather than just the first character.
+- The decompiler emits double quotes, which are compatible with gettext.
+
+## Fixed
+- Fixed deprecation warnings in the language server.
+- The decompiler no longer duplicates translator comments on properties.
+- Subtemplates no longer output a redundant `@generated` comment.
+- When extension syntax from a library that is not available is used, the compiler emits an error instead of crashing.
+- The language server reports semantic token positions correctly. (Szepesi Tibor)
+- The decompiler no longer emits the deprecated `bind-property` syntax. (Sonny Piers)
+- Fixed the tests when used as a Meson subproject. (Benoit Pierre)
+- Signal autocomplete generates correct syntax. (Sonny Piers)
+- The decompiler supports templates that do not specify a parent class. (Sonny Piers)
+- Adw.Breakpoint setters that set a property on the template no longer cause a crash.
+- Fixed type checking with templates that do not have a parent class.
+- Fixed online documentation links for interfaces.
+- The wording of edit suggestions is fixed for insertions and deletions.
+- When an input file uses tabs instead of spaces, the diagnostic output on the CLI aligns the caret correctly.
+- The decompiler emits correct syntax when a property binding refers to the template object.
+
+## Documentation
+- Fixed typos in "Built with Blueprint" section. (Valéry Febvre, Dexter Reed)
+
 # v0.12.0
 
 ## Added
diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index 9eb49ac..0071d2f 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -17,7 +17,7 @@ a module in your flatpak manifest:
        {
          "type": "git",
          "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-         "tag": "v0.12.0"
+         "tag": "v0.14.0"
        }
      ]
    }
diff --git a/meson.build b/meson.build
index b91fd8c..f676459 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.12.1',
+  version: '0.14.0',
 )
 
 subdir('docs')

From d7097cad019c032e803d271d3671d0ee933a522b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 20 Sep 2024 17:04:00 -0500
Subject: [PATCH 42/82] docs: Mention null in literal values section

---
 docs/reference/values.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/reference/values.rst b/docs/reference/values.rst
index 95f6bc8..fb63e38 100644
--- a/docs/reference/values.rst
+++ b/docs/reference/values.rst
@@ -25,8 +25,7 @@ Literals
    NumberLiteral = ( '-' | '+' )? <value::ref:`NUMBER<Syntax NUMBER>`>
    IdentLiteral = <ident::ref:`IDENT<Syntax IDENT>`>
 
-Literals are used to specify values for properties. They can be strings, numbers, references to objects, types, boolean values, or enum members.
-
+Literals are used to specify values for properties. They can be strings, numbers, references to objects, ``null``, types, boolean values, or enum members.
 
 .. _Syntax TypeLiteral:
 

From 3b6dcf072d6766b04a025a3f13283c2c497fcd19 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 19 Oct 2024 10:21:13 -0500
Subject: [PATCH 43/82] typelib: Fix field offsets for attributes

This fixes a bug where the decompiler could not recognize enums by their
C identifiers because it could not correctly read attributes.

Fixes #177.
---
 blueprintcompiler/typelib.py |  4 ++--
 tests/samples/issue_177.blp  |  5 +++++
 tests/samples/issue_177.ui   | 12 ++++++++++++
 tests/test_samples.py        |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 tests/samples/issue_177.blp
 create mode 100644 tests/samples/issue_177.ui

diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index 145bf57..be22eb1 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -148,8 +148,8 @@ class Typelib:
     SIGNATURE_ARGUMENTS = Field(0x8, "offset")
 
     ATTR_OFFSET = Field(0x0, "u32")
-    ATTR_NAME = Field(0x0, "string")
-    ATTR_VALUE = Field(0x0, "string")
+    ATTR_NAME = Field(0x4, "string")
+    ATTR_VALUE = Field(0x8, "string")
 
     TYPE_BLOB_TAG = Field(0x0, "u8", 3, 5)
     TYPE_BLOB_INTERFACE = Field(0x2, "dir_entry")
diff --git a/tests/samples/issue_177.blp b/tests/samples/issue_177.blp
new file mode 100644
index 0000000..0a0f613
--- /dev/null
+++ b/tests/samples/issue_177.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Box {
+  orientation: horizontal;
+}
diff --git a/tests/samples/issue_177.ui b/tests/samples/issue_177.ui
new file mode 100644
index 0000000..53f9b60
--- /dev/null
+++ b/tests/samples/issue_177.ui
@@ -0,0 +1,12 @@
+<?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="GtkBox">
+    <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+  </object>
+</interface>
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 1d1e17f..00ef72a 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -207,7 +207,7 @@ class TestSamples(unittest.TestCase):
             ]
 
             # Decompiler-only tests
-            SKIP_COMPILE = ["translator_comments"]
+            SKIP_COMPILE = ["issue_177", "translator_comments"]
 
             SKIP_DECOMPILE = [
                 # Comments are not preserved in either direction

From c805400a3919635c7151385673a8c50c52f8728e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedek=20D=C3=A9v=C3=A9nyi?= <rdbende@proton.me>
Date: Sat, 28 Sep 2024 14:34:12 +0000
Subject: [PATCH 44/82] Update file index.rst

---
 docs/index.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.rst b/docs/index.rst
index e5601ea..d405498 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -86,6 +86,7 @@ Built with Blueprint
 - `Chance <https://zelikos.dev/apps/rollit>`_
 - `Commit <https://github.com/sonnyp/Commit/>`_
 - `Confy <https://confy.kirgroup.net/>`_
+- `Cozy <https://github.com/geigi/cozy>`_
 - `Daikhan <https://github.com/flathub/io.gitlab.daikhan.stable>`_
 - `Damask <https://gitlab.gnome.org/subpop/damask>`_
 - `Denaro <https://github.com/NickvisionApps/Denaro>`_

From 94b532bc35c763a15d74738df1329be9ca0ee23d Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 19 Oct 2024 19:00:47 -0500
Subject: [PATCH 45/82] build: Update Docker container

Includes a change to handle a mypy update.
---
 blueprintcompiler/parser.py | 4 +++-
 build-aux/install_deps.sh   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/parser.py b/blueprintcompiler/parser.py
index 89e1533..1f87647 100644
--- a/blueprintcompiler/parser.py
+++ b/blueprintcompiler/parser.py
@@ -33,7 +33,9 @@ def parse(
         original_text = tokens[0].string if len(tokens) else ""
         ctx = ParseContext(tokens, original_text)
         AnyOf(UI).parse(ctx)
-        ast_node = ctx.last_group.to_ast() if ctx.last_group else None
+
+        assert ctx.last_group is not None
+        ast_node = ctx.last_group.to_ast()
 
         errors = [*ctx.errors, *ast_node.errors]
         warnings = [*ctx.warnings, *ast_node.warnings]
diff --git a/build-aux/install_deps.sh b/build-aux/install_deps.sh
index 381a57a..342778d 100755
--- a/build-aux/install_deps.sh
+++ b/build-aux/install_deps.sh
@@ -7,8 +7,8 @@ git clone --depth=1 https://gitlab.gnome.org/GNOME/gtk.git
 cd gtk
 meson setup builddir \
   --prefix=/usr \
-  -Dgtk_doc=true \
-  -Ddemos=false \
+  -Ddocumentation=true \
+  -Dbuild-demos=false \
   -Dbuild-examples=false \
   -Dbuild-tests=false \
   -Dbuild-testsuite=false

From f6d05be10ba7db95c518d57ad839346db5ad2d01 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 19 Oct 2024 20:44:34 -0500
Subject: [PATCH 46/82] lsp: Add more "go to reference" implementations

---
 blueprintcompiler/language/adw_breakpoint.py | 11 +++++++++++
 blueprintcompiler/language/gobject_signal.py | 10 ++++++++++
 blueprintcompiler/language/gtk_size_group.py |  6 ++++++
 3 files changed, 27 insertions(+)

diff --git a/blueprintcompiler/language/adw_breakpoint.py b/blueprintcompiler/language/adw_breakpoint.py
index eec7c7e..e7716e6 100644
--- a/blueprintcompiler/language/adw_breakpoint.py
+++ b/blueprintcompiler/language/adw_breakpoint.py
@@ -115,6 +115,17 @@ class AdwBreakpointSetter(AstNode):
             self.value.range.text,
         )
 
+    def get_reference(self, idx: int) -> T.Optional[LocationLink]:
+        if idx in self.group.tokens["object"].range:
+            if self.object is not None:
+                return LocationLink(
+                    self.group.tokens["object"].range,
+                    self.object.range,
+                    self.object.ranges["id"],
+                )
+
+        return None
+
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
         if self.gir_property is not None:
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 9348321..8da59a5 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -117,6 +117,16 @@ class Signal(AstNode):
             self.ranges["detail_start", "detail_end"].text,
         )
 
+    def get_reference(self, idx: int) -> T.Optional[LocationLink]:
+        if idx in self.group.tokens["object"].range:
+            obj = self.context[ScopeCtx].objects.get(self.object_id)
+            if obj is not None:
+                return LocationLink(
+                    self.group.tokens["object"].range, obj.range, obj.ranges["id"]
+                )
+
+        return None
+
     @validate("handler")
     def old_extern(self):
         if not self.tokens["extern"]:
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index 0945e69..fd23738 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -39,6 +39,12 @@ class Widget(AstNode):
             self.group.tokens["name"].range,
         )
 
+    def get_reference(self, _idx: int) -> T.Optional[LocationLink]:
+        if obj := self.context[ScopeCtx].objects.get(self.name):
+            return LocationLink(self.range, obj.range, obj.ranges["id"])
+        else:
+            return None
+
     @validate("name")
     def obj_widget(self):
         object = self.context[ScopeCtx].objects.get(self.tokens["name"])

From e5fba8f3c7a9d2880922078e632b70ca26f955c4 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 19 Oct 2024 20:46:26 -0500
Subject: [PATCH 47/82] lsp: Add semantic tokens for flag members

---
 blueprintcompiler/language/values.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 9b29d94..2678693 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -211,6 +211,13 @@ class Flag(AstNode):
         else:
             return None
 
+    def get_semantic_tokens(self) -> T.Iterator[SemanticToken]:
+        yield SemanticToken(
+            self.group.tokens["value"].start,
+            self.group.tokens["value"].end,
+            SemanticTokenType.EnumMember,
+        )
+
     @docs()
     def docs(self):
         type = self.context[ValueTypeCtx].value_type

From b107a859476a510a2061e599443113b75a646eba Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 19 Oct 2024 20:47:27 -0500
Subject: [PATCH 48/82] lsp: Add property docs on notify signal hover

---
 blueprintcompiler/language/gobject_signal.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 8da59a5..d2e4526 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -174,6 +174,16 @@ class Signal(AstNode):
         if self.gir_signal is not None:
             return self.gir_signal.doc
 
+    @docs("detail_name")
+    def detail_docs(self):
+        if self.name == "notify":
+            if self.gir_class is not None and not isinstance(
+                self.gir_class, ExternType
+            ):
+                prop = self.gir_class.properties.get(self.tokens["detail_name"])
+                if prop is not None:
+                    return prop.doc
+
 
 @decompiler("signal")
 def decompile_signal(

From e19975e1f8069e6500d0b05ed1a0e8ecdf0b7e01 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 19 Oct 2024 18:46:10 -0500
Subject: [PATCH 49/82] lsp: Add reference documentation on hover

For most constructs and keywords, show the relevant section of the
reference documentation on hover.
---
 blueprintcompiler/ast_utils.py                |   6 +-
 blueprintcompiler/language/adw_breakpoint.py  |   4 +
 .../language/adw_response_dialog.py           |   4 +
 blueprintcompiler/language/binding.py         |   8 ++
 blueprintcompiler/language/common.py          |   1 +
 blueprintcompiler/language/expression.py      |  10 +-
 blueprintcompiler/language/gobject_signal.py  |  10 +-
 blueprintcompiler/language/gtk_a11y.py        |   4 +
 .../language/gtk_combo_box_text.py            |   8 ++
 blueprintcompiler/language/gtk_file_filter.py |  23 ++-
 blueprintcompiler/language/gtk_layout.py      |   4 +
 .../language/gtk_list_item_factory.py         |   4 +
 blueprintcompiler/language/gtk_menu.py        |  20 +++
 blueprintcompiler/language/gtk_scale.py       |   8 ++
 blueprintcompiler/language/gtk_size_group.py  |   4 +
 blueprintcompiler/language/gtk_string_list.py |   6 +-
 blueprintcompiler/language/gtk_styles.py      |   4 +
 .../language/gtkbuilder_child.py              |   4 +
 .../language/gtkbuilder_template.py           |   4 +
 blueprintcompiler/language/imports.py         |   8 ++
 blueprintcompiler/language/response_id.py     |  10 ++
 .../language/translation_domain.py            |   4 +
 blueprintcompiler/language/values.py          |  13 ++
 blueprintcompiler/lsp_utils.py                |  26 ++++
 docs/collect-sections.py                      | 136 ++++++++++++++++++
 docs/meson.build                              |   8 ++
 docs/reference/extensions.rst                 |   2 +-
 meson.build                                   |   4 +-
 28 files changed, 326 insertions(+), 21 deletions(-)
 create mode 100755 docs/collect-sections.py

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index c874358..bd5befa 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -179,14 +179,16 @@ class AstNode:
                 token = self.group.tokens.get(attr.token_name)
                 if token and token.start <= idx < token.end:
                     return getattr(self, name)
-            else:
-                return getattr(self, name)
 
         for child in self.children:
             if idx in child.range:
                 if docs := child.get_docs(idx):
                     return docs
 
+        for name, attr in self._attrs_by_type(Docs):
+            if not attr.token_name:
+                return getattr(self, name)
+
         return None
 
     def get_semantic_tokens(self) -> T.Iterator[SemanticToken]:
diff --git a/blueprintcompiler/language/adw_breakpoint.py b/blueprintcompiler/language/adw_breakpoint.py
index e7716e6..4ad5b24 100644
--- a/blueprintcompiler/language/adw_breakpoint.py
+++ b/blueprintcompiler/language/adw_breakpoint.py
@@ -207,6 +207,10 @@ class AdwBreakpointSetters(AstNode):
     def unique(self):
         self.validate_unique_in_parent("Duplicate setters block")
 
+    @docs("setters")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtAdwBreakpoint")
+
 
 @decompiler("condition", cdata=True)
 def decompile_condition(ctx: DecompileCtx, gir, cdata):
diff --git a/blueprintcompiler/language/adw_response_dialog.py b/blueprintcompiler/language/adw_response_dialog.py
index 46172f2..5493d4d 100644
--- a/blueprintcompiler/language/adw_response_dialog.py
+++ b/blueprintcompiler/language/adw_response_dialog.py
@@ -138,6 +138,10 @@ class ExtAdwResponseDialog(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate responses block")
 
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtAdwMessageDialog")
+
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/binding.py b/blueprintcompiler/language/binding.py
index 3b9af97..07572a9 100644
--- a/blueprintcompiler/language/binding.py
+++ b/blueprintcompiler/language/binding.py
@@ -58,6 +58,10 @@ class BindingFlag(AstNode):
                 "Only bindings with a single lookup can have flags",
             )
 
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax Binding")
+
 
 class Binding(AstNode):
     grammar = [
@@ -99,6 +103,10 @@ class Binding(AstNode):
                 actions=[CodeAction("use 'bind'", "bind")],
             )
 
+    @docs("bind")
+    def ref_docs(self):
+        return get_docs_section("Syntax Binding")
+
 
 @dataclass
 class SimpleBinding:
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index 29df47d..1cc1b3b 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -55,6 +55,7 @@ from ..lsp_utils import (
     SemanticToken,
     SemanticTokenType,
     SymbolKind,
+    get_docs_section,
 )
 from ..parse_tree import *
 
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 37e73e8..558392c 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -174,7 +174,7 @@ class LookupOp(InfixExpr):
 
 class CastExpr(InfixExpr):
     grammar = [
-        "as",
+        Keyword("as"),
         AnyOf(
             ["<", TypeName, Match(">").expected()],
             [
@@ -220,6 +220,10 @@ class CastExpr(InfixExpr):
                 ],
             )
 
+    @docs("as")
+    def ref_docs(self):
+        return get_docs_section("Syntax CastExpression")
+
 
 class ClosureArg(AstNode):
     grammar = Expression
@@ -269,6 +273,10 @@ class ClosureExpr(ExprBase):
         if not self.tokens["extern"]:
             raise CompileError(f"{self.closure_name} is not a builtin function")
 
+    @docs("name")
+    def ref_docs(self):
+        return get_docs_section("Syntax ClosureExpression")
+
 
 expr.children = [
     AnyOf(ClosureExpr, LiteralExpr, ["(", Expression, ")"]),
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index d2e4526..79f9ae7 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -40,6 +40,10 @@ class SignalFlag(AstNode):
             f"Duplicate flag '{self.flag}'", lambda x: x.flag == self.flag
         )
 
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax Signal")
+
 
 class Signal(AstNode):
     grammar = Statement(
@@ -50,7 +54,7 @@ class Signal(AstNode):
                 UseIdent("detail_name").expected("a signal detail name"),
             ]
         ),
-        "=>",
+        Keyword("=>"),
         Mark("detail_start"),
         Optional(["$", UseLiteral("extern", True)]),
         UseIdent("handler").expected("the name of a function to handle the signal"),
@@ -184,6 +188,10 @@ class Signal(AstNode):
                 if prop is not None:
                     return prop.doc
 
+    @docs("=>")
+    def ref_docs(self):
+        return get_docs_section("Syntax Signal")
+
 
 @decompiler("signal")
 def decompile_signal(
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index 8870a74..3657565 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -225,6 +225,10 @@ class ExtAccessibility(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate accessibility block")
 
+    @docs("accessibility")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtAccessibility")
+
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index 3a0d7c7..312750a 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -55,6 +55,10 @@ class Item(AstNode):
                 f"Duplicate item '{self.name}'", lambda x: x.name == self.name
             )
 
+    @docs("name")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtComboBoxItems")
+
 
 class ExtComboBoxItems(AstNode):
     grammar = [
@@ -81,6 +85,10 @@ class ExtComboBoxItems(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate items block")
 
+    @docs("items")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtComboBoxItems")
+
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 482d6e1..e84afc7 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -29,25 +29,23 @@ class Filters(AstNode):
             self.tokens["tag_name"],
             SymbolKind.Array,
             self.range,
-            self.group.tokens[self.tokens["tag_name"]].range,
+            self.group.tokens["tag_name"].range,
         )
 
     @validate()
     def container_is_file_filter(self):
         validate_parent_type(self, "Gtk", "FileFilter", "file filter properties")
 
-    @validate()
+    @validate("tag_name")
     def unique_in_parent(self):
-        # The token argument to validate() needs to be calculated based on
-        # the instance, hence wrapping it like this.
-        @validate(self.tokens["tag_name"])
-        def wrapped_validator(self):
-            self.validate_unique_in_parent(
-                f"Duplicate {self.tokens['tag_name']} block",
-                check=lambda child: child.tokens["tag_name"] == self.tokens["tag_name"],
-            )
+        self.validate_unique_in_parent(
+            f"Duplicate {self.tokens['tag_name']} block",
+            check=lambda child: child.tokens["tag_name"] == self.tokens["tag_name"],
+        )
 
-        wrapped_validator(self)
+    @docs("tag_name")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtFileFilter")
 
 
 class FilterString(AstNode):
@@ -76,8 +74,7 @@ def create_node(tag_name: str, singular: str):
     return Group(
         Filters,
         [
-            Keyword(tag_name),
-            UseLiteral("tag_name", tag_name),
+            UseExact("tag_name", tag_name),
             "[",
             Delimited(
                 Group(
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index 508609d..8d3e37a 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -83,6 +83,10 @@ class ExtLayout(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate layout block")
 
+    @docs("layout")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtLayout")
+
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index c54547f..3309c08 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -108,3 +108,7 @@ class ExtListItemFactory(AstNode):
         just hear to satisfy XmlOutput._emit_object_or_template
         """
         return None
+
+    @docs("id")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtListItemFactory")
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index a77484a..c7ef5f2 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -70,6 +70,25 @@ class Menu(AstNode):
         if self.id in RESERVED_IDS:
             raise CompileWarning(f"{self.id} may be a confusing object ID")
 
+    @docs("menu")
+    def ref_docs_menu(self):
+        return get_docs_section("Syntax Menu")
+
+    @docs("section")
+    def ref_docs_section(self):
+        return get_docs_section("Syntax Menu")
+
+    @docs("submenu")
+    def ref_docs_submenu(self):
+        return get_docs_section("Syntax Menu")
+
+    @docs("item")
+    def ref_docs_item(self):
+        if self.tokens["shorthand"]:
+            return get_docs_section("Syntax MenuItemShorthand")
+        else:
+            return get_docs_section("Syntax Menu")
+
 
 class MenuAttribute(AstNode):
     tag_name = "attribute"
@@ -156,6 +175,7 @@ menu_item_shorthand = Group(
     [
         Keyword("item"),
         UseLiteral("tag", "item"),
+        UseLiteral("shorthand", True),
         "(",
         Group(
             MenuAttribute,
diff --git a/blueprintcompiler/language/gtk_scale.py b/blueprintcompiler/language/gtk_scale.py
index ac4b77c..1fd5ac3 100644
--- a/blueprintcompiler/language/gtk_scale.py
+++ b/blueprintcompiler/language/gtk_scale.py
@@ -94,6 +94,10 @@ class ExtScaleMark(AstNode):
                 did_you_mean=(self.position, positions.keys()),
             )
 
+    @docs("mark")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtScaleMarks")
+
 
 class ExtScaleMarks(AstNode):
     grammar = [
@@ -123,6 +127,10 @@ class ExtScaleMarks(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate 'marks' block")
 
+    @docs("marks")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtScaleMarks")
+
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index fd23738..54d85e5 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -94,6 +94,10 @@ class ExtSizeGroupWidgets(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate widgets block")
 
+    @docs("widgets")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtSizeGroupWidgets")
+
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index 36a01f6..a146f35 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -57,7 +57,7 @@ class ExtStringListStrings(AstNode):
             self.group.tokens["strings"].range,
         )
 
-    @validate("items")
+    @validate("strings")
     def container_is_string_list(self):
         validate_parent_type(self, "Gtk", "StringList", "StringList items")
 
@@ -65,6 +65,10 @@ class ExtStringListStrings(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate strings block")
 
+    @docs("strings")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtStringListStrings")
+
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_styles.py b/blueprintcompiler/language/gtk_styles.py
index 236dde0..8617522 100644
--- a/blueprintcompiler/language/gtk_styles.py
+++ b/blueprintcompiler/language/gtk_styles.py
@@ -70,6 +70,10 @@ class ExtStyles(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate styles block")
 
+    @docs("styles")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtStyles")
+
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtkbuilder_child.py b/blueprintcompiler/language/gtkbuilder_child.py
index b0563ba..bee551c 100644
--- a/blueprintcompiler/language/gtkbuilder_child.py
+++ b/blueprintcompiler/language/gtkbuilder_child.py
@@ -53,6 +53,10 @@ class ChildExtension(AstNode):
     def child(self) -> ExtResponse:
         return self.children[0]
 
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax ChildExtension")
+
 
 class ChildAnnotation(AstNode):
     grammar = ["[", AnyOf(ChildInternal, ChildExtension, ChildType), "]"]
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 29f7b37..96383eb 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -88,6 +88,10 @@ class Template(Object):
             f"Only one template may be defined per file, but this file contains {len(self.parent.children[Template])}",
         )
 
+    @docs("id")
+    def ref_docs(self):
+        return get_docs_section("Syntax Template")
+
 
 @decompiler("template")
 def decompile_template(ctx: DecompileCtx, gir, klass, parent=None):
diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index bf5dddd..3060bea 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -68,6 +68,10 @@ class GtkDirective(AstNode):
             # For better error handling, just assume it's 4.0
             return gir.get_namespace("Gtk", "4.0")
 
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax GtkDecl")
+
 
 class Import(AstNode):
     grammar = Statement(
@@ -105,3 +109,7 @@ class Import(AstNode):
             return gir.get_namespace(self.tokens["namespace"], self.tokens["version"])
         except CompileError:
             return None
+
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax Using")
diff --git a/blueprintcompiler/language/response_id.py b/blueprintcompiler/language/response_id.py
index 8c0c807..939f71f 100644
--- a/blueprintcompiler/language/response_id.py
+++ b/blueprintcompiler/language/response_id.py
@@ -124,6 +124,16 @@ class ExtResponse(AstNode):
         object = self.parent_by_type(Child).object
         return object.id
 
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax ExtResponse")
+
+    @docs("response_id")
+    def response_id_docs(self):
+        if enum := self.root.gir.get_type("ResponseType", "Gtk"):
+            if member := enum.members.get(self.response_id, None):
+                return member.doc
+
 
 def decompile_response_type(parent_element, child_element):
     obj_id = None
diff --git a/blueprintcompiler/language/translation_domain.py b/blueprintcompiler/language/translation_domain.py
index ff20ead..0f60af9 100644
--- a/blueprintcompiler/language/translation_domain.py
+++ b/blueprintcompiler/language/translation_domain.py
@@ -29,3 +29,7 @@ class TranslationDomain(AstNode):
     @property
     def domain(self):
         return self.tokens["domain"]
+
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax TranslationDomain")
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 2678693..63cf4fc 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -20,6 +20,7 @@
 import typing as T
 
 from blueprintcompiler.gir import ArrayType
+from blueprintcompiler.lsp_utils import SemanticToken
 
 from .common import *
 from .contexts import ScopeCtx, ValueTypeCtx
@@ -56,6 +57,10 @@ class Translated(AstNode):
                 f"Cannot convert translated string to {expected_type.full_name}"
             )
 
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax Translated")
+
 
 class TypeLiteral(AstNode):
     grammar = [
@@ -101,6 +106,10 @@ class TypeLiteral(AstNode):
                 ],
             )
 
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax TypeLiteral")
+
 
 class QuotedLiteral(AstNode):
     grammar = UseQuoted("value")
@@ -258,6 +267,10 @@ class Flags(AstNode):
         if expected_type is not None and not isinstance(expected_type, gir.Bitfield):
             raise CompileError(f"{expected_type.full_name} is not a bitfield type")
 
+    @docs()
+    def ref_docs(self):
+        return get_docs_section("Syntax Flags")
+
 
 class IdentLiteral(AstNode):
     grammar = UseIdent("value")
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 9362e8c..b938181 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -19,6 +19,8 @@
 
 
 import enum
+import json
+import os
 import typing as T
 from dataclasses import dataclass, field
 
@@ -200,3 +202,27 @@ class TextEdit:
 
     def to_json(self):
         return {"range": self.range.to_json(), "newText": self.newText}
+
+
+_docs_sections: T.Optional[dict[str, T.Any]] = None
+
+
+def get_docs_section(section_name: str) -> T.Optional[str]:
+    global _docs_sections
+
+    if _docs_sections is None:
+        try:
+            with open(
+                os.path.join(os.path.dirname(__file__), "reference_docs.json")
+            ) as f:
+                _docs_sections = json.load(f)
+        except FileNotFoundError:
+            _docs_sections = {}
+
+    if section := _docs_sections.get(section_name):
+        content = section["content"]
+        link = section["link"]
+        content += f"\n\n---\n\n[Online documentation]({link})"
+        return content
+    else:
+        return None
diff --git a/docs/collect-sections.py b/docs/collect-sections.py
new file mode 100755
index 0000000..c6e01b3
--- /dev/null
+++ b/docs/collect-sections.py
@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+
+import json
+import os
+import re
+import sys
+from dataclasses import dataclass
+from pathlib import Path
+
+__all__ = ["get_docs_section"]
+
+DOCS_ROOT = "https://jwestman.pages.gitlab.gnome.org/blueprint-compiler"
+
+
+sections: dict[str, "Section"] = {}
+
+
+@dataclass
+class Section:
+    link: str
+    lines: str
+
+    def to_json(self):
+        return {
+            "content": rst_to_md(self.lines),
+            "link": self.link,
+        }
+
+
+def load_reference_docs():
+    for filename in Path(os.path.dirname(__file__), "reference").glob("*.rst"):
+        with open(filename) as f:
+            section_name = None
+            lines = []
+
+            def close_section():
+                if section_name:
+                    html_file = re.sub(r"\.rst$", ".html", filename.name)
+                    anchor = re.sub(r"[^a-z0-9]+", "-", section_name.lower())
+                    link = f"{DOCS_ROOT}/reference/{html_file}#{anchor}"
+                    sections[section_name] = Section(link, lines)
+
+            for line in f:
+                if m := re.match(r"\.\.\s+_(.*):", line):
+                    close_section()
+                    section_name = m.group(1)
+                    lines = []
+                else:
+                    lines.append(line)
+
+            close_section()
+
+
+# This isn't a comprehensive rST to markdown converter, it just needs to handle the
+# small subset of rST used in the reference docs.
+def rst_to_md(lines: list[str]) -> str:
+    result = ""
+
+    def rst_to_md_inline(line):
+        line = re.sub(r"``(.*?)``", r"`\1`", line)
+        line = re.sub(
+            r":ref:`(.*?)<(.*?)>`",
+            lambda m: f"[{m.group(1)}]({sections[m.group(2)].link})",
+            line,
+        )
+        line = re.sub(r"`([^`]*?) <([^`>]*?)>`_", r"[\1](\2)", line)
+        return line
+
+    i = 0
+    n = len(lines)
+    heading_levels = {}
+
+    def print_block(lang: str = "", code: bool = True, strip_links: bool = False):
+        nonlocal result, i
+        block = ""
+        while i < n:
+            line = lines[i].rstrip()
+            if line.startswith("   "):
+                line = line[3:]
+            elif line != "":
+                break
+
+            if strip_links:
+                line = re.sub(r":ref:`(.*?)<(.*?)>`", r"\1", line)
+
+            if not code:
+                line = rst_to_md_inline(line)
+
+            block += line + "\n"
+            i += 1
+
+        if code:
+            result += f"```{lang}\n{block.strip()}\n```\n\n"
+        else:
+            result += block
+
+    while i < n:
+        line = lines[i].rstrip()
+        i += 1
+        if line == ".. rst-class:: grammar-block":
+            print_block(strip_links=True)
+        elif line == ".. code-block:: blueprint":
+            print_block("blueprint")
+        elif line == ".. note::":
+            result += "#### Note\n"
+            print_block(code=False)
+        elif m := re.match(r"\.\. image:: (.*)", line):
+            result += f"![{m.group(1)}]({DOCS_ROOT}/_images/{m.group(1)})\n"
+        elif i < n and re.match(r"^((-+)|(~+)|(\++))$", lines[i]):
+            level_char = lines[i][0]
+            if level_char not in heading_levels:
+                heading_levels[level_char] = max(heading_levels.values(), default=1) + 1
+            result += (
+                "#" * heading_levels[level_char] + " " + rst_to_md_inline(line) + "\n"
+            )
+            i += 1
+        else:
+            result += rst_to_md_inline(line) + "\n"
+
+    return result
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print("Usage: collect_sections.py <output_file>")
+        sys.exit(1)
+
+    outfile = sys.argv[1]
+
+    load_reference_docs()
+
+    # print the sections to a json file
+    with open(outfile, "w") as f:
+        json.dump(
+            {name: section.to_json() for name, section in sections.items()}, f, indent=2
+        )
diff --git a/docs/meson.build b/docs/meson.build
index 95e545d..d9ad736 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -9,3 +9,11 @@ custom_target('docs',
 )
 
 endif
+
+custom_target('reference_docs.json',
+  output: 'reference_docs.json',
+  command: [meson.current_source_dir() / 'collect-sections.py', '@OUTPUT@'],
+  build_always_stale: true,
+  install: true,
+  install_dir: py.get_install_dir() / 'blueprintcompiler',
+)
\ No newline at end of file
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index 93ed0fc..0961d14 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -227,7 +227,7 @@ Valid in `Gtk.BuilderListItemFactory <https://docs.gtk.org/gtk4/class.BuilderLis
 
 The ``template`` block defines the template that will be used to create list items. This block is unique within Blueprint because it defines a completely separate sub-blueprint which is used to create each list item. The sub-blueprint may not reference objects in the main blueprint or vice versa.
 
-The template type must be `Gtk.ListItem <https://docs.gtk.org/gtk4/class.ListItem.html>`_, `Gtk.ColumnViewRow <https://docs.gtk.org/gtk4/class.ColumnViewRow.html>`_, or `Gtk.ColumnViewCell <https://docs.gtk.org/gtk4/class.ColumnViewCell.html>`_ The template object can be referenced with the ``template`` keyword.
+The template type must be `Gtk.ListItem <https://docs.gtk.org/gtk4/class.ListItem.html>`_, `Gtk.ColumnViewRow <https://docs.gtk.org/gtk4/class.ColumnViewRow.html>`_, or `Gtk.ColumnViewCell <https://docs.gtk.org/gtk4/class.ColumnViewCell.html>`_. The template object can be referenced with the ``template`` keyword.
 
 .. code-block:: blueprint
 
diff --git a/meson.build b/meson.build
index f676459..63d9489 100644
--- a/meson.build
+++ b/meson.build
@@ -2,13 +2,13 @@ project('blueprint-compiler',
   version: '0.14.0',
 )
 
-subdir('docs')
-
 prefix = get_option('prefix')
 datadir = join_paths(prefix, get_option('datadir'))
 
 py = import('python').find_installation('python3')
 
+subdir('docs')
+
 configure_file(
   input: 'blueprint-compiler.pc.in',
   output: 'blueprint-compiler.pc',

From a529a619553a722536c614287ce9ce69bc6720dc Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 3 Nov 2024 14:17:59 -0600
Subject: [PATCH 50/82] docs: Corrections, updates, and improvements

---
 docs/collect-sections.py       |  2 +-
 docs/reference/diagnostics.rst |  2 +-
 docs/reference/expressions.rst | 14 +++++++-------
 docs/reference/index.rst       |  2 +-
 docs/reference/templates.rst   |  7 ++++---
 docs/reference/values.rst      | 12 ++++++------
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/docs/collect-sections.py b/docs/collect-sections.py
index c6e01b3..e6227e7 100755
--- a/docs/collect-sections.py
+++ b/docs/collect-sections.py
@@ -98,7 +98,7 @@ def rst_to_md(lines: list[str]) -> str:
         line = lines[i].rstrip()
         i += 1
         if line == ".. rst-class:: grammar-block":
-            print_block(strip_links=True)
+            print_block("text", strip_links=True)
         elif line == ".. code-block:: blueprint":
             print_block("blueprint")
         elif line == ".. note::":
diff --git a/docs/reference/diagnostics.rst b/docs/reference/diagnostics.rst
index 2c0af59..c8774d6 100644
--- a/docs/reference/diagnostics.rst
+++ b/docs/reference/diagnostics.rst
@@ -21,7 +21,7 @@ The tokenizer encountered an unexpected sequence of characters that aren't part
 
 child_not_accepted
 ------------------
-The parent class does not have child widgets (it does not implement `Gtk.Buildable <https://docs.gtk.org/gtk4/iface.Buildable.html>`_ and is not a subclass of `Gio.ListStore <https://docs.gtk.org/gio/class.ListStore.html>`_). Some classes use properties instead of children to add widgets. Check the parent class's documentation.
+The parent class does not have child objects (it does not implement `Gtk.Buildable <https://docs.gtk.org/gtk4/iface.Buildable.html>`_ and is not a subclass of `Gio.ListStore <https://docs.gtk.org/gio/class.ListStore.html>`_). Some classes use properties instead of children to add widgets. Check the parent class's documentation.
 
 
 .. _Diagnostic conversion_error:
diff --git a/docs/reference/expressions.rst b/docs/reference/expressions.rst
index 1ba50ee..8688ff0 100644
--- a/docs/reference/expressions.rst
+++ b/docs/reference/expressions.rst
@@ -8,10 +8,10 @@ automatically.
 
 .. code-block:: blueprint
 
-   label: bind MyAppWindow.account.username;
-   /*     ^               ^       ^
-          |               creates lookup expressions that are re-evaluated when
-          |               the account's username *or* the account itself changes
+   label: bind template.account.username;
+   /*     ^             ^       ^
+          |             creates lookup expressions that are re-evaluated when
+          |             the account's username *or* the account itself changes
           |
           binds the `label` property to the expression's output
     */
@@ -49,7 +49,7 @@ Lookup Expressions
 
    LookupExpression = '.' <property::ref:`IDENT<Syntax IDENT>`>
 
-Lookup expressions perform a GObject property lookup on the preceding expression. They are recalculated whenever the property changes, using the `notify signal <https://docs.gtk.org/gobject/signal.Object.notify.html>`_
+Lookup expressions perform a GObject property lookup on the preceding expression. They are recalculated whenever the property changes, using the `notify signal <https://docs.gtk.org/gobject/signal.Object.notify.html>`_.
 
 The type of a property expression is the type of the property it refers to.
 
@@ -65,7 +65,7 @@ Closure Expressions
 
 Closure expressions allow you to perform additional calculations that aren't supported in blueprint by writing those calculations as application code. These application-defined functions are created in the same way as :ref:`signal handlers<Syntax Signal>`.
 
-Expressions are only reevaluated when their inputs change. Because blueprint doesn't manage a closure's application code, it can't tell what changes might affect the result. Therefore, closures must be *pure*, or deterministic. They may only calculate the result based on their immediate inputs, properties of their inputs or outside variables.
+Expressions are only reevaluated when their inputs change. Because blueprint doesn't manage a closure's application code, it can't tell what changes might affect the result. Therefore, closures must be *pure*, or deterministic. They may only calculate the result based on their immediate inputs, not properties of their inputs or outside variables.
 
 Blueprint doesn't know the closure's return type, so closure expressions must be cast to the correct return type using a :ref:`cast expression<Syntax CastExpression>`.
 
@@ -79,7 +79,7 @@ Cast Expressions
 
    CastExpression = 'as' '<' :ref:`TypeName<Syntax TypeName>` '>'
 
-Cast expressions allow Blueprint to know the type of an expression when it can't otherwise determine it.
+Cast expressions allow Blueprint to know the type of an expression when it can't otherwise determine it. This is necessary for closures and for properties of application-defined types.
 
 .. code-block:: blueprint
 
diff --git a/docs/reference/index.rst b/docs/reference/index.rst
index 7670ba5..d49feb9 100644
--- a/docs/reference/index.rst
+++ b/docs/reference/index.rst
@@ -31,7 +31,7 @@ Tokens
 IDENT
 ~~~~~
 
-An identifier starts with an ASCII underscore ``_`` or letter ``[A-Za-z]`` and consists of ASCII underscores, letters, digits ``[0-9]``, and dashes ``-``. Dashes are included for historical reasons, since GObject properties are traditionally kebab-case.
+An identifier starts with an ASCII underscore ``_`` or letter ``[A-Za-z]`` and consists of ASCII underscores, letters, digits ``[0-9]``, and dashes ``-``. Dashes are included for historical reasons, since GObject properties and signals are traditionally kebab-case.
 
 .. _Syntax NUMBER:
 
diff --git a/docs/reference/templates.rst b/docs/reference/templates.rst
index a1a9968..74e4225 100644
--- a/docs/reference/templates.rst
+++ b/docs/reference/templates.rst
@@ -90,6 +90,7 @@ To reference the template object in a binding or expression, use the ``template`
 Language Implementations
 ------------------------
 
-- ``gtk_widget_class_set_template ()`` in C: https://docs.gtk.org/gtk4/class.Widget.html#building-composite-widgets-from-template-xml
-- ``#[template]`` in gtk-rs: https://gtk-rs.org/gtk4-rs/stable/latest/book/composite_templates.html
-- ``GObject.registerClass()`` in GJS: https://gjs.guide/guides/gtk/3/14-templates.html
\ No newline at end of file
+- **C** ``gtk_widget_class_set_template ()``: https://docs.gtk.org/gtk4/class.Widget.html#building-composite-widgets-from-template-xml
+- **gtk-rs** ``#[template]``: https://gtk-rs.org/gtk4-rs/stable/latest/book/composite_templates.html
+- **GJS** ``GObject.registerClass()``: https://gjs.guide/guides/gtk/3/14-templates.html
+- **PyGObject** ``@Gtk.Template``: https://pygobject.gnome.org/guide/gtk_template.html
diff --git a/docs/reference/values.rst b/docs/reference/values.rst
index fb63e38..fd414a8 100644
--- a/docs/reference/values.rst
+++ b/docs/reference/values.rst
@@ -109,7 +109,7 @@ Bindings
 .. rst-class:: grammar-block
 
    Binding = 'bind' :ref:`Expression<Syntax Expression>` (BindingFlag)*
-   BindingFlag = 'inverted' | 'bidirectional' | 'sync-create'
+   BindingFlag = 'inverted' | 'bidirectional' | 'no-sync-create'
 
 Bindings keep a property updated as other properties change. They can be used to keep the UI in sync with application data, or to connect two parts of the UI.
 
@@ -120,8 +120,8 @@ Simple Bindings
 
 A binding that consists of a source object and a single lookup is called a "simple binding". These are implemented using `GObject property bindings <https://docs.gtk.org/gobject/method.Object.bind_property.html>`_ and support a few flags:
 
-- ``bidirectional``: The binding is two-way, so changes to the target property will also update the source property.
 - ``inverted``: For boolean properties, the target is set to the inverse of the source property.
+- ``bidirectional``: The binding is two-way, so changes to the target property will also update the source property.
 - ``no-sync-create``: Normally, when a binding is created, the target property is immediately updated with the current value of the source property. This flag disables that behavior, and the bound property will be updated the next time the source property changes.
 
 Complex Bindings
@@ -137,11 +137,11 @@ Example
    /* Use bindings to show a label when a switch
     * is active, without any application code */
 
-   Switch advanced_feature {}
+   Switch show_label {}
 
-   Label warning {
-     visible: bind advanced_feature.active;
-     label: _("This is an advanced feature. Use with caution!");
+   Label {
+     visible: bind show_label.active;
+     label: _("I'm a label that's only visible when the switch is enabled!");
    }
 
 .. _Syntax ObjectValue:

From 3bf8fc151a2bd3366e3a46cf22a5b323c0c620e4 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 3 Nov 2024 14:36:51 -0600
Subject: [PATCH 51/82] tests: Ignore deprecation warnings

Ignore deprecation warnings in the error handling tests, except in the
test specifically for deprecations. This prevents them from breaking if
libraries introduce new deprecations.

Fixes #178.
---
 tests/sample_errors/legacy_template.err |  1 -
 tests/test_samples.py                   | 14 ++++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/sample_errors/legacy_template.err b/tests/sample_errors/legacy_template.err
index 79ad519..876b0cf 100644
--- a/tests/sample_errors/legacy_template.err
+++ b/tests/sample_errors/legacy_template.err
@@ -1,3 +1,2 @@
 3,10,12,Use type syntax here (introduced in blueprint 0.8.0)
-8,1,6,Gtk.Dialog is deprecated
 9,18,12,Use 'template' instead of the class name (introduced in 0.8.0)
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 00ef72a..fe90774 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -130,18 +130,20 @@ class TestSamples(unittest.TestCase):
             if len(warnings):
                 raise MultipleErrors(warnings)
         except PrintableError as e:
+            # Ignore deprecation warnings because new versions of libraries can introduce
+            # new deprecations, which would cause the tests to fail
+            errors = [
+                error
+                for error in (e.errors if isinstance(e, MultipleErrors) else [e])
+                if (name == "deprecations" or not isinstance(error, DeprecatedWarning))
+            ]
 
             def error_str(error: CompileError):
                 line, col = utils.idx_to_pos(error.range.start + 1, blueprint)
                 len = error.range.length
                 return ",".join([str(line + 1), str(col), str(len), error.message])
 
-            if isinstance(e, CompileError):
-                actual = error_str(e)
-            elif isinstance(e, MultipleErrors):
-                actual = "\n".join([error_str(error) for error in e.errors])
-            else:  # pragma: no cover
-                raise AssertionError()
+            actual = "\n".join([error_str(error) for error in errors])
 
             self.assertEqual(actual.strip(), expected.strip())
         else:  # pragma: no cover

From 90308b69e0c6e968c389142de118d5c6a00135e2 Mon Sep 17 00:00:00 2001
From: Vladimir Vaskov <rirusha@altlinux.org>
Date: Mon, 16 Sep 2024 18:44:03 +0000
Subject: [PATCH 52/82] docs: Add app making use of Blueprint

---
 docs/index.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.rst b/docs/index.rst
index d405498..345e613 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -81,6 +81,7 @@ Built with Blueprint
 - `AdwSteamGtk <https://github.com/Foldex/AdwSteamGtk>`_
 - `Blurble <https://gitlab.gnome.org/World/Blurble>`_
 - `Bottles <https://github.com/bottlesdevs/Bottles>`_
+- `Cassette <https://gitlab.gnome.org/Rirusha/Cassette>`_
 - `Cartridges <https://github.com/kra-mo/cartridges>`_
 - `Cavalier <https://github.com/NickvisionApps/Cavalier>`_
 - `Chance <https://zelikos.dev/apps/rollit>`_

From a42ec3a9450d865b9856d7ad3128edadd9a5fe1b Mon Sep 17 00:00:00 2001
From: Vladimir Vaskov <rirusha@altlinux.org>
Date: Sat, 19 Oct 2024 20:39:57 +0000
Subject: [PATCH 53/82] docs: Put the cassette in the correct alphabetical
 place

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index 345e613..34b942c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -81,8 +81,8 @@ Built with Blueprint
 - `AdwSteamGtk <https://github.com/Foldex/AdwSteamGtk>`_
 - `Blurble <https://gitlab.gnome.org/World/Blurble>`_
 - `Bottles <https://github.com/bottlesdevs/Bottles>`_
-- `Cassette <https://gitlab.gnome.org/Rirusha/Cassette>`_
 - `Cartridges <https://github.com/kra-mo/cartridges>`_
+- `Cassette <https://gitlab.gnome.org/Rirusha/Cassette>`_
 - `Cavalier <https://github.com/NickvisionApps/Cavalier>`_
 - `Chance <https://zelikos.dev/apps/rollit>`_
 - `Commit <https://github.com/sonnyp/Commit/>`_

From 6acf0fe5a0f1573962cd14ff88435db94ce4a109 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 9 Dec 2024 18:59:25 -0600
Subject: [PATCH 54/82] tests: Test deprecations separately

Libraries can add new deprecations, or the environment you're running
the tests in might have old libraries where the things we test aren't
deprecated yet. Move the deprecations test into its own module with its
own code, so it can check library versions and skip the test if it won't
work.
---
 blueprintcompiler/language/expression.py |  18 ++++
 tests/sample_errors/deprecations.blp     |   9 --
 tests/sample_errors/deprecations.err     |   1 -
 tests/test_deprecations.py               | 110 +++++++++++++++++++++++
 4 files changed, 128 insertions(+), 10 deletions(-)
 delete mode 100644 tests/sample_errors/deprecations.blp
 delete mode 100644 tests/sample_errors/deprecations.err
 create mode 100644 tests/test_deprecations.py

diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 558392c..ae9c399 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -171,6 +171,24 @@ class LookupOp(InfixExpr):
                 did_you_mean=(self.property_name, self.lhs.type.properties.keys()),
             )
 
+    @validate("property")
+    def property_deprecated(self):
+        if self.lhs.type is None or not (
+            isinstance(self.lhs.type, gir.Class)
+            or isinstance(self.lhs.type, gir.Interface)
+        ):
+            return
+
+        if property := self.lhs.type.properties.get(self.property_name):
+            if property.deprecated:
+                hints = []
+                if property.deprecated_doc:
+                    hints.append(property.deprecated_doc)
+                raise DeprecatedWarning(
+                    f"{property.signature} is deprecated",
+                    hints=hints,
+                )
+
 
 class CastExpr(InfixExpr):
     grammar = [
diff --git a/tests/sample_errors/deprecations.blp b/tests/sample_errors/deprecations.blp
deleted file mode 100644
index f67f002..0000000
--- a/tests/sample_errors/deprecations.blp
+++ /dev/null
@@ -1,9 +0,0 @@
-using Gtk 4.0;
-
-Dialog {
-  use-header-bar: 1;
-}
-
-Window {
-  keys-changed => $on_window_keys_changed();
-}
diff --git a/tests/sample_errors/deprecations.err b/tests/sample_errors/deprecations.err
deleted file mode 100644
index e3abd61..0000000
--- a/tests/sample_errors/deprecations.err
+++ /dev/null
@@ -1 +0,0 @@
-3,1,6,Gtk.Dialog is deprecated
\ No newline at end of file
diff --git a/tests/test_deprecations.py b/tests/test_deprecations.py
new file mode 100644
index 0000000..0ffe726
--- /dev/null
+++ b/tests/test_deprecations.py
@@ -0,0 +1,110 @@
+# test_samples.py
+#
+# Copyright 2024 James Westman <james@jwestman.net>
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+
+import unittest
+
+import gi
+
+gi.require_version("Gtk", "4.0")
+from gi.repository import Gtk
+
+from blueprintcompiler import parser, tokenizer
+from blueprintcompiler.errors import DeprecatedWarning, PrintableError
+
+# Testing deprecation warnings requires special handling because libraries can add deprecations with new versions,
+# causing tests to break if we're not careful.
+
+
+class TestDeprecations(unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.gtkVersion = f"{Gtk.get_major_version()}.{Gtk.get_minor_version()}.{Gtk.get_micro_version()}"
+
+    def assertDeprecation(self, blueprint: str, message: str):
+        try:
+            tokens = tokenizer.tokenize(blueprint)
+            _ast, errors, warnings = parser.parse(tokens)
+
+            self.assertIsNone(errors)
+            self.assertEqual(len(warnings), 1)
+            self.assertIsInstance(warnings[0], DeprecatedWarning)
+            self.assertEqual(warnings[0].message, message)
+        except PrintableError as e:  # pragma: no cover
+            e.pretty_print("<deprecations test>", blueprint)
+            raise AssertionError()
+
+    def test_class_deprecation(self):
+        if Gtk.check_version(4, 10, 0) is not None:
+            self.skipTest(f"Gtk.Dialog is not deprecated in GTK {self.gtkVersion}")
+
+        blueprint = """
+        using Gtk 4.0;
+
+        Dialog {
+            use-header-bar: 1;
+        }
+        """
+        message = "Gtk.Dialog is deprecated"
+
+        self.assertDeprecation(blueprint, message)
+
+    def test_property_deprecation(self):
+        self.skipTest(
+            "gobject-introspection does not currently write property deprecations to the typelib. See <https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/410>."
+        )
+
+        if Gtk.check_version(4, 4, 0) is not None:
+            self.skipTest(
+                f"Gtk.DropTarget:drop is not deprecated in GTK {self.gtkVersion}"
+            )
+
+        blueprint = """
+        using Gtk 4.0;
+
+        $MyObject {
+            a: bind drop_target.drop;
+        }
+
+        DropTarget drop_target {
+        }
+        """
+
+        message = "Gtk.DropTarget:drop is deprecated"
+
+        self.assertDeprecation(blueprint, message)
+
+    def test_signal_deprecation(self):
+        if Gtk.check_version(4, 10, 0) is not None:
+            self.skipTest(
+                f"Gtk.Window::keys-changed is not deprecated in GTK {self.gtkVersion}"
+            )
+
+        blueprint = """
+        using Gtk 4.0;
+
+        Window {
+            keys-changed => $handler();
+        }
+        """
+
+        message = "signal Gtk.Window::keys-changed () is deprecated"
+
+        self.assertDeprecation(blueprint, message)

From 778a979714f8eecbbe47953be8b23b6f2fe5a752 Mon Sep 17 00:00:00 2001
From: Luoyayu <gavinhty@gmail.com>
Date: Sat, 7 Dec 2024 07:36:14 +0000
Subject: [PATCH 55/82] lsp: Fix format of JSON-RPC content part ending with
 \r\n

---
 blueprintcompiler/lsp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 25b289f..0659154 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -149,7 +149,7 @@ class LanguageServer:
 
     def _send(self, data):
         data["jsonrpc"] = "2.0"
-        line = json.dumps(data, separators=(",", ":")) + "\r\n"
+        line = json.dumps(data, separators=(",", ":"))
         printerr("output: " + line)
         sys.stdout.write(
             f"Content-Length: {len(line.encode())}\r\nContent-Type: application/vscode-jsonrpc; charset=utf-8\r\n\r\n{line}"

From ac70ea7403abebc895b3b60082842604156babfd Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jpetridis@gnome.org>
Date: Wed, 13 Nov 2024 00:48:16 +0200
Subject: [PATCH 56/82] Port to libgirepository-2.0

pygobject 3.52 has switched [1] to using libgirepository-2.0 which
comes from glib itself now, rather than the 1.0 which came from
gobject-introspection.

This means that it fails to load the incompatible "GIRepository 2.0"
and thus must be ported to 3.0 (which is provided by
libgirepository-2.0).

Migration guide is here [2]

[1]: https://gitlab.gnome.org/GNOME/pygobject/-/merge_requests/320
[2]: https://docs.gtk.org/girepository/migrating-gi.html

This commit adds suppport for importing with
"gi.require_version("GIRepository", "3.0") and falling
back to the existing "GIRepository 2.0" if not found.
---
 blueprintcompiler/gir.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 30a5eaa..e54b849 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -24,8 +24,20 @@ from functools import cached_property
 
 import gi  # type: ignore
 
-gi.require_version("GIRepository", "2.0")
-from gi.repository import GIRepository  # type: ignore
+try:
+    gi.require_version("GIRepository", "3.0")
+    from gi.repository import GIRepository  # type: ignore
+
+    _repo = GIRepository.Repository()
+except ValueError:
+    # We can remove this once we can bump the minimum dependencies
+    # to glib 2.80 and pygobject 3.52
+    # dependency('glib-2.0', version: '>= 2.80.0')
+    # dependency('girepository-2.0', version: '>= 2.80.0')
+    gi.require_version("GIRepository", "2.0")
+    from gi.repository import GIRepository  # type: ignore
+
+    _repo = GIRepository.Repository
 
 from . import typelib, xml_reader
 from .errors import CompileError, CompilerBugError
@@ -42,7 +54,7 @@ def add_typelib_search_path(path: str):
 
 
 def get_namespace(namespace: str, version: str) -> "Namespace":
-    search_paths = [*GIRepository.Repository.get_search_path(), *_user_search_paths]
+    search_paths = [*_repo.get_search_path(), *_user_search_paths]
 
     filename = f"{namespace}-{version}.typelib"
 
@@ -74,7 +86,7 @@ def get_available_namespaces() -> T.List[T.Tuple[str, str]]:
         return _available_namespaces
 
     search_paths: list[str] = [
-        *GIRepository.Repository.get_search_path(),
+        *_repo.get_search_path(),
         *_user_search_paths,
     ]
 

From f48b840cfa478d6bfeb6e16f24fd5b650c70e4f2 Mon Sep 17 00:00:00 2001
From: kotontrion <kotontrion@tutanota.de>
Date: Wed, 20 Nov 2024 10:41:56 +0100
Subject: [PATCH 57/82] compile: fix flag values

gtk builder does not support combining interger values with | in flags
properties, so the short names are used instead.
---
 blueprintcompiler/language/values.py | 2 +-
 tests/samples/flags.ui               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 63cf4fc..e060b65 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -216,7 +216,7 @@ class Flag(AstNode):
         if not isinstance(type, Enumeration):
             return None
         elif member := type.members.get(self.name):
-            return member.value
+            return member.name
         else:
             return None
 
diff --git a/tests/samples/flags.ui b/tests/samples/flags.ui
index 2f0a26e..d13c424 100644
--- a/tests/samples/flags.ui
+++ b/tests/samples/flags.ui
@@ -7,7 +7,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GApplication">
-    <property name="flags">1|4</property>
+    <property name="flags">is_service|handles_open</property>
   </object>
   <object class="GtkEventControllerScroll">
     <property name="flags">1</property>

From 2ae41020abfb04649e9791f57c84fc708d428283 Mon Sep 17 00:00:00 2001
From: kotontrion <kotontrion@tutanota.de>
Date: Thu, 21 Nov 2024 09:28:40 +0100
Subject: [PATCH 58/82] Fix flag return value type

---
 blueprintcompiler/language/values.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index e060b65..4cd600d 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -211,7 +211,7 @@ class Flag(AstNode):
         return self.tokens["value"]
 
     @property
-    def value(self) -> T.Optional[int]:
+    def value(self) -> T.Optional[str]:
         type = self.context[ValueTypeCtx].value_type
         if not isinstance(type, Enumeration):
             return None

From e07da3c33946e7ab4afed9c564a9e7ae0b3fbbb8 Mon Sep 17 00:00:00 2001
From: kotontrion <kotontrion@tutanota.de>
Date: Tue, 26 Nov 2024 10:52:37 +0100
Subject: [PATCH 59/82] flags: use nick instead of name

---
 blueprintcompiler/language/values.py | 2 +-
 tests/samples/flags.ui               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 4cd600d..96787ee 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -216,7 +216,7 @@ class Flag(AstNode):
         if not isinstance(type, Enumeration):
             return None
         elif member := type.members.get(self.name):
-            return member.name
+            return member.nick
         else:
             return None
 
diff --git a/tests/samples/flags.ui b/tests/samples/flags.ui
index d13c424..44eb2c4 100644
--- a/tests/samples/flags.ui
+++ b/tests/samples/flags.ui
@@ -7,7 +7,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GApplication">
-    <property name="flags">is_service|handles_open</property>
+    <property name="flags">is-service|handles-open</property>
   </object>
   <object class="GtkEventControllerScroll">
     <property name="flags">1</property>

From 5b0f662478343270a1ada82938534cc0c91bef07 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 21 Dec 2024 17:22:56 -0600
Subject: [PATCH 60/82] completions: Detect translatable properties

Looked through the Gtk documentation (and a few other libraries) to make
a list of all the properties that should probably be translated. If a
property is on the list, the language server will mark it as translated
in completions.
---
 blueprintcompiler/annotations.py | 191 +++++++++++++++++++++++++++++++
 blueprintcompiler/completions.py |  10 +-
 2 files changed, 199 insertions(+), 2 deletions(-)
 create mode 100644 blueprintcompiler/annotations.py

diff --git a/blueprintcompiler/annotations.py b/blueprintcompiler/annotations.py
new file mode 100644
index 0000000..c40de13
--- /dev/null
+++ b/blueprintcompiler/annotations.py
@@ -0,0 +1,191 @@
+# annotations.py
+#
+# Copyright 2024 James Westman <james@jwestman.net>
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# Extra information about types in common libraries that's used for things like completions.
+
+import typing as T
+from dataclasses import dataclass
+
+from . import gir
+
+
+@dataclass
+class Annotation:
+    translatable_properties: T.List[str]
+
+
+def is_property_translated(property: gir.Property):
+    ns = property.get_containing(gir.Namespace)
+    ns_name = ns.name + "-" + ns.version
+    if annotation := _ANNOTATIONS.get(ns_name):
+        assert property.container is not None
+        return (
+            property.container.name + ":" + property.name
+            in annotation.translatable_properties
+        )
+    else:
+        return False
+
+
+_ANNOTATIONS = {
+    "Gtk-4.0": Annotation(
+        translatable_properties=[
+            "AboutDialog:comments",
+            "AboutDialog:translator-credits",
+            "AboutDialog:website-label",
+            "AlertDialog:detail",
+            "AlertDialog:message",
+            "AppChooserButton:heading",
+            "AppChooserDialog:heading",
+            "AppChooserWidget:default-text",
+            "AssistantPage:title",
+            "Button:label",
+            "CellRendererText:markup",
+            "CellRendererText:placeholder-text",
+            "CellRendererText:text",
+            "CheckButton:label",
+            "ColorButton:title",
+            "ColorDialog:title",
+            "ColumnViewColumn:title",
+            "ColumnViewRow:accessible-description",
+            "ColumnViewRow:accessible-label",
+            "Entry:placeholder-text",
+            "Entry:primary-icon-tooltip-markup",
+            "Entry:primary-icon-tooltip-text",
+            "Entry:secondary-icon-tooltip-markup",
+            "Entry:secondary-icon-tooltip-text",
+            "EntryBuffer:text",
+            "Expander:label",
+            "FileChooserNative:accept-label",
+            "FileChooserNative:cancel-label",
+            "FileChooserWidget:subtitle",
+            "FileDialog:accept-label",
+            "FileDialog:title",
+            "FileDialog:initial-name",
+            "FileFilter:name",
+            "FontButton:title",
+            "FontDialog:title",
+            "Frame:label",
+            "Inscription:markup",
+            "Inscription:text",
+            "Label:label",
+            "ListItem:accessible-description",
+            "ListItem:accessible-label",
+            "LockButton:text-lock",
+            "LockButton:text-unlock",
+            "LockButton:tooltip-lock",
+            "LockButton:tooltip-not-authorized",
+            "LockButton:tooltip-unlock",
+            "MenuButton:label",
+            "MessageDialog:secondary-text",
+            "MessageDialog:text",
+            "NativeDialog:title",
+            "NotebookPage:menu-label",
+            "NotebookPage:tab-label",
+            "PasswordEntry:placeholder-text",
+            "Picture:alternative-text",
+            "PrintDialog:accept-label",
+            "PrintDialog:title",
+            "Printer:name",
+            "PrintJob:title",
+            "PrintOperation:custom-tab-label",
+            "PrintOperation:export-filename",
+            "PrintOperation:job-name",
+            "ProgressBar:text",
+            "SearchEntry:placeholder-text",
+            "ShortcutLabel:disabled-text",
+            "ShortcutsGroup:title",
+            "ShortcutsSection:title",
+            "ShortcutsShortcut:title",
+            "ShortcutsShortcut:subtitle",
+            "StackPage:title",
+            "Text:placeholder-text",
+            "TextBuffer:text",
+            "TreeViewColumn:title",
+            "Widget:tooltip-markup",
+            "Widget:tooltip-text",
+            "Window:title",
+            "Editable:text",
+            "FontChooser:preview-text",
+        ]
+    ),
+    "Adw-1": Annotation(
+        translatable_properties=[
+            "AboutDialog:comments",
+            "AboutDialog:translator-credits",
+            "AboutWindow:comments",
+            "AboutWindow:translator-credits",
+            "ActionRow:subtitle",
+            "ActionRow:title",
+            "AlertDialog:body",
+            "AlertDialog:heading",
+            "Avatar:text",
+            "Banner:button-label",
+            "Banner:title",
+            "ButtonContent:label",
+            "Dialog:title",
+            "ExpanderRow:subtitle",
+            "MessageDialog:body",
+            "MessageDialog:heading",
+            "NavigationPage:title",
+            "PreferencesGroup:description",
+            "PreferencesGroup:title",
+            "PreferencesPage:description",
+            "PreferencesPage:title",
+            "PreferencesRow:title",
+            "SplitButton:dropdown-tooltip",
+            "SplitButton:label",
+            "StatusPage:description",
+            "StatusPage:title",
+            "TabPage:indicator-tooltip",
+            "TabPage:keyword",
+            "TabPage:title",
+            "Toast:button-label",
+            "Toast:title",
+            "ViewStackPage:title",
+            "ViewSwitcherTitle:subtitle",
+            "ViewSwitcherTitle:title",
+            "WindowTitle:subtitle",
+            "WindowTitle:title",
+        ]
+    ),
+    "Shumate-1.0": Annotation(
+        translatable_properties=[
+            "License:extra-text",
+            "MapSource:license",
+            "MapSource:name",
+        ]
+    ),
+    "GtkSource-5": Annotation(
+        translatable_properties=[
+            "CompletionCell:markup",
+            "CompletionCell:text",
+            "CompletionSnippets:title",
+            "CompletionWords:title",
+            "GutterRendererText:markup",
+            "GutterRendererText:text",
+            "SearchSettings:search-text",
+            "Snippet:description",
+            "Snippet:name",
+            "SnippetChunk:tooltip-text",
+            "StyleScheme:description",
+            "StyleScheme:name",
+        ]
+    ),
+}
diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index e05d6ee..e682513 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -20,7 +20,7 @@
 import sys
 import typing as T
 
-from . import gir, language
+from . import annotations, gir, language
 from .ast_utils import AstNode
 from .completions_utils import *
 from .language.types import ClassName
@@ -154,11 +154,17 @@ def property_completer(lsp, ast_node, match_variables):
                     detail=prop.detail,
                 )
             elif isinstance(prop.type, gir.StringType):
+                snippet = (
+                    f'{prop_name}: _("$0");'
+                    if annotations.is_property_translated(prop)
+                    else f'{prop_name}: "$0";'
+                )
+
                 yield Completion(
                     prop_name,
                     CompletionItemKind.Property,
                     sort_text=f"0 {prop_name}",
-                    snippet=f'{prop_name}: "$0";',
+                    snippet=snippet,
                     docs=prop.doc,
                     detail=prop.detail,
                 )

From 9b9fab832bb5dc3a23b6a25ac8233f7db1c62976 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 22 Dec 2024 18:00:39 -0600
Subject: [PATCH 61/82] Add tests, remove unused code, fix bugs

- Added tests for more error messages
- Test the "go to reference" feature at every character index of every
test case
- Delete unused code and imports
- Fix some bugs I found along the way
---
 blueprintcompiler/ast_utils.py                | 32 +++++++++++----
 blueprintcompiler/completions.py              | 11 ++---
 blueprintcompiler/completions_utils.py        | 11 -----
 blueprintcompiler/formatter.py                |  7 ++--
 blueprintcompiler/gir.py                      | 41 +++++++------------
 blueprintcompiler/language/__init__.py        |  3 +-
 .../language/adw_response_dialog.py           |  5 ---
 blueprintcompiler/language/attributes.py      | 32 ---------------
 blueprintcompiler/language/expression.py      | 21 ----------
 .../language/gobject_property.py              |  2 +-
 blueprintcompiler/language/gobject_signal.py  |  2 +-
 blueprintcompiler/language/gtk_a11y.py        |  4 +-
 .../language/gtk_combo_box_text.py            |  1 -
 .../language/gtk_list_item_factory.py         | 11 ++---
 blueprintcompiler/language/imports.py         | 14 ++-----
 blueprintcompiler/outputs/xml/__init__.py     |  5 ++-
 blueprintcompiler/outputs/xml/xml_emitter.py  |  4 +-
 blueprintcompiler/parse_tree.py               | 35 +---------------
 tests/formatting/comment_in.blp               |  2 +
 tests/formatting/comment_out.blp              |  2 +
 .../sample_errors/float_to_int_assignment.blp |  5 +++
 .../sample_errors/float_to_int_assignment.err |  1 +
 tests/sample_errors/int_object.blp            |  3 ++
 tests/sample_errors/int_object.err            |  1 +
 tests/sample_errors/menu_assignment.blp       |  7 ++++
 tests/sample_errors/menu_assignment.err       |  1 +
 .../string_to_num_assignment.blp              |  5 +++
 .../string_to_num_assignment.err              |  1 +
 .../string_to_object_assignment.blp           |  5 +++
 .../string_to_object_assignment.err           |  1 +
 .../string_to_type_assignment.blp             |  6 +++
 .../string_to_type_assignment.err             |  1 +
 tests/sample_errors/translated_assignment.blp |  5 +++
 tests/sample_errors/translated_assignment.err |  1 +
 tests/sample_errors/typeof_assignment.blp     |  5 +++
 tests/sample_errors/typeof_assignment.err     |  1 +
 tests/sample_errors/unrecognized_syntax.blp   |  1 +
 tests/sample_errors/unrecognized_syntax.err   |  1 +
 tests/sample_errors/upgrade_sync_create.blp   |  5 +++
 tests/sample_errors/upgrade_sync_create.err   |  1 +
 .../upgrade_template_list_item.blp            |  5 +++
 .../upgrade_template_list_item.err            |  1 +
 tests/samples/property_binding.blp            |  1 +
 tests/samples/property_binding.ui             |  1 +
 tests/samples/property_binding_dec.blp        | 11 -----
 tests/test_formatter.py                       |  1 +
 tests/test_samples.py                         |  8 +++-
 47 files changed, 140 insertions(+), 190 deletions(-)
 delete mode 100644 blueprintcompiler/language/attributes.py
 create mode 100644 tests/formatting/comment_in.blp
 create mode 100644 tests/formatting/comment_out.blp
 create mode 100644 tests/sample_errors/float_to_int_assignment.blp
 create mode 100644 tests/sample_errors/float_to_int_assignment.err
 create mode 100644 tests/sample_errors/int_object.blp
 create mode 100644 tests/sample_errors/int_object.err
 create mode 100644 tests/sample_errors/menu_assignment.blp
 create mode 100644 tests/sample_errors/menu_assignment.err
 create mode 100644 tests/sample_errors/string_to_num_assignment.blp
 create mode 100644 tests/sample_errors/string_to_num_assignment.err
 create mode 100644 tests/sample_errors/string_to_object_assignment.blp
 create mode 100644 tests/sample_errors/string_to_object_assignment.err
 create mode 100644 tests/sample_errors/string_to_type_assignment.blp
 create mode 100644 tests/sample_errors/string_to_type_assignment.err
 create mode 100644 tests/sample_errors/translated_assignment.blp
 create mode 100644 tests/sample_errors/translated_assignment.err
 create mode 100644 tests/sample_errors/typeof_assignment.blp
 create mode 100644 tests/sample_errors/typeof_assignment.err
 create mode 100644 tests/sample_errors/unrecognized_syntax.blp
 create mode 100644 tests/sample_errors/unrecognized_syntax.err
 create mode 100644 tests/sample_errors/upgrade_sync_create.blp
 create mode 100644 tests/sample_errors/upgrade_sync_create.err
 create mode 100644 tests/sample_errors/upgrade_template_list_item.blp
 create mode 100644 tests/sample_errors/upgrade_template_list_item.err
 delete mode 100644 tests/samples/property_binding_dec.blp

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index bd5befa..8f742e0 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -160,6 +160,11 @@ class AstNode:
                 yield e
                 if e.fatal:
                     return
+            except MultipleErrors as e:
+                for error in e.errors:
+                    yield error
+                    if error.fatal:
+                        return
 
         for child in self.children:
             yield from child._get_errors()
@@ -249,14 +254,7 @@ def validate(
             if skip_incomplete and self.incomplete:
                 return
 
-            try:
-                func(self)
-            except CompileError as e:
-                # If the node is only partially complete, then an error must
-                # have already been reported at the parsing stage
-                if self.incomplete:
-                    return
-
+            def fill_error(e: CompileError):
                 if e.range is None:
                     e.range = (
                         Range.join(
@@ -266,8 +264,26 @@ def validate(
                         or self.range
                     )
 
+            try:
+                func(self)
+            except CompileError as e:
+                # If the node is only partially complete, then an error must
+                # have already been reported at the parsing stage
+                if self.incomplete:
+                    return
+
+                fill_error(e)
+
                 # Re-raise the exception
                 raise e
+            except MultipleErrors as e:
+                if self.incomplete:
+                    return
+
+                for error in e.errors:
+                    fill_error(error)
+
+                raise e
 
         inner._validator = True
         return inner
diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index e682513..5d36739 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -17,7 +17,6 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-import sys
 import typing as T
 
 from . import annotations, gir, language
@@ -31,10 +30,6 @@ from .tokenizer import Token, TokenType
 Pattern = T.List[T.Tuple[TokenType, T.Optional[str]]]
 
 
-def debug(*args, **kwargs):
-    print(*args, file=sys.stderr, **kwargs)
-
-
 def _complete(
     lsp, ast_node: AstNode, tokens: T.List[Token], idx: int, token_idx: int
 ) -> T.Iterator[Completion]:
@@ -139,7 +134,7 @@ def gtk_object_completer(lsp, ast_node, match_variables):
     matches=new_statement_patterns,
 )
 def property_completer(lsp, ast_node, match_variables):
-    if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.ExternType):
+    if ast_node.gir_class and hasattr(ast_node.gir_class, "properties"):
         for prop_name, prop in ast_node.gir_class.properties.items():
             if (
                 isinstance(prop.type, gir.BoolType)
@@ -194,7 +189,7 @@ def property_completer(lsp, ast_node, match_variables):
 
 
 @completer(
-    applies_in=[language.Property, language.BaseAttribute],
+    applies_in=[language.Property, language.A11yProperty],
     matches=[[(TokenType.IDENT, None), (TokenType.OP, ":")]],
 )
 def prop_value_completer(lsp, ast_node, match_variables):
@@ -218,7 +213,7 @@ def prop_value_completer(lsp, ast_node, match_variables):
     matches=new_statement_patterns,
 )
 def signal_completer(lsp, ast_node, match_variables):
-    if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.ExternType):
+    if ast_node.gir_class and hasattr(ast_node.gir_class, "signals"):
         for signal_name, signal in ast_node.gir_class.signals.items():
             if not isinstance(ast_node.parent, language.Object):
                 name = "on"
diff --git a/blueprintcompiler/completions_utils.py b/blueprintcompiler/completions_utils.py
index 03bec0f..eccf125 100644
--- a/blueprintcompiler/completions_utils.py
+++ b/blueprintcompiler/completions_utils.py
@@ -31,17 +31,6 @@ new_statement_patterns = [
 ]
 
 
-def applies_to(*ast_types):
-    """Decorator describing which AST nodes the completer should apply in."""
-
-    def decorator(func):
-        for c in ast_types:
-            c.completers.append(func)
-        return func
-
-    return decorator
-
-
 def completer(applies_in: T.List, matches: T.List = [], applies_in_subclass=None):
     def decorator(func):
         def inner(prev_tokens: T.List[Token], ast_node, lsp):
diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py
index c003d45..35da5d2 100644
--- a/blueprintcompiler/formatter.py
+++ b/blueprintcompiler/formatter.py
@@ -20,7 +20,8 @@
 import re
 from enum import Enum
 
-from . import tokenizer, utils
+from . import tokenizer
+from .errors import CompilerBugError
 from .tokenizer import TokenType
 
 OPENING_TOKENS = ("{", "[")
@@ -192,8 +193,8 @@ def format(data, tab_size=2, insert_space=True):
 
                 commit_current_line(LineType.COMMENT, newlines_before=newlines)
 
-            else:
-                commit_current_line()
+            else:  # pragma: no cover
+                raise CompilerBugError()
 
         elif str_item == "(" and (
             re.match(r"^([A-Za-z_\-])+\s*\(", current_line) or watch_parentheses
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index e54b849..333f4ac 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -467,10 +467,13 @@ class Signature(GirNode):
         return result
 
     @cached_property
-    def return_type(self) -> GirType:
-        return self.get_containing(Repository)._resolve_type_id(
-            self.tl.SIGNATURE_RETURN_TYPE
-        )
+    def return_type(self) -> T.Optional[GirType]:
+        if self.tl.SIGNATURE_RETURN_TYPE == 0:
+            return None
+        else:
+            return self.get_containing(Repository)._resolve_type_id(
+                self.tl.SIGNATURE_RETURN_TYPE
+            )
 
 
 class Signal(GirNode):
@@ -490,7 +493,10 @@ class Signal(GirNode):
         args = ", ".join(
             [f"{a.type.full_name} {a.name}" for a in self.gir_signature.args]
         )
-        return f"signal {self.container.full_name}::{self.name} ({args})"
+        result = f"signal {self.container.full_name}::{self.name} ({args})"
+        if self.gir_signature.return_type is not None:
+            result += f" -> {self.gir_signature.return_type.full_name}"
+        return result
 
     @property
     def online_docs(self) -> T.Optional[str]:
@@ -902,14 +908,6 @@ class Namespace(GirNode):
             if isinstance(entry, Class)
         }
 
-    @cached_property
-    def interfaces(self) -> T.Mapping[str, Interface]:
-        return {
-            name: entry
-            for name, entry in self.entries.items()
-            if isinstance(entry, Interface)
-        }
-
     def get_type(self, name) -> T.Optional[GirType]:
         """Gets a type (class, interface, enum, etc.) from this namespace."""
         return self.entries.get(name)
@@ -933,13 +931,8 @@ class Namespace(GirNode):
         """Looks up a type in the scope of this namespace (including in the
         namespace's dependencies)."""
 
-        if type_name in _BASIC_TYPES:
-            return _BASIC_TYPES[type_name]()
-        elif "." in type_name:
-            ns, name = type_name.split(".", 1)
-            return self.get_containing(Repository).get_type(name, ns)
-        else:
-            return self.get_type(type_name)
+        ns, name = type_name.split(".", 1)
+        return self.get_containing(Repository).get_type(name, ns)
 
     @property
     def online_docs(self) -> T.Optional[str]:
@@ -958,7 +951,7 @@ class Repository(GirNode):
                 self.includes = {
                     name: get_namespace(name, version) for name, version in deps
                 }
-            except:
+            except:  # pragma: no cover
                 raise CompilerBugError(f"Failed to load dependencies.")
         else:
             self.includes = {}
@@ -966,12 +959,6 @@ class Repository(GirNode):
     def get_type(self, name: str, ns: str) -> T.Optional[GirType]:
         return self.lookup_namespace(ns).get_type(name)
 
-    def get_type_by_cname(self, name: str) -> T.Optional[GirType]:
-        for ns in [self.namespace, *self.includes.values()]:
-            if type := ns.get_type_by_cname(name):
-                return type
-        return None
-
     def lookup_namespace(self, ns: str):
         """Finds a namespace among this namespace's dependencies."""
         if ns == self.namespace.name:
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index b302686..e797eaa 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -4,7 +4,6 @@ from .adw_breakpoint import (
     AdwBreakpointSetters,
 )
 from .adw_response_dialog import ExtAdwResponseDialog
-from .attributes import BaseAttribute
 from .binding import Binding
 from .common import *
 from .contexts import ScopeCtx, ValueTypeCtx
@@ -20,7 +19,7 @@ from .expression import (
 from .gobject_object import Object, ObjectContent
 from .gobject_property import Property
 from .gobject_signal import Signal
-from .gtk_a11y import ExtAccessibility
+from .gtk_a11y import A11yProperty, ExtAccessibility
 from .gtk_combo_box_text import ExtComboBoxItems
 from .gtk_file_filter import (
     Filters,
diff --git a/blueprintcompiler/language/adw_response_dialog.py b/blueprintcompiler/language/adw_response_dialog.py
index 5493d4d..d2680fd 100644
--- a/blueprintcompiler/language/adw_response_dialog.py
+++ b/blueprintcompiler/language/adw_response_dialog.py
@@ -20,7 +20,6 @@
 
 from ..decompiler import decompile_translatable, truthy
 from .common import *
-from .contexts import ValueTypeCtx
 from .gobject_object import ObjectContent, validate_parent_type
 from .values import StringValue
 
@@ -94,10 +93,6 @@ class ExtAdwResponseDialogResponse(AstNode):
             self.value.range.text,
         )
 
-    @context(ValueTypeCtx)
-    def value_type(self) -> ValueTypeCtx:
-        return ValueTypeCtx(StringType())
-
     @validate("id")
     def unique_in_parent(self):
         self.validate_unique_in_parent(
diff --git a/blueprintcompiler/language/attributes.py b/blueprintcompiler/language/attributes.py
deleted file mode 100644
index 8ff1f0b..0000000
--- a/blueprintcompiler/language/attributes.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# attributes.py
-#
-# Copyright 2022 James Westman <james@jwestman.net>
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 3 of the
-# License, or (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-
-from .common import *
-
-
-class BaseAttribute(AstNode):
-    """A helper class for attribute syntax of the form `name: literal_value;`"""
-
-    tag_name: str = ""
-    attr_name: str = "name"
-
-    @property
-    def name(self):
-        return self.tokens["name"]
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index ae9c399..f305035 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -38,10 +38,6 @@ class ExprBase(AstNode):
     def type(self) -> T.Optional[GirType]:
         raise NotImplementedError()
 
-    @property
-    def type_complete(self) -> bool:
-        return True
-
     @property
     def rhs(self) -> T.Optional["ExprBase"]:
         if isinstance(self.parent, Expression):
@@ -65,10 +61,6 @@ class Expression(ExprBase):
     def type(self) -> T.Optional[GirType]:
         return self.last.type
 
-    @property
-    def type_complete(self) -> bool:
-        return self.last.type_complete
-
 
 class InfixExpr(ExprBase):
     @property
@@ -99,15 +91,6 @@ class LiteralExpr(ExprBase):
     def type(self) -> T.Optional[GirType]:
         return self.literal.value.type
 
-    @property
-    def type_complete(self) -> bool:
-        from .values import IdentLiteral
-
-        if isinstance(self.literal.value, IdentLiteral):
-            if object := self.context[ScopeCtx].objects.get(self.literal.value.ident):
-                return not object.gir_class.incomplete
-        return True
-
 
 class LookupOp(InfixExpr):
     grammar = [".", UseIdent("property")]
@@ -211,10 +194,6 @@ class CastExpr(InfixExpr):
     def type(self) -> T.Optional[GirType]:
         return self.children[TypeName][0].gir_type
 
-    @property
-    def type_complete(self) -> bool:
-        return True
-
     @validate()
     def cast_makes_sense(self):
         if self.type is None or self.lhs.type is None:
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 5d0c867..b553909 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -51,7 +51,7 @@ class Property(AstNode):
 
     @property
     def document_symbol(self) -> DocumentSymbol:
-        if isinstance(self.value, ObjectValue):
+        if isinstance(self.value, ObjectValue) or self.value is None:
             detail = None
         else:
             detail = self.value.range.text
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 79f9ae7..0e0332e 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -122,7 +122,7 @@ class Signal(AstNode):
         )
 
     def get_reference(self, idx: int) -> T.Optional[LocationLink]:
-        if idx in self.group.tokens["object"].range:
+        if self.object_id is not None and idx in self.group.tokens["object"].range:
             obj = self.context[ScopeCtx].objects.get(self.object_id)
             if obj is not None:
                 return LocationLink(
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index 3657565..0cc3cb3 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -19,8 +19,6 @@
 
 import typing as T
 
-from ..decompiler import escape_quote
-from .attributes import BaseAttribute
 from .common import *
 from .contexts import ValueTypeCtx
 from .gobject_object import ObjectContent, validate_parent_type
@@ -119,7 +117,7 @@ def _get_docs(gir, name):
         return gir_type.doc
 
 
-class A11yProperty(BaseAttribute):
+class A11yProperty(AstNode):
     grammar = Statement(
         UseIdent("name"),
         ":",
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index 312750a..32b3486 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -19,7 +19,6 @@
 
 
 from .common import *
-from .contexts import ValueTypeCtx
 from .gobject_object import ObjectContent, validate_parent_type
 from .values import StringValue
 
diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index 3309c08..c9e1399 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -50,7 +50,7 @@ class ExtListItemFactory(AstNode):
         else:
             return self.root.gir.get_type("ListItem", "Gtk")
 
-    @validate("template")
+    @validate("id")
     def container_is_builder_list(self):
         validate_parent_type(
             self,
@@ -59,7 +59,7 @@ class ExtListItemFactory(AstNode):
             "sub-templates",
         )
 
-    @validate("template")
+    @validate("id")
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate template block")
 
@@ -76,7 +76,7 @@ class ExtListItemFactory(AstNode):
                     f"Only Gtk.ListItem, Gtk.ListHeader, Gtk.ColumnViewRow, or Gtk.ColumnViewCell is allowed as a type here"
                 )
 
-    @validate("template")
+    @validate("id")
     def type_name_upgrade(self):
         if self.type_name is None:
             raise UpgradeWarning(
@@ -103,10 +103,7 @@ class ExtListItemFactory(AstNode):
 
     @property
     def action_widgets(self):
-        """
-        The sub-template shouldn't have it`s own actions this is
-        just hear to satisfy XmlOutput._emit_object_or_template
-        """
+        # The sub-template shouldn't have its own actions, this is just here to satisfy XmlOutput._emit_object_or_template
         return None
 
     @docs("id")
diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index 3060bea..2d4bcf6 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -59,14 +59,8 @@ class GtkDirective(AstNode):
 
     @property
     def gir_namespace(self):
-        # validate the GTK version first to make sure the more specific error
-        # message is emitted
-        self.gtk_version()
-        if self.tokens["version"] is not None:
-            return gir.get_namespace("Gtk", self.tokens["version"])
-        else:
-            # For better error handling, just assume it's 4.0
-            return gir.get_namespace("Gtk", "4.0")
+        # For better error handling, just assume it's 4.0
+        return gir.get_namespace("Gtk", "4.0")
 
     @docs()
     def ref_docs(self):
@@ -90,7 +84,7 @@ class Import(AstNode):
 
     @validate("namespace", "version")
     def namespace_exists(self):
-        gir.get_namespace(self.tokens["namespace"], self.tokens["version"])
+        gir.get_namespace(self.namespace, self.version)
 
     @validate()
     def unused(self):
@@ -106,7 +100,7 @@ class Import(AstNode):
     @property
     def gir_namespace(self):
         try:
-            return gir.get_namespace(self.tokens["namespace"], self.tokens["version"])
+            return gir.get_namespace(self.namespace, self.version)
         except CompileError:
             return None
 
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 5e43834..420f6ef 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -366,12 +366,13 @@ class XmlOutput(OutputFormat):
 
         elif isinstance(extension, ExtScaleMarks):
             xml.start_tag("marks")
-            for mark in extension.children:
+            for mark in extension.marks:
+                label = mark.label.child if mark.label is not None else None
                 xml.start_tag(
                     "mark",
                     value=mark.value,
                     position=mark.position,
-                    **self._translated_string_attrs(mark.label and mark.label.child),
+                    **self._translated_string_attrs(label),
                 )
                 if mark.label is not None:
                     xml.put_text(mark.label.string)
diff --git a/blueprintcompiler/outputs/xml/xml_emitter.py b/blueprintcompiler/outputs/xml/xml_emitter.py
index ca87a49..ea91e03 100644
--- a/blueprintcompiler/outputs/xml/xml_emitter.py
+++ b/blueprintcompiler/outputs/xml/xml_emitter.py
@@ -40,7 +40,9 @@ class XmlEmitter:
         self._tag_stack = []
         self._needs_newline = False
 
-    def start_tag(self, tag, **attrs: T.Union[str, GirType, ClassName, bool, None]):
+    def start_tag(
+        self, tag, **attrs: T.Union[str, GirType, ClassName, bool, None, float]
+    ):
         self._indent()
         self.result += f"<{tag}"
         for key, val in attrs.items():
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index fff6e4a..ae062fb 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -95,19 +95,11 @@ class ParseGroup:
 
         try:
             return self.ast_type(self, children, self.keys, incomplete=self.incomplete)
-        except TypeError as e:
+        except TypeError:  # pragma: no cover
             raise CompilerBugError(
                 f"Failed to construct ast.{self.ast_type.__name__} from ParseGroup. See the previous stacktrace."
             )
 
-    def __str__(self):
-        result = str(self.ast_type.__name__)
-        result += "".join([f"\n{key}: {val}" for key, val in self.keys.items()]) + "\n"
-        result += "\n".join(
-            [str(child) for children in self.children.values() for child in children]
-        )
-        return result.replace("\n", "\n  ")
-
 
 class ParseContext:
     """Contains the state of the parser."""
@@ -265,10 +257,6 @@ class ParseNode:
         """Convenience method for err()."""
         return self.err("Expected " + expect)
 
-    def warn(self, message) -> "Warning":
-        """Causes this ParseNode to emit a warning if it parses successfully."""
-        return Warning(self, message)
-
 
 class Err(ParseNode):
     """ParseNode that emits a compile error if it fails to parse."""
@@ -290,27 +278,6 @@ class Err(ParseNode):
         return True
 
 
-class Warning(ParseNode):
-    """ParseNode that emits a compile warning if it parses successfully."""
-
-    def __init__(self, child, message: str):
-        self.child = to_parse_node(child)
-        self.message = message
-
-    def _parse(self, ctx: ParseContext):
-        ctx.skip()
-        start_idx = ctx.index
-        if self.child.parse(ctx).succeeded():
-            start_token = ctx.tokens[start_idx]
-            end_token = ctx.tokens[ctx.index]
-            ctx.warnings.append(
-                CompileWarning(self.message, start_token.start, end_token.end)
-            )
-            return True
-        else:
-            return False
-
-
 class Fail(ParseNode):
     """ParseNode that emits a compile error if it parses successfully."""
 
diff --git a/tests/formatting/comment_in.blp b/tests/formatting/comment_in.blp
new file mode 100644
index 0000000..32a907c
--- /dev/null
+++ b/tests/formatting/comment_in.blp
@@ -0,0 +1,2 @@
+using Gtk 4.0;
+//comment
\ No newline at end of file
diff --git a/tests/formatting/comment_out.blp b/tests/formatting/comment_out.blp
new file mode 100644
index 0000000..d5dca95
--- /dev/null
+++ b/tests/formatting/comment_out.blp
@@ -0,0 +1,2 @@
+using Gtk 4.0;
+// comment
diff --git a/tests/sample_errors/float_to_int_assignment.blp b/tests/sample_errors/float_to_int_assignment.blp
new file mode 100644
index 0000000..73b5dc4
--- /dev/null
+++ b/tests/sample_errors/float_to_int_assignment.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Entry {
+  margin-bottom: 10.5;
+}
diff --git a/tests/sample_errors/float_to_int_assignment.err b/tests/sample_errors/float_to_int_assignment.err
new file mode 100644
index 0000000..0e9dc41
--- /dev/null
+++ b/tests/sample_errors/float_to_int_assignment.err
@@ -0,0 +1 @@
+4,18,4,Cannot convert 10.5 to integer
\ No newline at end of file
diff --git a/tests/sample_errors/int_object.blp b/tests/sample_errors/int_object.blp
new file mode 100644
index 0000000..35b2562
--- /dev/null
+++ b/tests/sample_errors/int_object.blp
@@ -0,0 +1,3 @@
+using Gtk 4.0;
+
+int {}
diff --git a/tests/sample_errors/int_object.err b/tests/sample_errors/int_object.err
new file mode 100644
index 0000000..221e6e6
--- /dev/null
+++ b/tests/sample_errors/int_object.err
@@ -0,0 +1 @@
+3,1,3,int is not a class
\ No newline at end of file
diff --git a/tests/sample_errors/menu_assignment.blp b/tests/sample_errors/menu_assignment.blp
new file mode 100644
index 0000000..9188d8a
--- /dev/null
+++ b/tests/sample_errors/menu_assignment.blp
@@ -0,0 +1,7 @@
+using Gtk 4.0;
+
+Overlay {
+  child: my_menu;
+}
+
+menu my_menu {}
diff --git a/tests/sample_errors/menu_assignment.err b/tests/sample_errors/menu_assignment.err
new file mode 100644
index 0000000..fb3187f
--- /dev/null
+++ b/tests/sample_errors/menu_assignment.err
@@ -0,0 +1 @@
+4,10,7,Cannot assign Gio.Menu to Gtk.Widget
\ No newline at end of file
diff --git a/tests/sample_errors/string_to_num_assignment.blp b/tests/sample_errors/string_to_num_assignment.blp
new file mode 100644
index 0000000..22e8fba
--- /dev/null
+++ b/tests/sample_errors/string_to_num_assignment.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Entry {
+  margin-bottom: "10";
+}
diff --git a/tests/sample_errors/string_to_num_assignment.err b/tests/sample_errors/string_to_num_assignment.err
new file mode 100644
index 0000000..98a6160
--- /dev/null
+++ b/tests/sample_errors/string_to_num_assignment.err
@@ -0,0 +1 @@
+4,18,4,Cannot convert string to number
\ No newline at end of file
diff --git a/tests/sample_errors/string_to_object_assignment.blp b/tests/sample_errors/string_to_object_assignment.blp
new file mode 100644
index 0000000..0c070ba
--- /dev/null
+++ b/tests/sample_errors/string_to_object_assignment.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Button {
+  child: "Click me";
+}
diff --git a/tests/sample_errors/string_to_object_assignment.err b/tests/sample_errors/string_to_object_assignment.err
new file mode 100644
index 0000000..f9492af
--- /dev/null
+++ b/tests/sample_errors/string_to_object_assignment.err
@@ -0,0 +1 @@
+4,10,10,Cannot convert string to Gtk.Widget
\ No newline at end of file
diff --git a/tests/sample_errors/string_to_type_assignment.blp b/tests/sample_errors/string_to_type_assignment.blp
new file mode 100644
index 0000000..90f531b
--- /dev/null
+++ b/tests/sample_errors/string_to_type_assignment.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+using Gio 2.0;
+
+Gio.ListStore {
+  item-type: "Button";
+}
diff --git a/tests/sample_errors/string_to_type_assignment.err b/tests/sample_errors/string_to_type_assignment.err
new file mode 100644
index 0000000..adb9eb0
--- /dev/null
+++ b/tests/sample_errors/string_to_type_assignment.err
@@ -0,0 +1 @@
+5,14,8,Cannot convert string to GType
\ No newline at end of file
diff --git a/tests/sample_errors/translated_assignment.blp b/tests/sample_errors/translated_assignment.blp
new file mode 100644
index 0000000..fa8fa9d
--- /dev/null
+++ b/tests/sample_errors/translated_assignment.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Button {
+  child: _("Click me");
+}
diff --git a/tests/sample_errors/translated_assignment.err b/tests/sample_errors/translated_assignment.err
new file mode 100644
index 0000000..78f6b96
--- /dev/null
+++ b/tests/sample_errors/translated_assignment.err
@@ -0,0 +1 @@
+4,10,13,Cannot convert translated string to Gtk.Widget
\ No newline at end of file
diff --git a/tests/sample_errors/typeof_assignment.blp b/tests/sample_errors/typeof_assignment.blp
new file mode 100644
index 0000000..a20d92c
--- /dev/null
+++ b/tests/sample_errors/typeof_assignment.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Button {
+  label: typeof<Button>;
+}
\ No newline at end of file
diff --git a/tests/sample_errors/typeof_assignment.err b/tests/sample_errors/typeof_assignment.err
new file mode 100644
index 0000000..bddb713
--- /dev/null
+++ b/tests/sample_errors/typeof_assignment.err
@@ -0,0 +1 @@
+4,10,14,Cannot convert GType to string
\ No newline at end of file
diff --git a/tests/sample_errors/unrecognized_syntax.blp b/tests/sample_errors/unrecognized_syntax.blp
new file mode 100644
index 0000000..4977bc6
--- /dev/null
+++ b/tests/sample_errors/unrecognized_syntax.blp
@@ -0,0 +1 @@
+~
\ No newline at end of file
diff --git a/tests/sample_errors/unrecognized_syntax.err b/tests/sample_errors/unrecognized_syntax.err
new file mode 100644
index 0000000..6290f59
--- /dev/null
+++ b/tests/sample_errors/unrecognized_syntax.err
@@ -0,0 +1 @@
+1,1,0,Could not determine what kind of syntax is meant here
\ No newline at end of file
diff --git a/tests/sample_errors/upgrade_sync_create.blp b/tests/sample_errors/upgrade_sync_create.blp
new file mode 100644
index 0000000..cf45cca
--- /dev/null
+++ b/tests/sample_errors/upgrade_sync_create.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Button btn {
+  label: bind btn.label sync-create;
+}
\ No newline at end of file
diff --git a/tests/sample_errors/upgrade_sync_create.err b/tests/sample_errors/upgrade_sync_create.err
new file mode 100644
index 0000000..93b46c2
--- /dev/null
+++ b/tests/sample_errors/upgrade_sync_create.err
@@ -0,0 +1 @@
+4,25,11,'sync-create' is now the default. Use 'no-sync-create' if this is not wanted.
\ No newline at end of file
diff --git a/tests/sample_errors/upgrade_template_list_item.blp b/tests/sample_errors/upgrade_template_list_item.blp
new file mode 100644
index 0000000..f32f011
--- /dev/null
+++ b/tests/sample_errors/upgrade_template_list_item.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+BuilderListItemFactory {
+  template {}
+}
diff --git a/tests/sample_errors/upgrade_template_list_item.err b/tests/sample_errors/upgrade_template_list_item.err
new file mode 100644
index 0000000..11250b8
--- /dev/null
+++ b/tests/sample_errors/upgrade_template_list_item.err
@@ -0,0 +1 @@
+4,3,8,Expected type name after 'template' keyword
\ No newline at end of file
diff --git a/tests/samples/property_binding.blp b/tests/samples/property_binding.blp
index 39e4458..66a2877 100644
--- a/tests/samples/property_binding.blp
+++ b/tests/samples/property_binding.blp
@@ -4,6 +4,7 @@ Box {
   visible: bind box2.visible inverted;
   orientation: bind box2.orientation;
   spacing: bind box2.spacing no-sync-create;
+  tooltip-text: bind box2.tooltip-text bidirectional;
 }
 
 Box box2 {
diff --git a/tests/samples/property_binding.ui b/tests/samples/property_binding.ui
index d14e50d..0e31fca 100644
--- a/tests/samples/property_binding.ui
+++ b/tests/samples/property_binding.ui
@@ -10,6 +10,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
     <property name="visible" bind-source="box2" bind-property="visible" bind-flags="sync-create|invert-boolean"/>
     <property name="orientation" bind-source="box2" bind-property="orientation" bind-flags="sync-create"/>
     <property name="spacing" bind-source="box2" bind-property="spacing"/>
+    <property name="tooltip-text" bind-source="box2" bind-property="tooltip-text" bind-flags="sync-create|bidirectional"/>
   </object>
   <object class="GtkBox" id="box2">
     <property name="spacing">6</property>
diff --git a/tests/samples/property_binding_dec.blp b/tests/samples/property_binding_dec.blp
deleted file mode 100644
index 39e4458..0000000
--- a/tests/samples/property_binding_dec.blp
+++ /dev/null
@@ -1,11 +0,0 @@
-using Gtk 4.0;
-
-Box {
-  visible: bind box2.visible inverted;
-  orientation: bind box2.orientation;
-  spacing: bind box2.spacing no-sync-create;
-}
-
-Box box2 {
-  spacing: 6;
-}
diff --git a/tests/test_formatter.py b/tests/test_formatter.py
index 4cf9ac8..af4f9f5 100644
--- a/tests/test_formatter.py
+++ b/tests/test_formatter.py
@@ -46,3 +46,4 @@ class TestFormatter(unittest.TestCase):
         self.assert_format_test("in2.blp", "out.blp")
         self.assert_format_test("correct1.blp", "correct1.blp")
         self.assert_format_test("string_in.blp", "string_out.blp")
+        self.assert_format_test("comment_in.blp", "comment_out.blp")
diff --git a/tests/test_samples.py b/tests/test_samples.py
index fe90774..5eb1538 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -28,6 +28,7 @@ gi.require_version("Gtk", "4.0")
 from gi.repository import Gtk
 
 from blueprintcompiler import decompiler, parser, tokenizer, utils
+from blueprintcompiler.ast_utils import AstNode
 from blueprintcompiler.completions import complete
 from blueprintcompiler.errors import (
     CompileError,
@@ -61,11 +62,14 @@ class TestSamples(unittest.TestCase):
         except:
             pass
 
-    def assert_ast_doesnt_crash(self, text, tokens, ast):
+    def assert_ast_doesnt_crash(self, text, tokens, ast: AstNode):
+        lsp = LanguageServer()
         for i in range(len(text)):
             ast.get_docs(i)
         for i in range(len(text)):
-            list(complete(LanguageServer(), ast, tokens, i))
+            list(complete(lsp, ast, tokens, i))
+        for i in range(len(text)):
+            ast.get_reference(i)
         ast.get_document_symbols()
 
     def assert_sample(self, name, skip_run=False):

From a6d57cebecaa148a8076521746d7850fc6c872b9 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 9 Dec 2024 20:29:08 -0600
Subject: [PATCH 62/82] language: Add not-swapped flag for signals

This is needed because GtkBuilder defaults to swapped when you specify
the object attribute.
---
 blueprintcompiler/language/gobject_signal.py  | 41 ++++++++++++++++---
 blueprintcompiler/outputs/xml/__init__.py     |  2 +-
 docs/reference/objects.rst                    |  5 ++-
 .../sample_errors/signal_exclusive_flags.blp  |  5 +++
 .../sample_errors/signal_exclusive_flags.err  |  1 +
 .../signal_unnecessary_flags.blp              |  6 +++
 .../signal_unnecessary_flags.err              |  2 +
 tests/samples/signal_not_swapped.blp          |  5 +++
 tests/samples/signal_not_swapped.ui           | 12 ++++++
 tests/test_samples.py                         |  1 +
 10 files changed, 72 insertions(+), 8 deletions(-)
 create mode 100644 tests/sample_errors/signal_exclusive_flags.blp
 create mode 100644 tests/sample_errors/signal_exclusive_flags.err
 create mode 100644 tests/sample_errors/signal_unnecessary_flags.blp
 create mode 100644 tests/sample_errors/signal_unnecessary_flags.err
 create mode 100644 tests/samples/signal_not_swapped.blp
 create mode 100644 tests/samples/signal_not_swapped.ui

diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 0e0332e..b052e3c 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -27,6 +27,7 @@ from .gtkbuilder_template import Template
 class SignalFlag(AstNode):
     grammar = AnyOf(
         UseExact("flag", "swapped"),
+        UseExact("flag", "not-swapped"),
         UseExact("flag", "after"),
     )
 
@@ -40,6 +41,27 @@ class SignalFlag(AstNode):
             f"Duplicate flag '{self.flag}'", lambda x: x.flag == self.flag
         )
 
+    @validate()
+    def swapped_exclusive(self):
+        if self.flag in ["swapped", "not-swapped"]:
+            self.validate_unique_in_parent(
+                "'swapped' and 'not-swapped' flags cannot be used together",
+                lambda x: x.flag in ["swapped", "not-swapped"],
+            )
+
+    @validate()
+    def swapped_unnecessary(self):
+        if self.flag == "not-swapped" and self.parent.object_id is None:
+            raise CompileWarning(
+                "'not-swapped' is the default for handlers that do not specify an object",
+                actions=[CodeAction("Remove 'not-swapped' flag", "")],
+            )
+        elif self.flag == "swapped" and self.parent.object_id is not None:
+            raise CompileWarning(
+                "'swapped' is the default for handlers that specify an object",
+                actions=[CodeAction("Remove 'swapped' flag", "")],
+            )
+
     @docs()
     def ref_docs(self):
         return get_docs_section("Syntax Signal")
@@ -92,9 +114,17 @@ class Signal(AstNode):
     def flags(self) -> T.List[SignalFlag]:
         return self.children[SignalFlag]
 
+    # Returns True if the "swapped" flag is present, False if "not-swapped" is present, and None if neither are present.
+    # GtkBuilder's default if swapped is not specified is to not swap the arguments if no object is specified, and to
+    # swap them if an object is specified.
     @property
-    def is_swapped(self) -> bool:
-        return any(x.flag == "swapped" for x in self.flags)
+    def is_swapped(self) -> T.Optional[bool]:
+        for flag in self.flags:
+            if flag.flag == "swapped":
+                return True
+            elif flag.flag == "not-swapped":
+                return False
+        return None
 
     @property
     def is_after(self) -> bool:
@@ -194,15 +224,16 @@ class Signal(AstNode):
 
 
 @decompiler("signal")
-def decompile_signal(
-    ctx, gir, name, handler, swapped="false", after="false", object=None
-):
+def decompile_signal(ctx, gir, name, handler, swapped=None, after="false", object=None):
     object_name = object or ""
     name = name.replace("_", "-")
     line = f"{name} => ${handler}({object_name})"
 
     if decompile.truthy(swapped):
         line += " swapped"
+    elif swapped is not None:
+        line += " not-swapped"
+
     if decompile.truthy(after):
         line += " after"
 
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 420f6ef..a21b6fb 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -169,7 +169,7 @@ class XmlOutput(OutputFormat):
             "signal",
             name=name,
             handler=signal.handler,
-            swapped=signal.is_swapped or None,
+            swapped=signal.is_swapped,
             after=signal.is_after or None,
             object=(
                 self._object_id(signal, signal.object_id) if signal.object_id else None
diff --git a/docs/reference/objects.rst b/docs/reference/objects.rst
index 699db49..09f5af8 100644
--- a/docs/reference/objects.rst
+++ b/docs/reference/objects.rst
@@ -91,7 +91,7 @@ Signal Handlers
 .. rst-class:: grammar-block
 
    Signal = <name::ref:`IDENT<Syntax IDENT>`> ('::' <detail::ref:`IDENT<Syntax IDENT>`>)? '=>' '$' <handler::ref:`IDENT<Syntax IDENT>`> '(' <object::ref:`IDENT<Syntax IDENT>`>? ')' (SignalFlag)* ';'
-   SignalFlag = 'after' | 'swapped'
+   SignalFlag = 'after' | 'swapped' | 'not-swapped'
 
 Signals are one way to respond to user input (another is `actions <https://docs.gtk.org/gtk4/actions.html>`_, which use the `action-name property <https://docs.gtk.org/gtk4/property.Actionable.action-name.html>`_).
 
@@ -99,6 +99,8 @@ Signals provide a handle for your code to listen to events in the UI. The handle
 
 Optionally, you can provide an object ID to use when connecting the signal.
 
+The ``swapped`` flag is used to swap the order of the object and userdata arguments in C applications. If an object argument is specified, then this is the default behavior, so the ``not-swapped`` flag can be used to prevent the swap.
+
 Example
 ~~~~~~~
 
@@ -108,7 +110,6 @@ Example
      clicked => $on_button_clicked();
    }
 
-
 .. _Syntax Child:
 
 Children
diff --git a/tests/sample_errors/signal_exclusive_flags.blp b/tests/sample_errors/signal_exclusive_flags.blp
new file mode 100644
index 0000000..6432965
--- /dev/null
+++ b/tests/sample_errors/signal_exclusive_flags.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+$MyObject obj {
+  signal1 => $handler() swapped not-swapped;
+}
diff --git a/tests/sample_errors/signal_exclusive_flags.err b/tests/sample_errors/signal_exclusive_flags.err
new file mode 100644
index 0000000..5176510
--- /dev/null
+++ b/tests/sample_errors/signal_exclusive_flags.err
@@ -0,0 +1 @@
+4,33,11,'swapped' and 'not-swapped' flags cannot be used together
\ No newline at end of file
diff --git a/tests/sample_errors/signal_unnecessary_flags.blp b/tests/sample_errors/signal_unnecessary_flags.blp
new file mode 100644
index 0000000..ed95a9b
--- /dev/null
+++ b/tests/sample_errors/signal_unnecessary_flags.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+
+$MyObject obj {
+  signal1 => $handler() not-swapped;
+  signal2 => $handler(obj) swapped;
+}
diff --git a/tests/sample_errors/signal_unnecessary_flags.err b/tests/sample_errors/signal_unnecessary_flags.err
new file mode 100644
index 0000000..7586085
--- /dev/null
+++ b/tests/sample_errors/signal_unnecessary_flags.err
@@ -0,0 +1,2 @@
+4,25,11,'not-swapped' is the default for handlers that do not specify an object
+5,28,7,'swapped' is the default for handlers that specify an object
\ No newline at end of file
diff --git a/tests/samples/signal_not_swapped.blp b/tests/samples/signal_not_swapped.blp
new file mode 100644
index 0000000..835ab17
--- /dev/null
+++ b/tests/samples/signal_not_swapped.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Button obj {
+  clicked => $handler(obj) not-swapped;
+}
\ No newline at end of file
diff --git a/tests/samples/signal_not_swapped.ui b/tests/samples/signal_not_swapped.ui
new file mode 100644
index 0000000..c9dcd8e
--- /dev/null
+++ b/tests/samples/signal_not_swapped.ui
@@ -0,0 +1,12 @@
+<?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="GtkButton" id="obj">
+    <signal name="clicked" handler="handler" swapped="False" object="obj"/>
+  </object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 5eb1538..866488e 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -200,6 +200,7 @@ class TestSamples(unittest.TestCase):
                 "expr_closure_args",
                 "parseable",
                 "signal",
+                "signal_not_swapped",
                 "template",
                 "template_binding",
                 "template_binding_extern",

From d6f4b88d35eb6a897eb40741a92f639cecbd0acc Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 25 Dec 2024 10:31:35 -0600
Subject: [PATCH 63/82] lsp: Fix crash on incomplete detailed signal

---
 blueprintcompiler/language/gobject_signal.py | 3 ++-
 tests/sample_errors/incomplete_signal.blp    | 5 +++++
 tests/sample_errors/incomplete_signal.err    | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 tests/sample_errors/incomplete_signal.blp
 create mode 100644 tests/sample_errors/incomplete_signal.err

diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index b052e3c..9c27b97 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -143,12 +143,13 @@ class Signal(AstNode):
 
     @property
     def document_symbol(self) -> DocumentSymbol:
+        detail = self.ranges["detail_start", "detail_end"]
         return DocumentSymbol(
             self.full_name,
             SymbolKind.Event,
             self.range,
             self.group.tokens["name"].range,
-            self.ranges["detail_start", "detail_end"].text,
+            detail.text if detail is not None else None,
         )
 
     def get_reference(self, idx: int) -> T.Optional[LocationLink]:
diff --git a/tests/sample_errors/incomplete_signal.blp b/tests/sample_errors/incomplete_signal.blp
new file mode 100644
index 0000000..4ec693d
--- /dev/null
+++ b/tests/sample_errors/incomplete_signal.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  notify::
+}
diff --git a/tests/sample_errors/incomplete_signal.err b/tests/sample_errors/incomplete_signal.err
new file mode 100644
index 0000000..901ef3b
--- /dev/null
+++ b/tests/sample_errors/incomplete_signal.err
@@ -0,0 +1,2 @@
+5,1,0,Expected a signal detail name
+4,9,3,Unexpected tokens
\ No newline at end of file

From f3faf4b993c73de623eff17abf7e28cfa9664f6a Mon Sep 17 00:00:00 2001
From: Alexey Yerin <yyp@disroot.org>
Date: Fri, 3 Jan 2025 22:31:49 +0300
Subject: [PATCH 64/82] LSP: Handle shutdown commands

This fixes the issue with terminal-based editor Helix which asks
language servers to shut down when trying to close the editor. Since
blueprint-compiler's server implementation didn't handle this request,
Helix ended up waiting for a response until timing out after a few
seconds and forcefully terminating the language server process.

Besides fixing Helix, this patch should also make user-initiated server
restarts more robust.
---
 blueprintcompiler/lsp.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 0659154..c4076b4 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -118,6 +118,7 @@ class LanguageServer:
         self.client_capabilities = {}
         self.client_supports_completion_choice = False
         self._open_files: T.Dict[str, OpenFile] = {}
+        self._exited = False
 
     def run(self):
         # Read <doc> tags from gir files. During normal compilation these are
@@ -125,7 +126,7 @@ class LanguageServer:
         xml_reader.PARSE_GIR.add("doc")
 
         try:
-            while True:
+            while not self._exited:
                 line = ""
                 content_len = -1
                 while content_len == -1 or (line != "\n" and line != "\r\n"):
@@ -221,6 +222,14 @@ class LanguageServer:
             },
         )
 
+    @command("shutdown")
+    def shutdown(self, id, params):
+        self._send_response(id, None)
+
+    @command("exit")
+    def exit(self, id, params):
+        self._exited = True
+
     @command("textDocument/didOpen")
     def didOpen(self, id, params):
         doc = params.get("textDocument")

From 55e5095fbafa8096b3d8cb9624017467465cea9c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 3 Jan 2025 18:56:24 -0600
Subject: [PATCH 65/82] values: Don't allow translated strings in arrays

Gtk.Builder has no way to translate individual strings in a string
array, so don't allow it in the syntax.
---
 blueprintcompiler/language/values.py            | 8 ++++++++
 tests/sample_errors/translated_string_array.blp | 7 +++++++
 tests/sample_errors/translated_string_array.err | 1 +
 3 files changed, 16 insertions(+)
 create mode 100644 tests/sample_errors/translated_string_array.blp
 create mode 100644 tests/sample_errors/translated_string_array.err

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 63cf4fc..5f47e54 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -452,6 +452,14 @@ class ArrayValue(AstNode):
                                 range=quoted_literal.range,
                             )
                         )
+                elif isinstance(value.child, Translated):
+                    errors.append(
+                        CompileError(
+                            "Arrays can't contain translated strings",
+                            range=value.child.range,
+                        )
+                    )
+
             if len(errors) > 0:
                 raise MultipleErrors(errors)
 
diff --git a/tests/sample_errors/translated_string_array.blp b/tests/sample_errors/translated_string_array.blp
new file mode 100644
index 0000000..451d900
--- /dev/null
+++ b/tests/sample_errors/translated_string_array.blp
@@ -0,0 +1,7 @@
+using Gtk 4.0;
+
+StringList {
+  strings: [
+    _("Test")
+  ];
+}
diff --git a/tests/sample_errors/translated_string_array.err b/tests/sample_errors/translated_string_array.err
new file mode 100644
index 0000000..0beb7e5
--- /dev/null
+++ b/tests/sample_errors/translated_string_array.err
@@ -0,0 +1 @@
+5,5,9,Arrays can't contain translated strings
\ No newline at end of file

From b9f58aeab58e83f8285b310b9e329ca2f7a06b32 Mon Sep 17 00:00:00 2001
From: Alexey Yerin <yyp@disroot.org>
Date: Sat, 4 Jan 2025 10:20:54 +0300
Subject: [PATCH 66/82] Formatter: Add trailing commas in lists

---
 blueprintcompiler/formatter.py |  4 +++-
 tests/formatting/lists_in.blp  | 21 +++++++++++++++++++++
 tests/formatting/lists_out.blp | 31 +++++++++++++++++++++++++++++++
 tests/formatting/out.blp       |  2 +-
 tests/samples/string_array.blp |  2 +-
 tests/samples/style.blp        |  2 +-
 tests/test_formatter.py        |  1 +
 7 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 tests/formatting/lists_in.blp
 create mode 100644 tests/formatting/lists_out.blp

diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py
index 35da5d2..60d87b4 100644
--- a/blueprintcompiler/formatter.py
+++ b/blueprintcompiler/formatter.py
@@ -146,8 +146,10 @@ def format(data, tab_size=2, insert_space=True):
                 is_child_type = False
 
             elif str_item in CLOSING_TOKENS:
-                if str_item == "]" and last_not_whitespace != ",":
+                if str_item == "]" and str(last_not_whitespace) != "[":
                     current_line = current_line[:-1]
+                    if str(last_not_whitespace) != ",":
+                        current_line += ","
                     commit_current_line()
                     current_line = "]"
                 elif str(last_not_whitespace) in OPENING_TOKENS:
diff --git a/tests/formatting/lists_in.blp b/tests/formatting/lists_in.blp
new file mode 100644
index 0000000..66b37a2
--- /dev/null
+++ b/tests/formatting/lists_in.blp
@@ -0,0 +1,21 @@
+using Gtk 4.0;
+
+Box {
+  styles []
+}
+
+Box {
+  styles ["a"]
+}
+
+Box {
+  styles ["a",]
+}
+
+Box {
+  styles ["a", "b"]
+}
+
+Box {
+  styles ["a", "b",]
+}
diff --git a/tests/formatting/lists_out.blp b/tests/formatting/lists_out.blp
new file mode 100644
index 0000000..7f1fe4a
--- /dev/null
+++ b/tests/formatting/lists_out.blp
@@ -0,0 +1,31 @@
+using Gtk 4.0;
+
+Box {
+  styles []
+}
+
+Box {
+  styles [
+    "a",
+  ]
+}
+
+Box {
+  styles [
+    "a",
+  ]
+}
+
+Box {
+  styles [
+    "a",
+    "b",
+  ]
+}
+
+Box {
+  styles [
+    "a",
+    "b",
+  ]
+}
diff --git a/tests/formatting/out.blp b/tests/formatting/out.blp
index 9d9a8b4..b84c25f 100644
--- a/tests/formatting/out.blp
+++ b/tests/formatting/out.blp
@@ -11,7 +11,7 @@ Overlay {
     notify::icon-name => $on_icon_name_changed(label) swapped;
 
     styles [
-      "destructive"
+      "destructive",
     ]
   }
 
diff --git a/tests/samples/string_array.blp b/tests/samples/string_array.blp
index 2542d17..85a68fe 100644
--- a/tests/samples/string_array.blp
+++ b/tests/samples/string_array.blp
@@ -5,6 +5,6 @@ AboutDialog about {
 
   authors: [
     "Jane doe <jane-doe@email.com>",
-    "Jhonny D <jd@email.com>"
+    "Jhonny D <jd@email.com>",
   ];
 }
diff --git a/tests/samples/style.blp b/tests/samples/style.blp
index fe20f52..63720de 100644
--- a/tests/samples/style.blp
+++ b/tests/samples/style.blp
@@ -3,6 +3,6 @@ using Gtk 4.0;
 Label {
   styles [
     "class-1",
-    "class-2"
+    "class-2",
   ]
 }
diff --git a/tests/test_formatter.py b/tests/test_formatter.py
index af4f9f5..a2cb60f 100644
--- a/tests/test_formatter.py
+++ b/tests/test_formatter.py
@@ -47,3 +47,4 @@ class TestFormatter(unittest.TestCase):
         self.assert_format_test("correct1.blp", "correct1.blp")
         self.assert_format_test("string_in.blp", "string_out.blp")
         self.assert_format_test("comment_in.blp", "comment_out.blp")
+        self.assert_format_test("lists_in.blp", "lists_out.blp")

From 8c6f8760f7bb28132589aaa79207318fe538a19a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 24 Dec 2024 12:54:23 -0600
Subject: [PATCH 67/82] language: Add expression literals

Add expression literals, so you can set properties of type
Gtk.Expression.
---
 blueprintcompiler/completions.py              |  9 +++++
 blueprintcompiler/language/__init__.py        |  1 +
 blueprintcompiler/language/contexts.py        |  6 +++
 blueprintcompiler/language/expression.py      | 30 ++++++++++++++
 blueprintcompiler/language/gobject_object.py  | 13 ++++++-
 .../language/gobject_property.py              |  7 ++--
 blueprintcompiler/language/values.py          | 39 ++++++++++++++++++-
 blueprintcompiler/outputs/xml/__init__.py     | 14 ++++---
 docs/reference/expressions.rst                | 39 +++++++++++++++----
 docs/reference/objects.rst                    |  2 +-
 tests/sample_errors/expr_item_not_cast.blp    |  5 +++
 tests/sample_errors/expr_item_not_cast.err    |  1 +
 tests/sample_errors/expr_value_assignment.blp |  5 +++
 tests/sample_errors/expr_value_assignment.err |  1 +
 .../sample_errors/expr_value_closure_arg.blp  |  5 +++
 .../sample_errors/expr_value_closure_arg.err  |  1 +
 tests/sample_errors/expr_value_item.blp       |  5 +++
 tests/sample_errors/expr_value_item.err       |  1 +
 tests/samples/bind_expr_prop.blp              |  9 +++++
 tests/samples/bind_expr_prop.ui               | 17 ++++++++
 tests/samples/bind_literal.blp                |  5 +++
 tests/samples/bind_literal.ui                 | 14 +++++++
 tests/samples/expr_value.blp                  |  5 +++
 tests/samples/expr_value.ui                   | 14 +++++++
 tests/samples/expr_value_closure.blp          |  5 +++
 tests/samples/expr_value_closure.ui           | 16 ++++++++
 tests/samples/expr_value_literal.blp          |  5 +++
 tests/samples/expr_value_literal.ui           | 14 +++++++
 tests/test_samples.py                         |  1 +
 29 files changed, 268 insertions(+), 21 deletions(-)
 create mode 100644 tests/sample_errors/expr_item_not_cast.blp
 create mode 100644 tests/sample_errors/expr_item_not_cast.err
 create mode 100644 tests/sample_errors/expr_value_assignment.blp
 create mode 100644 tests/sample_errors/expr_value_assignment.err
 create mode 100644 tests/sample_errors/expr_value_closure_arg.blp
 create mode 100644 tests/sample_errors/expr_value_closure_arg.err
 create mode 100644 tests/sample_errors/expr_value_item.blp
 create mode 100644 tests/sample_errors/expr_value_item.err
 create mode 100644 tests/samples/bind_expr_prop.blp
 create mode 100644 tests/samples/bind_expr_prop.ui
 create mode 100644 tests/samples/bind_literal.blp
 create mode 100644 tests/samples/bind_literal.ui
 create mode 100644 tests/samples/expr_value.blp
 create mode 100644 tests/samples/expr_value.ui
 create mode 100644 tests/samples/expr_value_closure.blp
 create mode 100644 tests/samples/expr_value_closure.ui
 create mode 100644 tests/samples/expr_value_literal.blp
 create mode 100644 tests/samples/expr_value_literal.ui

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index 5d36739..b10ec3e 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -177,6 +177,15 @@ def property_completer(lsp, ast_node, match_variables):
                     docs=prop.doc,
                     detail=prop.detail,
                 )
+            elif prop.type.full_name == "Gtk.Expression":
+                yield Completion(
+                    prop_name,
+                    CompletionItemKind.Property,
+                    sort_text=f"0 {prop_name}",
+                    snippet=f"{prop_name}: expr $0;",
+                    docs=prop.doc,
+                    detail=prop.detail,
+                )
             else:
                 yield Completion(
                     prop_name,
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index e797eaa..5eb2b60 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -41,6 +41,7 @@ from .types import ClassName
 from .ui import UI
 from .values import (
     ArrayValue,
+    ExprValue,
     Flag,
     Flags,
     IdentLiteral,
diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
index c5e97b3..6e26048 100644
--- a/blueprintcompiler/language/contexts.py
+++ b/blueprintcompiler/language/contexts.py
@@ -79,3 +79,9 @@ class ScopeCtx:
         for child in node.children:
             if child.context[ScopeCtx] is self:
                 yield from self._iter_recursive(child)
+
+
+@dataclass
+class ExprValueCtx:
+    """Indicates that the context is an expression literal, where the
+    "item" keyword may be used."""
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index f305035..e0b4246 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -81,6 +81,16 @@ class LiteralExpr(ExprBase):
             or self.root.is_legacy_template(self.literal.value.ident)
         )
 
+    @property
+    def is_this(self) -> bool:
+        from .values import IdentLiteral
+
+        return (
+            not self.is_object
+            and isinstance(self.literal.value, IdentLiteral)
+            and self.literal.value.ident == "item"
+        )
+
     @property
     def literal(self):
         from .values import Literal
@@ -91,6 +101,15 @@ class LiteralExpr(ExprBase):
     def type(self) -> T.Optional[GirType]:
         return self.literal.value.type
 
+    @validate()
+    def item_validations(self):
+        if self.is_this:
+            if not isinstance(self.rhs, CastExpr):
+                raise CompileError('"item" must be cast to its object type')
+
+            if not isinstance(self.rhs.rhs, LookupOp):
+                raise CompileError('"item" can only be used for looking up properties')
+
 
 class LookupOp(InfixExpr):
     grammar = [".", UseIdent("property")]
@@ -285,6 +304,9 @@ expr.children = [
 def decompile_lookup(
     ctx: DecompileCtx, gir: gir.GirContext, cdata: str, name: str, type: str
 ):
+    if ctx.parent_node is not None and ctx.parent_node.tag == "property":
+        ctx.print("expr ")
+
     if t := ctx.type_by_cname(type):
         type = decompile.full_name(t)
     else:
@@ -304,6 +326,8 @@ def decompile_lookup(
     if constant is not None:
         if constant == ctx.template_class:
             ctx.print("template." + name)
+        elif constant == "":
+            ctx.print("item as <" + type + ">." + name)
         else:
             ctx.print(constant + "." + name)
         return
@@ -318,6 +342,9 @@ def decompile_lookup(
 def decompile_constant(
     ctx: DecompileCtx, gir: gir.GirContext, cdata: str, type: T.Optional[str] = None
 ):
+    if ctx.parent_node is not None and ctx.parent_node.tag == "property":
+        ctx.print("expr ")
+
     if type is None:
         if cdata == ctx.template_class:
             ctx.print("template")
@@ -330,6 +357,9 @@ def decompile_constant(
 
 @decompiler("closure", skip_children=True)
 def decompile_closure(ctx: DecompileCtx, gir: gir.GirContext, function: str, type: str):
+    if ctx.parent_node is not None and ctx.parent_node.tag == "property":
+        ctx.print("expr ")
+
     if t := ctx.type_by_cname(type):
         type = decompile.full_name(t)
     else:
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 54cb297..1def15b 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -28,7 +28,18 @@ from .common import *
 from .response_id import ExtResponse
 from .types import ClassName, ConcreteClassName
 
-RESERVED_IDS = {"this", "self", "template", "true", "false", "null", "none"}
+RESERVED_IDS = {
+    "this",
+    "self",
+    "template",
+    "true",
+    "false",
+    "null",
+    "none",
+    "item",
+    "expr",
+    "typeof",
+}
 
 
 class ObjectContent(AstNode):
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index b553909..50a7512 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -21,13 +21,12 @@
 from .binding import Binding
 from .common import *
 from .contexts import ValueTypeCtx
-from .gtkbuilder_template import Template
-from .values import ArrayValue, ObjectValue, Value
+from .values import ArrayValue, ExprValue, ObjectValue, Value
 
 
 class Property(AstNode):
     grammar = Statement(
-        UseIdent("name"), ":", AnyOf(Binding, ObjectValue, Value, ArrayValue)
+        UseIdent("name"), ":", AnyOf(Binding, ExprValue, ObjectValue, Value, ArrayValue)
     )
 
     @property
@@ -35,7 +34,7 @@ class Property(AstNode):
         return self.tokens["name"]
 
     @property
-    def value(self) -> T.Union[Binding, ObjectValue, Value, ArrayValue]:
+    def value(self) -> T.Union[Binding, ExprValue, ObjectValue, Value, ArrayValue]:
         return self.children[0]
 
     @property
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 5f47e54..5556d99 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -23,7 +23,8 @@ from blueprintcompiler.gir import ArrayType
 from blueprintcompiler.lsp_utils import SemanticToken
 
 from .common import *
-from .contexts import ScopeCtx, ValueTypeCtx
+from .contexts import ExprValueCtx, ScopeCtx, ValueTypeCtx
+from .expression import Expression
 from .gobject_object import Object
 from .types import TypeName
 
@@ -319,7 +320,12 @@ class IdentLiteral(AstNode):
                 if self.ident == "null":
                     if not self.context[ValueTypeCtx].allow_null:
                         raise CompileError("null is not permitted here")
-                else:
+                elif self.ident == "item":
+                    if not self.context[ExprValueCtx]:
+                        raise CompileError(
+                            '"item" can only be used in an expression literal'
+                        )
+                elif self.ident not in ["true", "false"]:
                     raise CompileError(
                         f"Could not find object with ID {self.ident}",
                         did_you_mean=(
@@ -407,6 +413,35 @@ class ObjectValue(AstNode):
             )
 
 
+class ExprValue(AstNode):
+    grammar = [Keyword("expr"), Expression]
+
+    @property
+    def expression(self) -> Expression:
+        return self.children[Expression][0]
+
+    @validate("expr")
+    def validate_for_type(self) -> None:
+        expected_type = self.parent.context[ValueTypeCtx].value_type
+        expr_type = self.root.gir.get_type("Expression", "Gtk")
+        if expected_type is not None and not expected_type.assignable_to(expr_type):
+            raise CompileError(
+                f"Cannot convert Gtk.Expression to {expected_type.full_name}"
+            )
+
+    @docs("expr")
+    def ref_docs(self):
+        return get_docs_section("Syntax ExprValue")
+
+    @context(ExprValueCtx)
+    def expr_literal(self):
+        return ExprValueCtx()
+
+    @context(ValueTypeCtx)
+    def value_type(self):
+        return ValueTypeCtx(None, must_infer_type=True)
+
+
 class Value(AstNode):
     grammar = AnyOf(Translated, Flags, Literal)
 
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index a21b6fb..5c03761 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -134,6 +134,11 @@ class XmlOutput(OutputFormat):
                 self._emit_expression(value.expression, xml)
                 xml.end_tag()
 
+        elif isinstance(value, ExprValue):
+            xml.start_tag("property", **props)
+            self._emit_expression(value.expression, xml)
+            xml.end_tag()
+
         elif isinstance(value, ObjectValue):
             xml.start_tag("property", **props)
             self._emit_object(value.object, xml)
@@ -218,12 +223,6 @@ class XmlOutput(OutputFormat):
             xml.put_text(
                 "|".join([str(flag.value or flag.name) for flag in value.child.flags])
             )
-        elif isinstance(value.child, Translated):
-            raise CompilerBugError("translated values must be handled in the parent")
-        elif isinstance(value.child, TypeLiteral):
-            xml.put_text(value.child.type_name.glib_type_name)
-        elif isinstance(value.child, ObjectValue):
-            self._emit_object(value.child.object, xml)
         else:
             raise CompilerBugError()
 
@@ -245,6 +244,9 @@ class XmlOutput(OutputFormat):
             raise CompilerBugError()
 
     def _emit_literal_expr(self, expr: LiteralExpr, xml: XmlEmitter):
+        if expr.is_this:
+            return
+
         if expr.is_object:
             xml.start_tag("constant")
         else:
diff --git a/docs/reference/expressions.rst b/docs/reference/expressions.rst
index 8688ff0..3d523d1 100644
--- a/docs/reference/expressions.rst
+++ b/docs/reference/expressions.rst
@@ -42,8 +42,8 @@ Expressions are composed of property lookups and/or closures. Property lookups a
 
 .. _Syntax LookupExpression:
 
-Lookup Expressions
-------------------
+Lookups
+-------
 
 .. rst-class:: grammar-block
 
@@ -56,8 +56,8 @@ The type of a property expression is the type of the property it refers to.
 
 .. _Syntax ClosureExpression:
 
-Closure Expressions
--------------------
+Closures
+--------
 
 .. rst-class:: grammar-block
 
@@ -72,8 +72,8 @@ Blueprint doesn't know the closure's return type, so closure expressions must be
 
 .. _Syntax CastExpression:
 
-Cast Expressions
-----------------
+Casts
+-----
 
 .. rst-class:: grammar-block
 
@@ -81,7 +81,32 @@ Cast Expressions
 
 Cast expressions allow Blueprint to know the type of an expression when it can't otherwise determine it. This is necessary for closures and for properties of application-defined types.
 
+Example
+~~~~~~~
+
 .. code-block:: blueprint
 
    // Cast the result of the closure so blueprint knows it's a string
-   label: bind $my_closure() as <string>
\ No newline at end of file
+   label: bind $format_bytes(template.file-size) as <string>
+
+.. _Syntax ExprValue:
+
+Expression Values
+-----------------
+
+.. rst-class:: grammar-block
+
+   ExprValue = 'expr' :ref:`Expression<Syntax Expression>`
+
+Some APIs take *an expression itself*--not its result--as a property value. For example, `Gtk.BoolFilter <https://docs.gtk.org/gtk4/class.BoolFilter.html>`_ has an ``expression`` property of type `Gtk.Expression <https://docs.gtk.org/gtk4/class.Expression.html>`_. This expression is evaluated for every item in a list model to determine whether the item should be filtered.
+
+To define an expression for such a property, use ``expr`` instead of ``bind``. Inside the expression, you can use the ``item`` keyword to refer to the item being evaluated. You must cast the item to the correct type using the ``as`` keyword, and you can only use ``item`` in a property lookup--you may not pass it to a closure.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprint
+
+   BoolFilter {
+     expression: expr item as <$UserAccount>.active;
+   }
diff --git a/docs/reference/objects.rst b/docs/reference/objects.rst
index 09f5af8..6f76da6 100644
--- a/docs/reference/objects.rst
+++ b/docs/reference/objects.rst
@@ -58,7 +58,7 @@ Properties
 
 .. rst-class:: grammar-block
 
-   Property = <name::ref:`IDENT<Syntax IDENT>`> ':' ( :ref:`Binding<Syntax Binding>` | :ref:`ObjectValue<Syntax ObjectValue>` | :ref:`Value<Syntax Value>` ) ';'
+   Property = <name::ref:`IDENT<Syntax IDENT>`> ':' ( :ref:`Binding<Syntax Binding>` | :ref:`ExprValue<Syntax ExprValue>` | :ref:`ObjectValue<Syntax ObjectValue>` | :ref:`Value<Syntax Value>` ) ';'
 
 Properties specify the details of each object, like a label's text, an image's icon name, or the margins on a container.
 
diff --git a/tests/sample_errors/expr_item_not_cast.blp b/tests/sample_errors/expr_item_not_cast.blp
new file mode 100644
index 0000000..76a1d89
--- /dev/null
+++ b/tests/sample_errors/expr_item_not_cast.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+BoolFilter {
+  expression: expr item.visible;
+}
diff --git a/tests/sample_errors/expr_item_not_cast.err b/tests/sample_errors/expr_item_not_cast.err
new file mode 100644
index 0000000..f6cf7d4
--- /dev/null
+++ b/tests/sample_errors/expr_item_not_cast.err
@@ -0,0 +1 @@
+4,20,4,"item" must be cast to its object type
\ No newline at end of file
diff --git a/tests/sample_errors/expr_value_assignment.blp b/tests/sample_errors/expr_value_assignment.blp
new file mode 100644
index 0000000..51d778f
--- /dev/null
+++ b/tests/sample_errors/expr_value_assignment.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: expr 1;
+}
diff --git a/tests/sample_errors/expr_value_assignment.err b/tests/sample_errors/expr_value_assignment.err
new file mode 100644
index 0000000..1c7092a
--- /dev/null
+++ b/tests/sample_errors/expr_value_assignment.err
@@ -0,0 +1 @@
+4,10,4,Cannot convert Gtk.Expression to string
\ No newline at end of file
diff --git a/tests/sample_errors/expr_value_closure_arg.blp b/tests/sample_errors/expr_value_closure_arg.blp
new file mode 100644
index 0000000..7f828c4
--- /dev/null
+++ b/tests/sample_errors/expr_value_closure_arg.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+BoolFilter {
+  expression: expr $closure(item as <Entry>) as <bool>;
+}
diff --git a/tests/sample_errors/expr_value_closure_arg.err b/tests/sample_errors/expr_value_closure_arg.err
new file mode 100644
index 0000000..b9e19f8
--- /dev/null
+++ b/tests/sample_errors/expr_value_closure_arg.err
@@ -0,0 +1 @@
+4,29,4,"item" can only be used for looking up properties
\ No newline at end of file
diff --git a/tests/sample_errors/expr_value_item.blp b/tests/sample_errors/expr_value_item.blp
new file mode 100644
index 0000000..141c806
--- /dev/null
+++ b/tests/sample_errors/expr_value_item.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+BoolFilter {
+  expression: expr item as <Label>;
+}
diff --git a/tests/sample_errors/expr_value_item.err b/tests/sample_errors/expr_value_item.err
new file mode 100644
index 0000000..861925e
--- /dev/null
+++ b/tests/sample_errors/expr_value_item.err
@@ -0,0 +1 @@
+4,20,4,"item" can only be used for looking up properties
\ No newline at end of file
diff --git a/tests/samples/bind_expr_prop.blp b/tests/samples/bind_expr_prop.blp
new file mode 100644
index 0000000..111bc37
--- /dev/null
+++ b/tests/samples/bind_expr_prop.blp
@@ -0,0 +1,9 @@
+using Gtk 4.0;
+
+BoolFilter filter1 {
+  expression: expr true;
+}
+
+BoolFilter filter2 {
+  expression: bind filter1.expression;
+}
diff --git a/tests/samples/bind_expr_prop.ui b/tests/samples/bind_expr_prop.ui
new file mode 100644
index 0000000..d1b4b7a
--- /dev/null
+++ b/tests/samples/bind_expr_prop.ui
@@ -0,0 +1,17 @@
+<?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="GtkBoolFilter" id="filter1">
+    <property name="expression">
+      <constant type="gboolean">true</constant>
+    </property>
+  </object>
+  <object class="GtkBoolFilter" id="filter2">
+    <property name="expression" bind-source="filter1" bind-property="expression" bind-flags="sync-create"/>
+  </object>
+</interface>
diff --git a/tests/samples/bind_literal.blp b/tests/samples/bind_literal.blp
new file mode 100644
index 0000000..c1cb17b
--- /dev/null
+++ b/tests/samples/bind_literal.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: bind "Hello, world!";
+}
diff --git a/tests/samples/bind_literal.ui b/tests/samples/bind_literal.ui
new file mode 100644
index 0000000..b311a20
--- /dev/null
+++ b/tests/samples/bind_literal.ui
@@ -0,0 +1,14 @@
+<?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="GtkLabel">
+    <binding name="label">
+      <constant type="gchararray">Hello, world!</constant>
+    </binding>
+  </object>
+</interface>
diff --git a/tests/samples/expr_value.blp b/tests/samples/expr_value.blp
new file mode 100644
index 0000000..5a4a93c
--- /dev/null
+++ b/tests/samples/expr_value.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+BoolFilter {
+  expression: expr item as <Entry>.visible;
+}
diff --git a/tests/samples/expr_value.ui b/tests/samples/expr_value.ui
new file mode 100644
index 0000000..0a2cb4c
--- /dev/null
+++ b/tests/samples/expr_value.ui
@@ -0,0 +1,14 @@
+<?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="GtkBoolFilter">
+    <property name="expression">
+      <lookup name="visible" type="GtkEntry"></lookup>
+    </property>
+  </object>
+</interface>
diff --git a/tests/samples/expr_value_closure.blp b/tests/samples/expr_value_closure.blp
new file mode 100644
index 0000000..54877ba
--- /dev/null
+++ b/tests/samples/expr_value_closure.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+BoolFilter {
+  expression: expr $closure(item as <Entry>.visible) as <bool>;
+}
diff --git a/tests/samples/expr_value_closure.ui b/tests/samples/expr_value_closure.ui
new file mode 100644
index 0000000..69abc0c
--- /dev/null
+++ b/tests/samples/expr_value_closure.ui
@@ -0,0 +1,16 @@
+<?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="GtkBoolFilter">
+    <property name="expression">
+      <closure function="closure" type="gboolean">
+        <lookup name="visible" type="GtkEntry"></lookup>
+      </closure>
+    </property>
+  </object>
+</interface>
diff --git a/tests/samples/expr_value_literal.blp b/tests/samples/expr_value_literal.blp
new file mode 100644
index 0000000..7198a26
--- /dev/null
+++ b/tests/samples/expr_value_literal.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+BoolFilter {
+  expression: expr true;
+}
diff --git a/tests/samples/expr_value_literal.ui b/tests/samples/expr_value_literal.ui
new file mode 100644
index 0000000..3b7f1fc
--- /dev/null
+++ b/tests/samples/expr_value_literal.ui
@@ -0,0 +1,14 @@
+<?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="GtkBoolFilter">
+    <property name="expression">
+      <constant type="gboolean">true</constant>
+    </property>
+  </object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 866488e..1f56eb6 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -198,6 +198,7 @@ class TestSamples(unittest.TestCase):
                 "adw_breakpoint_template",
                 "expr_closure",
                 "expr_closure_args",
+                "expr_value_closure",
                 "parseable",
                 "signal",
                 "signal_not_swapped",

From 29e4a56bfc842a0b2c59d0acf9a8f78337b5deb9 Mon Sep 17 00:00:00 2001
From: Alexey Yerin <yyp@disroot.org>
Date: Sat, 4 Jan 2025 17:15:14 +0300
Subject: [PATCH 68/82] Formatter: Remove trailing whitespace from comments

Fixes #153
---
 blueprintcompiler/formatter.py   | 3 +++
 tests/formatting/comment_in.blp  | 4 +++-
 tests/formatting/comment_out.blp | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py
index 60d87b4..f438675 100644
--- a/blueprintcompiler/formatter.py
+++ b/blueprintcompiler/formatter.py
@@ -193,6 +193,9 @@ def format(data, tab_size=2, insert_space=True):
                 elif prev_line_type in require_extra_newline:
                     newlines = 2
 
+                current_line = "\n".join(
+                    [line.rstrip() for line in current_line.split("\n")]
+                )
                 commit_current_line(LineType.COMMENT, newlines_before=newlines)
 
             else:  # pragma: no cover
diff --git a/tests/formatting/comment_in.blp b/tests/formatting/comment_in.blp
index 32a907c..88b825a 100644
--- a/tests/formatting/comment_in.blp
+++ b/tests/formatting/comment_in.blp
@@ -1,2 +1,4 @@
 using Gtk 4.0;
-//comment
\ No newline at end of file
+//comment
+// Trailing whitespace:
+//       
diff --git a/tests/formatting/comment_out.blp b/tests/formatting/comment_out.blp
index d5dca95..91e647a 100644
--- a/tests/formatting/comment_out.blp
+++ b/tests/formatting/comment_out.blp
@@ -1,2 +1,4 @@
 using Gtk 4.0;
 // comment
+// Trailing whitespace:
+//

From aa13c8f5af137bbedd1781d903e923d45d7c41fb Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 5 Jan 2025 14:27:59 -0600
Subject: [PATCH 69/82] Warn about single-quoted translated strings

gettext only recognizes double quoted strings
---
 blueprintcompiler/language/values.py             | 13 +++++++++++++
 docs/translations.rst                            |  2 ++
 tests/sample_errors/single_quoted_translated.blp |  5 +++++
 tests/sample_errors/single_quoted_translated.err |  1 +
 4 files changed, 21 insertions(+)
 create mode 100644 tests/sample_errors/single_quoted_translated.blp
 create mode 100644 tests/sample_errors/single_quoted_translated.err

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 5556d99..cb80975 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -58,6 +58,19 @@ class Translated(AstNode):
                 f"Cannot convert translated string to {expected_type.full_name}"
             )
 
+    @validate("context")
+    def context_double_quoted(self):
+        if self.translate_context is None:
+            return
+
+        if not str(self.group.tokens["context"]).startswith('"'):
+            raise CompileWarning("gettext may not recognize single-quoted strings")
+
+    @validate("string")
+    def string_double_quoted(self):
+        if not str(self.group.tokens["string"]).startswith('"'):
+            raise CompileWarning("gettext may not recognize single-quoted strings")
+
     @docs()
     def ref_docs(self):
         return get_docs_section("Syntax Translated")
diff --git a/docs/translations.rst b/docs/translations.rst
index 7ebf929..7af2099 100644
--- a/docs/translations.rst
+++ b/docs/translations.rst
@@ -24,6 +24,8 @@ If you're using Meson's `i18n module <https://mesonbuild.com/i18n-module.html#i1
 
    i18n.gettext('package name', preset: 'glib')
 
+You must use double quotes for the translated strings in order for gettext to recognize them. Newer versions of blueprint will warn you if you use single quotes.
+
 Contexts
 --------
 
diff --git a/tests/sample_errors/single_quoted_translated.blp b/tests/sample_errors/single_quoted_translated.blp
new file mode 100644
index 0000000..718fd49
--- /dev/null
+++ b/tests/sample_errors/single_quoted_translated.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: _('Hello, World!');
+}
\ No newline at end of file
diff --git a/tests/sample_errors/single_quoted_translated.err b/tests/sample_errors/single_quoted_translated.err
new file mode 100644
index 0000000..c725580
--- /dev/null
+++ b/tests/sample_errors/single_quoted_translated.err
@@ -0,0 +1 @@
+4,12,15,gettext may not recognize single-quoted strings
\ No newline at end of file

From 04ef0944db56ab01307a29aaa7303df6067cb3c0 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 17 Jan 2025 17:04:52 -0600
Subject: [PATCH 70/82] Release v0.16.0

---
 NEWS.md          | 32 ++++++++++++++++++++++++++++++++
 docs/flatpak.rst |  2 +-
 meson.build      |  2 +-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 389f82c..a12dab0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,35 @@
+# v0.16.0
+
+## Added
+- Added more "go to reference" implementations in the language server
+- Added semantic token support for flag members in the language server
+- Added property documentation to the hover tooltip for notify signals
+- The language server now shows relevant sections of the reference documentation when hovering over keywords and symbols
+- Added `not-swapped` flag to signal handlers, which may be needed for signal handlers that specify an object
+- Added expression literals, which allow you to specify a Gtk.Expression property (as opposed to the existing expression support, which is for property bindings)
+
+## Changed
+- The formatter adds trailing commas to lists (Alexey Yerin)
+- The formatter removes trailing whitespace from comments (Alexey Yerin)
+- Autocompleting a commonly translated property automatically adds the `_("")` syntax
+- Marking a single-quoted string as translatable now generates a warning, since gettext does not recognize it when using the configuration recommended in the blueprint documentation
+
+## Fixed
+- Added support for libgirepository-2.0 so that blueprint doesn't crash due to import conflicts on newer versions of PyGObject (Jordan Petridis)
+- Fixed a bug when decompiling/porting files with enum values
+- Fixed several issues where tests would fail with versions of GTK that added new deprecations
+- Addressed a problem with the language server protocol in some editors (Luoyayu)
+- Fixed an issue where the compiler would crash instead of reporting compiler errors
+- Fixed a crash in the language server that occurred when a detailed signal (e.g. `notify::*`) was not complete
+- The language server now properly implements the shutdown command, fixing support for some editors and improving robustness when restarting (Alexey Yerin)
+- Marking a string in an array as translatable now generates an error, since it doesn't work
+-
+
+## Documentation
+- Added mention of `null` in the Literal Values section
+- Add apps to Built with Blueprint section (Benedek Dévényi, Vladimir Vaskov)
+- Corrected and updated many parts of the documentation
+
 # v0.14.0
 
 ## Added
diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index 0071d2f..86112cf 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -17,7 +17,7 @@ a module in your flatpak manifest:
        {
          "type": "git",
          "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-         "tag": "v0.14.0"
+         "tag": "v0.16.0"
        }
      ]
    }
diff --git a/meson.build b/meson.build
index 63d9489..f298d15 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.14.0',
+  version: '0.16.0',
 )
 
 prefix = get_option('prefix')

From 404ae767870b6da6005f2f4aaa878deed82829e5 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 17 Jan 2025 17:25:21 -0600
Subject: [PATCH 71/82] Update MAINTENANCE.md

---
 MAINTENANCE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTENANCE.md b/MAINTENANCE.md
index 220c117..3ab4fa2 100644
--- a/MAINTENANCE.md
+++ b/MAINTENANCE.md
@@ -8,7 +8,7 @@ in the NEWS file.
 3. Make a new commit with just these two changes. Use `Release v{version}` as the commit message. Tag the commit as `v{version}` and push the tag.
 4. Create a "Post-release version bump" commit.
 5. Go to the Releases page in GitLab and create a new release from the tag.
-6. Announce the release through relevant channels (Twitter, TWIG, etc.)
+6. Announce the release through relevant channels (Mastodon, TWIG, etc.)
 
 ## Related projects
 

From a4e0c3701b1510191f72cc606c2fa20d97800444 Mon Sep 17 00:00:00 2001
From: Chris Mayo <aklhfex@gmail.com>
Date: Thu, 30 Jan 2025 19:23:40 +0000
Subject: [PATCH 72/82] docs: Update overview example using format and compile

---
 docs/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 34b942c..a71b968 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -26,7 +26,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
 
    using Gtk 4.0;
 
-   template MyAppWindow : ApplicationWindow {
+   template $MyAppWindow: ApplicationWindow {
      default-width: 600;
      default-height: 300;
      title: _("Hello, Blueprint!");
@@ -35,7 +35,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
      HeaderBar {}
 
      Label {
-       label: bind MyAppWindow.main_text;
+       label: bind template.main_text;
      }
    }
 

From 394014429e819347d107eb5fa9fd2871bdb3d0ac Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Thu, 20 Mar 2025 10:52:57 +0000
Subject: [PATCH 73/82] Sort keys in collect-sections.py

This makes sure that the reference_docs.json file
is build reproducible.

Ref https://reproducible-builds.org/
---
 docs/collect-sections.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/collect-sections.py b/docs/collect-sections.py
index e6227e7..07bc5f6 100755
--- a/docs/collect-sections.py
+++ b/docs/collect-sections.py
@@ -132,5 +132,8 @@ if __name__ == "__main__":
     # print the sections to a json file
     with open(outfile, "w") as f:
         json.dump(
-            {name: section.to_json() for name, section in sections.items()}, f, indent=2
+            {name: section.to_json() for name, section in sections.items()},
+            f,
+            indent=2,
+            sort_keys=True,
         )

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 74/82]  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 75/82] 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;
+            };
+          }
+        };
+      };
+    }
+  };
+}
+

From f50b898e4ce74d84cfa92ce44e90f9aaca2ec133 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 1 Apr 2025 19:27:59 -0500
Subject: [PATCH 76/82] adw_breakpoint: Fix crash in language server

Fix a crash that happened when an AdwBreakpointSetter rule was
incomplete, such as when you're still typing it. Fixes #189.
---
 blueprintcompiler/language/adw_breakpoint.py | 9 ++++++---
 blueprintcompiler/outputs/xml/__init__.py    | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/language/adw_breakpoint.py b/blueprintcompiler/language/adw_breakpoint.py
index 4ad5b24..3d2c10d 100644
--- a/blueprintcompiler/language/adw_breakpoint.py
+++ b/blueprintcompiler/language/adw_breakpoint.py
@@ -81,8 +81,8 @@ class AdwBreakpointSetter(AstNode):
         return self.tokens["property"]
 
     @property
-    def value(self) -> Value:
-        return self.children[Value][0]
+    def value(self) -> T.Optional[Value]:
+        return self.children[Value][0] if len(self.children[Value]) > 0 else None
 
     @property
     def gir_class(self) -> T.Optional[GirType]:
@@ -106,7 +106,10 @@ class AdwBreakpointSetter(AstNode):
             return None
 
     @property
-    def document_symbol(self) -> DocumentSymbol:
+    def document_symbol(self) -> T.Optional[DocumentSymbol]:
+        if self.value is None:
+            return None
+
         return DocumentSymbol(
             f"{self.object_id}.{self.property_name}",
             SymbolKind.Property,
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 5c03761..15850f7 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -308,6 +308,9 @@ class XmlOutput(OutputFormat):
 
         elif isinstance(extension, AdwBreakpointSetters):
             for setter in extension.setters:
+                if setter.value is None:
+                    continue
+
                 attrs = {}
 
                 if isinstance(setter.value.child, Translated):

From 6a77bfee0a5b2a03390c4ed7f945902a070ef697 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 19 Apr 2025 13:27:20 -0500
Subject: [PATCH 77/82] tests: Fix typing

---
 tests/test_tokenizer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_tokenizer.py b/tests/test_tokenizer.py
index 2bca595..ad5f828 100644
--- a/tests/test_tokenizer.py
+++ b/tests/test_tokenizer.py
@@ -25,7 +25,7 @@ from blueprintcompiler.tokenizer import Token, TokenType, tokenize
 
 
 class TestTokenizer(unittest.TestCase):
-    def assert_tokenize(self, string: str, expect: [Token]):
+    def assert_tokenize(self, string: str, expect: list[Token]):
         try:
             tokens = tokenize(string)
             self.assertEqual(len(tokens), len(expect))

From e9d61cb6f915d6688dc46cb9142eb6acae7110f7 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 25 Apr 2025 18:15:15 -0500
Subject: [PATCH 78/82] Update URLs after move to GNOME namespace on GitLab

---
 .gitlab-ci.yml                        | 4 ++--
 blueprintcompiler/errors.py           | 2 +-
 blueprintcompiler/interactive_port.py | 4 ++--
 docs/collect-sections.py              | 2 +-
 docs/flatpak.rst                      | 2 +-
 docs/index.rst                        | 2 +-
 docs/reference/extensions.rst         | 2 +-
 docs/setup.rst                        | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ec071e..6d373cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
 - pages
 
 build:
-  image: registry.gitlab.gnome.org/jwestman/blueprint-compiler
+  image: registry.gitlab.gnome.org/gnome/blueprint-compiler
   stage: build
   script:
     - black --check --diff ./ tests
@@ -33,7 +33,7 @@ build:
         path: coverage.xml
 
 fuzz:
-  image: registry.gitlab.gnome.org/jwestman/blueprint-compiler
+  image: registry.gitlab.gnome.org/gnome/blueprint-compiler
   stage: build
   script:
     - meson _build
diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 1e7297c..df1c2e1 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -219,7 +219,7 @@ def report_bug():  # pragma: no cover
         f"""{Colors.BOLD}{Colors.RED}***** COMPILER BUG *****
 The blueprint-compiler program has crashed. Please report the above stacktrace,
 along with the input file(s) if possible, on GitLab:
-{Colors.BOLD}{Colors.BLUE}{Colors.UNDERLINE}https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/new?issue
+{Colors.BOLD}{Colors.BLUE}{Colors.UNDERLINE}https://gitlab.gnome.org/GNOME/blueprint-compiler/-/issues/new?issue
 {Colors.CLEAR}"""
     )
 
diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index 0c37885..12dd485 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -71,7 +71,7 @@ def decompile_file(in_file, out_file) -> T.Union[str, CouldNotPort]:
             print(
                 f"""{Colors.FAINT}Either the original XML file had an error, or there is a bug in the
 porting tool. If you think it's a bug (which is likely), please file an issue on GitLab:
-{Colors.BLUE}{Colors.UNDERLINE}https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/new?issue{Colors.CLEAR}\n"""
+{Colors.BLUE}{Colors.UNDERLINE}https://gitlab.gnome.org/GNOME/blueprint-compiler/-/issues/new?issue{Colors.CLEAR}\n"""
             )
 
             return CouldNotPort("does not compile")
@@ -136,7 +136,7 @@ def step1():
             wrap.write(
                 f"""[wrap-git]
 directory = blueprint-compiler
-url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
+url = https://gitlab.gnome.org/GNOME/blueprint-compiler.git
 revision = {VERSION}
 depth = 1
 
diff --git a/docs/collect-sections.py b/docs/collect-sections.py
index 07bc5f6..a2dd004 100755
--- a/docs/collect-sections.py
+++ b/docs/collect-sections.py
@@ -9,7 +9,7 @@ from pathlib import Path
 
 __all__ = ["get_docs_section"]
 
-DOCS_ROOT = "https://jwestman.pages.gitlab.gnome.org/blueprint-compiler"
+DOCS_ROOT = "https://gnome.pages.gitlab.gnome.org/blueprint-compiler"
 
 
 sections: dict[str, "Section"] = {}
diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index 86112cf..8081c8d 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -16,7 +16,7 @@ a module in your flatpak manifest:
      "sources": [
        {
          "type": "git",
-         "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
+         "url": "https://gitlab.gnome.org/GNOME/blueprint-compiler",
          "tag": "v0.16.0"
        }
      ]
diff --git a/docs/index.rst b/docs/index.rst
index a71b968..6cd130f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -59,7 +59,7 @@ Features
 Links
 -----
 
-- `Source code <https://gitlab.gnome.org/jwestman/blueprint-compiler>`_
+- `Source code <https://gitlab.gnome.org/GNOME/blueprint-compiler>`_
 - `Workbench <https://github.com/sonnyp/Workbench>`_ lets you try, preview and export Blueprint
 - `GNOME Builder <https://developer.gnome.org/documentation/introduction/builder.html>`_ provides builtin support
 - `Vim syntax highlighting plugin by thetek42 <https://github.com/thetek42/vim-blueprint-syntax>`_
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index 0961d14..2fd5dbb 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -10,7 +10,7 @@ Properties are the main way to set values on objects, but they are limited by th
 
    Extensions are a feature of ``Gtk.Buildable``--see `Gtk.Buildable.custom_tag_start() <https://docs.gtk.org/gtk4/vfunc.Buildable.custom_tag_start.html>`_ for internal details.
 
-   Because they aren't part of the type system, they aren't present in typelib files like properties and signals are. Therefore, if a library adds a new extension, syntax for it must be added to Blueprint manually. If there's a commonly used extension that isn't supported by Blueprint, please `file an issue <https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues>`_.
+   Because they aren't part of the type system, they aren't present in typelib files like properties and signals are. Therefore, if a library adds a new extension, syntax for it must be added to Blueprint manually. If there's a commonly used extension that isn't supported by Blueprint, please `file an issue <https://gitlab.gnome.org/GNOME/blueprint-compiler/-/issues>`_.
 
 .. rst-class:: grammar-block
 
diff --git a/docs/setup.rst b/docs/setup.rst
index 839f8f6..914c753 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -8,7 +8,7 @@ Setting up Blueprint on a new or existing project
 Using the porting tool
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Clone `blueprint-compiler <https://gitlab.gnome.org/jwestman/blueprint-compiler>`_
+Clone `blueprint-compiler <https://gitlab.gnome.org/GNOME/blueprint-compiler>`_
 from source. You can install it using ``meson _build`` and ``ninja -C _build install``,
 or you can leave it uninstalled.
 
@@ -29,7 +29,7 @@ blueprint-compiler works as a meson subproject.
 
       [wrap-git]
       directory = blueprint-compiler
-      url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
+      url = https://gitlab.gnome.org/GNOME/blueprint-compiler.git
       revision = main
       depth = 1
 

From 3816f4fe8da291704d54a9dd945ba253b9233ca1 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 25 Apr 2025 18:26:45 -0500
Subject: [PATCH 79/82] Add .doap file

---
 blueprint-compiler.doap | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 blueprint-compiler.doap

diff --git a/blueprint-compiler.doap b/blueprint-compiler.doap
new file mode 100644
index 0000000..f3e4000
--- /dev/null
+++ b/blueprint-compiler.doap
@@ -0,0 +1,27 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xmlns:gnome="http://api.gnome.org/doap-extensions#"
+         xmlns="http://usefulinc.com/ns/doap#">
+
+  <name xml:lang="en">Blueprint</name>
+  <shortdesc xml:lang="en">A modern language for creating GTK interfaces</shortdesc>
+  <description xml:lang="en">Blueprint is a language and associated tooling for building user interfaces for GTK.</description>
+  <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
+  <programming-language>Python</programming-language>
+
+  <homepage
+  rdf:resource="https://gnome.gitlab.gnome.org/blueprint-compiler/" />
+  <download-page
+  rdf:resource="https://gitlab.gnome.org/GNOME/blueprint-compiler/-/releases" />
+  <bug-database
+  rdf:resource="https://gitlab.gnome.org/GNOME/blueprint-compiler/issues" />
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>James Westman</foaf:name>
+      <foaf:mbox rdf:resource="mailto:james@jwestman.net" />
+      <gnome:userid>jwestman</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+</Project>

From a83c7e936dafa19afd9753138fd66b7e3aaee008 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 25 Apr 2025 18:32:33 -0500
Subject: [PATCH 80/82] black: Update formatting

---
 blueprintcompiler/parse_tree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index ae062fb..e590539 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -17,7 +17,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-""" Utilities for parsing an AST from a token stream. """
+"""Utilities for parsing an AST from a token stream."""
 
 import typing as T
 from enum import Enum

From a12d3f5c81ee231f8bdb87cb06cf8afe5e35f4ad Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 25 Apr 2025 20:13:01 -0500
Subject: [PATCH 81/82] decompile: Fix bug in lookup tags

A lookup tag with no type attribute would crash the decompiler, even if
that was valid. This wasn't caught by the tests since blueprint never
generates such XML.

Also fixed a bug in the tests that caused decompiler-only tests not to
run.
---
 blueprintcompiler/decompiler.py          |  8 +++++---
 blueprintcompiler/language/expression.py | 12 +++++++++---
 tests/samples/issue_187.ui               | 15 +++++++++++++++
 tests/samples/issue_187_dec.blp          |  7 +++++++
 tests/test_samples.py                    | 10 +++-------
 5 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 tests/samples/issue_187.ui
 create mode 100644 tests/samples/issue_187_dec.blp

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index de6c06f..850b6d8 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -255,7 +255,11 @@ def decompile_element(
 
         ctx._node_stack.append(xml)
         ctx.start_block()
-        gir = decompiler(*args, **kwargs)
+
+        try:
+            gir = decompiler(*args, **kwargs)
+        except TypeError as e:
+            raise UnsupportedError(tag=xml.tag)
 
         if not decompiler._skip_children:
             for child in xml.children:
@@ -266,8 +270,6 @@ def decompile_element(
 
     except UnsupportedError as e:
         raise e
-    except TypeError as e:
-        raise UnsupportedError(tag=xml.tag)
 
 
 def decompile(data: str) -> str:
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index e0b4246..de6fbf1 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -302,12 +302,18 @@ expr.children = [
 
 @decompiler("lookup", skip_children=True, cdata=True)
 def decompile_lookup(
-    ctx: DecompileCtx, gir: gir.GirContext, cdata: str, name: str, type: str
+    ctx: DecompileCtx,
+    gir: gir.GirContext,
+    cdata: str,
+    name: str,
+    type: T.Optional[str] = None,
 ):
     if ctx.parent_node is not None and ctx.parent_node.tag == "property":
         ctx.print("expr ")
 
-    if t := ctx.type_by_cname(type):
+    if type is None:
+        type = ""
+    elif t := ctx.type_by_cname(type):
         type = decompile.full_name(t)
     else:
         type = "$" + type
@@ -327,7 +333,7 @@ def decompile_lookup(
         if constant == ctx.template_class:
             ctx.print("template." + name)
         elif constant == "":
-            ctx.print("item as <" + type + ">." + name)
+            ctx.print(f"item as <{type}>.{name}")
         else:
             ctx.print(constant + "." + name)
         return
diff --git a/tests/samples/issue_187.ui b/tests/samples/issue_187.ui
new file mode 100644
index 0000000..941a00f
--- /dev/null
+++ b/tests/samples/issue_187.ui
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkLabel">
+        <binding name="label">
+          <lookup type="RecentObject" name="filename">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>
\ No newline at end of file
diff --git a/tests/samples/issue_187_dec.blp b/tests/samples/issue_187_dec.blp
new file mode 100644
index 0000000..30b997c
--- /dev/null
+++ b/tests/samples/issue_187_dec.blp
@@ -0,0 +1,7 @@
+using Gtk 4.0;
+
+template ListItem {
+  child: Label {
+    label: bind template.item as <$RecentObject>.filename;
+  };
+}
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 1f56eb6..f96d0eb 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -181,11 +181,7 @@ class TestSamples(unittest.TestCase):
 
     def test_samples(self):
         # list the samples directory
-        samples = [
-            f.stem
-            for f in Path(__file__).parent.glob("samples/*.blp")
-            if not f.stem.endswith("_dec")
-        ]
+        samples = [f.stem for f in Path(__file__).parent.glob("samples/*.blp")]
         samples.sort()
         for sample in samples:
             REQUIRE_ADW_1_4 = ["adw_breakpoint"]
@@ -215,7 +211,7 @@ class TestSamples(unittest.TestCase):
             ]
 
             # Decompiler-only tests
-            SKIP_COMPILE = ["issue_177", "translator_comments"]
+            SKIP_COMPILE = ["issue_177", "issue_187", "translator_comments"]
 
             SKIP_DECOMPILE = [
                 # Comments are not preserved in either direction
@@ -228,7 +224,7 @@ class TestSamples(unittest.TestCase):
                 continue
 
             with self.subTest(sample):
-                if sample not in SKIP_COMPILE:
+                if sample not in SKIP_COMPILE and not sample.endswith("_dec"):
                     self.assert_sample(sample, skip_run=sample in SKIP_RUN)
 
             with self.subTest("decompile/" + sample):

From 2e42dc68486c62eb250215a756958b2e0000a6ff Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 3 May 2025 07:46:34 -0500
Subject: [PATCH 82/82] decompiler: Fix bug in signals with template object

If a signal handler had the template as its object, the decompiler would
output the class name instead of the 'template' keyword.
---
 blueprintcompiler/language/gobject_signal.py |  8 +++++++-
 tests/samples/signal_template_object.blp     |  7 +++++++
 tests/samples/signal_template_object.ui      | 16 ++++++++++++++++
 tests/test_samples.py                        |  1 +
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 tests/samples/signal_template_object.blp
 create mode 100644 tests/samples/signal_template_object.ui

diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 9c27b97..3b4235f 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -225,8 +225,14 @@ class Signal(AstNode):
 
 
 @decompiler("signal")
-def decompile_signal(ctx, gir, name, handler, swapped=None, after="false", object=None):
+def decompile_signal(
+    ctx: DecompileCtx, gir, name, handler, swapped=None, after="false", object=None
+):
     object_name = object or ""
+
+    if object_name == ctx.template_class:
+        object_name = "template"
+
     name = name.replace("_", "-")
     line = f"{name} => ${handler}({object_name})"
 
diff --git a/tests/samples/signal_template_object.blp b/tests/samples/signal_template_object.blp
new file mode 100644
index 0000000..16dd5a0
--- /dev/null
+++ b/tests/samples/signal_template_object.blp
@@ -0,0 +1,7 @@
+using Gtk 4.0;
+
+template $MyTemplate {
+  Button {
+    clicked => $my_signal_handler(template);
+  }
+}
diff --git a/tests/samples/signal_template_object.ui b/tests/samples/signal_template_object.ui
new file mode 100644
index 0000000..c9a680a
--- /dev/null
+++ b/tests/samples/signal_template_object.ui
@@ -0,0 +1,16 @@
+<?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"/>
+  <template class="MyTemplate">
+    <child>
+      <object class="GtkButton">
+        <signal name="clicked" handler="my_signal_handler" object="MyTemplate"/>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index f96d0eb..0807d65 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -198,6 +198,7 @@ class TestSamples(unittest.TestCase):
                 "parseable",
                 "signal",
                 "signal_not_swapped",
+                "signal_template_object",
                 "template",
                 "template_binding",
                 "template_binding_extern",