From 180b529650e21d72c115fd7aa5c5bcebc974fcad Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 9 Jun 2022 14:51:35 -0500
Subject: [PATCH 001/290] Post-release version bump

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

diff --git a/meson.build b/meson.build
index 08d45cd..bd6fba2 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.2.0',
+  version: '0.3.0',
 )
 
 subdir('docs')

From fac311d3c3c632e3dcd548096df0cd93d3a6482b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 9 Jun 2022 13:57:13 -0500
Subject: [PATCH 002/290] Update regression tests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 960c4e4..0820f5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ build:
     - ninja -C _build install
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
-    - git checkout dba20ee77b0ba711893726208a0523073fc697e3
+    - git checkout 6f164f5e259f1602fd3bfae5e64852fed7687b9f
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'

From 7eb0c1ae0d8680da498b034cfa0660f8034945ce Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 11 Jun 2022 02:15:56 -0500
Subject: [PATCH 003/290] decompiler: Fix Adwaita version

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

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index a8b1c70..a7363e5 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -39,7 +39,7 @@ _NAMESPACES = [
     ("GLib", "2.0"),
     ("GObject", "2.0"),
     ("Gio", "2.0"),
-    ("Adw", "1.0"),
+    ("Adw", "1"),
 ]
 
 

From c094743e840efcc844fe1241ba656c270f033e45 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 17 Jun 2022 11:10:43 -0500
Subject: [PATCH 004/290] Fix compiling empty file

---
 blueprintcompiler/utils.py    | 2 +-
 tests/sample_errors/empty.blp | 0
 tests/sample_errors/empty.err | 1 +
 tests/test_samples.py         | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/sample_errors/empty.blp
 create mode 100644 tests/sample_errors/empty.err

diff --git a/blueprintcompiler/utils.py b/blueprintcompiler/utils.py
index 6befea8..2d5451d 100644
--- a/blueprintcompiler/utils.py
+++ b/blueprintcompiler/utils.py
@@ -68,7 +68,7 @@ def did_you_mean(word: str, options: T.List[str]) -> T.Optional[str]:
 
 
 def idx_to_pos(idx: int, text: str) -> T.Tuple[int, int]:
-    if idx == 0:
+    if idx == 0 or len(text) == 0:
         return (0, 0)
     sp = text[:idx].splitlines(keepends=True)
     line_num = len(sp)
diff --git a/tests/sample_errors/empty.blp b/tests/sample_errors/empty.blp
new file mode 100644
index 0000000..e69de29
diff --git a/tests/sample_errors/empty.err b/tests/sample_errors/empty.err
new file mode 100644
index 0000000..854962f
--- /dev/null
+++ b/tests/sample_errors/empty.err
@@ -0,0 +1 @@
+1,0,0,File must start with a "using Gtk" directive (e.g. `using Gtk 4.0;`)
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 40e9d0b..51af836 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -180,6 +180,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("does_not_implement")
         self.assert_sample_error("duplicate_obj_id")
         self.assert_sample_error("duplicates")
+        self.assert_sample_error("empty")
         self.assert_sample_error("enum_member_dne")
         self.assert_sample_error("filters_in_non_file_filter")
         self.assert_sample_error("gtk_3")

From 4fefa0bd7352f201470b4c9461f898b8573b289b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 29 Jan 2022 21:21:04 -0600
Subject: [PATCH 005/290] Add lookup expressions

---
 blueprintcompiler/ast_utils.py                |  5 +-
 blueprintcompiler/language/__init__.py        |  1 +
 blueprintcompiler/language/expression.py      | 63 +++++++++++++++++++
 .../language/gobject_property.py              | 23 +++++--
 blueprintcompiler/parse_tree.py               | 60 ++++++++++++++++++
 tests/samples/expr_lookup.blp                 |  9 +++
 tests/samples/expr_lookup.ui                  | 20 ++++++
 tests/test_samples.py                         |  1 +
 8 files changed, 177 insertions(+), 5 deletions(-)
 create mode 100644 blueprintcompiler/language/expression.py
 create mode 100644 tests/samples/expr_lookup.blp
 create mode 100644 tests/samples/expr_lookup.ui

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 2e8bd97..1f3eb5b 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -33,7 +33,10 @@ class Children:
     def __iter__(self):
         return iter(self._children)
     def __getitem__(self, key):
-        return [child for child in self._children if isinstance(child, key)]
+        if isinstance(key, int):
+            return self._children[key]
+        else:
+            return [child for child in self._children if isinstance(child, key)]
 
 
 class AstNode:
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 68c3d8a..feeb301 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -2,6 +2,7 @@
 templates. """
 
 from .attributes import BaseAttribute, BaseTypedAttribute
+from .expression import Expr
 from .gobject_object import Object, ObjectContent
 from .gobject_property import Property
 from .gobject_signal import Signal
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
new file mode 100644
index 0000000..a684b39
--- /dev/null
+++ b/blueprintcompiler/language/expression.py
@@ -0,0 +1,63 @@
+# expressions.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 *
+
+
+expr = Pratt()
+
+
+class Expr(AstNode):
+    grammar = expr
+
+    def emit_xml(self, xml: XmlEmitter):
+        self.children[-1].emit_xml(xml)
+
+
+class InfixExpr(AstNode):
+    @property
+    def lhs(self):
+        children = list(self.parent_by_type(Expr).children)
+        return children[children.index(self) - 1]
+
+
+class IdentExpr(AstNode):
+    grammar = UseIdent("ident")
+
+    def emit_xml(self, xml: XmlEmitter):
+        xml.start_tag("constant")
+        xml.put_text(self.tokens["ident"])
+        xml.end_tag()
+
+
+class LookupOp(InfixExpr):
+    grammar = [".", UseIdent("property")]
+
+    def emit_xml(self, xml: XmlEmitter):
+        xml.start_tag("lookup", name=self.tokens["property"])
+        self.lhs.emit_xml(xml)
+        xml.end_tag()
+
+
+expr.children = [
+    Prefix(IdentExpr),
+    Prefix(["(", Expr, ")"]),
+    Infix(10, LookupOp),
+]
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index c623b9a..f0a2ef4 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -18,6 +18,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
+from .expression import Expr
 from .gobject_object import Object
 from .gtkbuilder_template import Template
 from .values import Value, TranslatedStringValue
@@ -26,19 +27,27 @@ from .common import *
 
 class Property(AstNode):
     grammar = AnyOf(
-        Statement(
+        [
             UseIdent("name"),
             ":",
             Keyword("bind"),
-            UseIdent("bind_source").expected("the ID of a source object to bind from"),
+            UseIdent("bind_source"),
             ".",
-            UseIdent("bind_property").expected("a property name to bind from"),
+            UseIdent("bind_property"),
             ZeroOrMore(AnyOf(
                 ["no-sync-create", UseLiteral("no_sync_create", True)],
                 ["inverted", UseLiteral("inverted", True)],
                 ["bidirectional", UseLiteral("bidirectional", True)],
                 Match("sync-create").warn("sync-create is deprecated in favor of no-sync-create"),
             )),
+            ";",
+        ],
+        Statement(
+            UseIdent("name"),
+            UseLiteral("binding", True),
+            ":",
+            "bind",
+            Expr,
         ),
         Statement(
             UseIdent("name"),
@@ -154,7 +163,13 @@ class Property(AstNode):
             self.children[Object][0].emit_xml(xml)
             xml.end_tag()
         elif value is None:
-            xml.put_self_closing("property", **props)
+            if self.tokens["binding"]:
+                xml.start_tag("binding", **props)
+                for x in self.children:
+                    x.emit_xml(xml)
+                xml.end_tag()
+            else:
+                xml.put_self_closing("property", **props);
         else:
             xml.start_tag("property", **props)
             value.emit_xml(xml)
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index e56a220..bc36415 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -98,6 +98,7 @@ class ParseContext:
     def __init__(self, tokens, index=0):
         self.tokens = list(tokens)
 
+        self.binding_power = 0
         self.index = index
         self.start = index
         self.group = None
@@ -118,6 +119,7 @@ class ParseContext:
         ctx = ParseContext(self.tokens, self.index)
         ctx.errors = self.errors
         ctx.warnings = self.warnings
+        ctx.binding_power = self.binding_power
         return ctx
 
     def apply_child(self, other):
@@ -544,6 +546,64 @@ class Keyword(ParseNode):
         return str(token) == self.kw
 
 
+class Prefix(ParseNode):
+    def __init__(self, child):
+        self.child = to_parse_node(child)
+
+    def _parse(self, ctx: ParseContext):
+        return self.child.parse(ctx).succeeded()
+
+
+class Infix(ParseNode):
+    def __init__(self, binding_power: int, child):
+        self.binding_power = binding_power
+        self.child = to_parse_node(child)
+
+    def _parse(self, ctx: ParseContext):
+        ctx.binding_power = self.binding_power
+        return self.child.parse(ctx).succeeded()
+
+    def __lt__(self, other):
+        return self.binding_power < other.binding_power
+    def __eq__(self, other):
+        return self.binding_power == other.binding_power
+
+
+class Pratt(ParseNode):
+    """ Basic Pratt parser implementation. """
+
+    def __init__(self, *children):
+        self.children = children
+
+    @property
+    def children(self):
+        return self._children
+    @children.setter
+    def children(self, children):
+        self._children = children
+        self.prefixes = [child for child in children if isinstance(child, Prefix)]
+        self.infixes = sorted([child for child in children if isinstance(child, Infix)], reverse=True)
+
+    def _parse(self, ctx: ParseContext) -> bool:
+        for prefix in self.prefixes:
+            if prefix.parse(ctx).succeeded():
+                break
+        else:
+            # none of the prefixes could be parsed
+            return False
+
+        while True:
+            succeeded = False
+            for infix in self.infixes:
+                if infix.binding_power <= ctx.binding_power:
+                    break
+                if infix.parse(ctx).succeeded():
+                    succeeded = True
+                    break
+            if not succeeded:
+                return True
+
+
 def to_parse_node(value) -> ParseNode:
     if isinstance(value, str):
         return Match(value)
diff --git a/tests/samples/expr_lookup.blp b/tests/samples/expr_lookup.blp
new file mode 100644
index 0000000..d172f7e
--- /dev/null
+++ b/tests/samples/expr_lookup.blp
@@ -0,0 +1,9 @@
+using Gtk 4.0;
+
+Overlay {
+  Label label {}
+}
+
+Label {
+  label: bind (label.parent).child.label;
+}
diff --git a/tests/samples/expr_lookup.ui b/tests/samples/expr_lookup.ui
new file mode 100644
index 0000000..2137e9b
--- /dev/null
+++ b/tests/samples/expr_lookup.ui
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkOverlay">
+    <child>
+      <object class="GtkLabel" id="label"></object>
+    </child>
+  </object>
+  <object class="GtkLabel">
+    <binding name="label">
+      <lookup name="label">
+        <lookup name="child">
+          <lookup name="parent">
+            <constant>label</constant>
+          </lookup>
+        </lookup>
+      </lookup>
+    </binding>
+  </object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 51af836..84cdb4f 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -136,6 +136,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("combo_box_text")
         self.assert_sample("comments")
         self.assert_sample("enum")
+        self.assert_sample("expr_lookup")
         self.assert_sample("file_filter")
         self.assert_sample("flags")
         self.assert_sample("id_prop")

From 75475d1a457dce5fc8d66a2156e4489fe4204420 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 5 May 2022 13:55:36 -0500
Subject: [PATCH 006/290] tokenizer: Fix number parsing (again)

---
 blueprintcompiler/tokenizer.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index be59e2e..2e7fa1b 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -40,9 +40,9 @@ _tokens = [
     (TokenType.IDENT,           r"[A-Za-z_][\d\w\-_]*"),
     (TokenType.QUOTED,          r'"(\\"|[^"\n])*"'),
     (TokenType.QUOTED,          r"'(\\'|[^'\n])*'"),
-    (TokenType.NUMBER,          r"0x[A-Fa-f0-9_]+"),
-    (TokenType.NUMBER,          r"[-+]?[\d_]*\d(\.[\d_]*\d)?"),
-    (TokenType.NUMBER,          r"[-+]?\.[\d_]*\d"),
+    (TokenType.NUMBER,          r"0x[A-Za-z0-9_]+"),
+    (TokenType.NUMBER,          r"[-+]?[\d_]+(\.[\d_]+)?"),
+    (TokenType.NUMBER,          r"[-+]?\.[\d_]+"),
     (TokenType.WHITESPACE,      r"\s+"),
     (TokenType.COMMENT,         r"\/\*[\s\S]*?\*\/"),
     (TokenType.COMMENT,         r"\/\/[^\n]*"),
@@ -67,10 +67,13 @@ class Token:
             return None
 
         string = str(self).replace("_", "")
-        if string.startswith("0x"):
-            return int(string, 16)
-        else:
-            return float(string.replace("_", ""))
+        try:
+            if string.startswith("0x"):
+                return int(string, 16)
+            else:
+                return float(string.replace("_", ""))
+        except:
+            raise CompileError(f"{str(self)} is not a valid number literal", self.start, self.end)
 
 
 def _tokenize(ui_ml: str):

From e78fae4f120503d08e513190048c10d678272a7a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 11 Jun 2022 00:22:19 -0500
Subject: [PATCH 007/290] build: Set the module path in the build

Instead of trying to find the module by traversing from the executable,
have meson hardcode the path. I *think* this is a little less fragile.
---
 blueprint-compiler.py | 19 ++++++++++---------
 meson.build           | 25 ++++++++++++++++---------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/blueprint-compiler.py b/blueprint-compiler.py
index a3eb0e9..aa1dc8f 100755
--- a/blueprint-compiler.py
+++ b/blueprint-compiler.py
@@ -21,18 +21,19 @@
 
 import os, sys
 
-# Try to find the python module, assuming the current file is installed to (prefix)/bin
-dirname = os.path.join(os.path.dirname(os.path.dirname(__file__)), "share", "blueprint-compiler")
-if os.path.isdir(os.path.join(dirname, "blueprintcompiler")):
-    sys.path.insert(0, dirname)
-
-# Get the configured (or, if running from source, not configured) version number
+# These variables should be set by meson. If they aren't, we're running
+# uninstalled, and we might have to guess some values.
 version = "@VERSION@"
+module_path = "@MODULE_PATH@"
+libdir = "@LIBDIR@"
 
-def literal(key):
-    return "@" + key + "@"
+if version == "\u0040VERSION@":
+    version = "uninstalled"
+else:
+    # If Meson set the configuration values, insert the module path it set
+    sys.path.insert(0, module_path)
 
 from blueprintcompiler import main
 
 if __name__ == "__main__":
-    main.main("uninstalled" if version == literal("VERSION") else version)
+    main.main(version)
diff --git a/meson.build b/meson.build
index bd6fba2..540c0ec 100644
--- a/meson.build
+++ b/meson.build
@@ -17,22 +17,29 @@ configure_file(
   install_dir: join_paths(datadir, 'pkgconfig'),
 )
 
+config = configuration_data({
+  'VERSION': meson.project_version(),
+  'LIBDIR': get_option('prefix') / get_option('libdir'),
+})
+
+if meson.is_subproject()
+  config.set('MODULE_PATH', meson.current_source_dir())
+else
+  config.set('MODULE_PATH', py.get_install_dir())
+endif
+
 blueprint_compiler = configure_file(
   input: 'blueprint-compiler.py',
   output: 'blueprint-compiler',
-  configuration: {
-    'VERSION': meson.project_version(),
-  },
+  configuration: config,
   install: not meson.is_subproject(),
   install_dir: get_option('bindir'),
 )
 
-# Don't use the output configure_file here--that file is in the build directory
-# and won't be able to find the python modules in the source directory.
-meson.override_find_program('blueprint-compiler', find_program('blueprint-compiler.py'))
-
-if not meson.is_subproject()
-  install_subdir('blueprintcompiler', install_dir: datadir / 'blueprint-compiler')
+if meson.is_subproject()
+  meson.override_find_program('blueprint-compiler', blueprint_compiler)
+else
+  install_subdir('blueprintcompiler', install_dir: py.get_install_dir())
 endif
 
 subdir('tests')

From 06f54c8ff8d5f7c78c1d21bcbc59fdd87ce14910 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 5 Mar 2022 17:54:27 -0600
Subject: [PATCH 008/290] Use typelib instead of XML

For normal compilation, use .typelib files rather than .gir XML files.
This is much faster.

Rather than using libgirepository, which would try to actually load the
libraries, we use a custom parser.

The language server will still read XML because it needs to access
documentation, which is not in the typelib, but that's generally fine
because it's a long lived process and only has to do that once.
---
 .gitlab-ci.yml                        |   2 +-
 blueprint-compiler.py                 |   3 +-
 blueprintcompiler/decompiler.py       |  25 +-
 blueprintcompiler/gir.py              | 436 ++++++++++++++++++--------
 blueprintcompiler/language/imports.py |  10 +-
 blueprintcompiler/language/values.py  |   4 +-
 blueprintcompiler/main.py             |   7 +-
 blueprintcompiler/typelib.py          | 292 +++++++++++++++++
 blueprintcompiler/xml_reader.py       |  32 +-
 tests/fuzz.py                         |   6 +-
 10 files changed, 647 insertions(+), 170 deletions(-)
 create mode 100644 blueprintcompiler/typelib.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0820f5a..bd40630 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ build:
     - coverage report
     - coverage html
     - coverage xml
-    - meson _build -Ddocs=true
+    - meson _build -Ddocs=true --prefix=/usr
     - ninja -C _build
     - ninja -C _build test
     - ninja -C _build install
diff --git a/blueprint-compiler.py b/blueprint-compiler.py
index aa1dc8f..f6a542e 100755
--- a/blueprint-compiler.py
+++ b/blueprint-compiler.py
@@ -29,6 +29,7 @@ libdir = "@LIBDIR@"
 
 if version == "\u0040VERSION@":
     version = "uninstalled"
+    libdir = None
 else:
     # If Meson set the configuration values, insert the module path it set
     sys.path.insert(0, module_path)
@@ -36,4 +37,4 @@ else:
 from blueprintcompiler import main
 
 if __name__ == "__main__":
-    main.main(version)
+    main.main(version, libdir)
diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index a7363e5..cd66386 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -122,8 +122,13 @@ class DecompileCtx:
                 self._blocks_need_end[-1] = _CLOSING[line[-1]]
             self._indent += 1
 
-
     def print_attribute(self, name, value, type):
+        def get_enum_name(value):
+            for member in type.members.values():
+                if member.nick == value or member.c_ident == value:
+                    return member.name
+            return value.replace('-', '_')
+
         if type is None:
             self.print(f"{name}: \"{escape_quote(value)}\";")
         elif type.assignable_to(FloatType()):
@@ -141,16 +146,11 @@ class DecompileCtx:
             self.print(f"{name}: \"{escape_quote(value)}\";")
         elif type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("GObject.Object")):
             self.print(f"{name}: {value};")
-        elif isinstance(type, Enumeration):
-            for member in type.members.values():
-                if member.nick == value or member.c_ident == value:
-                    self.print(f"{name}: {member.name};")
-                    break
-            else:
-                self.print(f"{name}: {value.replace('-', '_')};")
         elif isinstance(type, Bitfield):
-            flags = re.sub(r"\s*\|\s*", " | ", value).replace("-", "_")
-            self.print(f"{name}: {flags};")
+            flags = [get_enum_name(flag) for flag in value.split("|")]
+            self.print(f"{name}: {' | '.join(flags)};")
+        elif isinstance(type, Enumeration):
+            self.print(f"{name}: {get_enum_name(value)};")
         else:
             self.print(f"{name}: \"{escape_quote(value)}\";")
 
@@ -171,9 +171,8 @@ def _decompile_element(ctx: DecompileCtx, gir, xml):
         ctx.start_block()
         gir = decompiler(ctx, gir, **args)
 
-        for child_type in xml.children.values():
-            for child in child_type:
-                _decompile_element(ctx, gir, child)
+        for child in xml.children:
+            _decompile_element(ctx, gir, child)
 
         ctx.end_block()
 
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 6234077..1085222 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -22,39 +22,90 @@ import typing as T
 import os, sys
 
 from .errors import CompileError, CompilerBugError
-from . import xml_reader
+from . import typelib, xml_reader
 
-
-extra_search_paths: T.List[str] = []
 _namespace_cache = {}
-
-_search_paths = []
-xdg_data_home = os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share"))
-_search_paths.append(os.path.join(xdg_data_home, "gir-1.0"))
-xdg_data_dirs = os.environ.get("XDG_DATA_DIRS", "/usr/share:/usr/local/share").split(":")
-_search_paths += [os.path.join(dir, "gir-1.0") for dir in xdg_data_dirs]
+_xml_cache = {}
 
 
 def get_namespace(namespace, version):
-    filename = f"{namespace}-{version}.gir"
+    from .main import LIBDIR, VERSION
+    search_paths = []
+    if LIBDIR is not None:
+        search_paths.append(os.path.join(LIBDIR, "girepository-1.0"))
+
+    # This is a fragile hack to make blueprint-compiler work uninstalled on
+    # most systems.
+    if VERSION == "uninstalled":
+        search_paths += [
+            "/usr/lib/girepository-1.0",
+            "/usr/local/lib/girepository-1.0",
+            "/app/lib/girepository-1.0",
+            "/usr/lib64/girepository-1.0",
+            "/usr/local/lib64/girepository-1.0",
+            "/app/lib64/girepository-1.0",
+        ]
+
+    if typelib_path := os.environ.get("GI_TYPELIB_PATH"):
+        search_paths.append(typelib_path)
+
+    filename = f"{namespace}-{version}.typelib"
 
     if filename not in _namespace_cache:
-        for search_path in _search_paths:
+        for search_path in search_paths:
             path = os.path.join(search_path, filename)
 
             if os.path.exists(path) and os.path.isfile(path):
-                xml = xml_reader.parse(path, xml_reader.PARSE_GIR)
-                repository = Repository(xml)
+                tl = typelib.load_typelib(path)
+                repository = Repository(tl)
 
-                _namespace_cache[filename] = repository.namespaces.get(namespace)
+                _namespace_cache[filename] = repository.namespace
                 break
 
         if filename not in _namespace_cache:
-            raise CompileError(f"Namespace {namespace}-{version} could not be found")
+            raise CompileError(
+                f"Namespace {namespace}-{version} could not be found",
+                hints=["search path: " + os.pathsep.join(search_paths)],
+            )
 
     return _namespace_cache[filename]
 
 
+def get_xml(namespace, version):
+    from .main import VERSION
+    from xml.etree import ElementTree
+    search_paths = []
+
+    # Same fragile hack as before
+    if VERSION == "uninstalled":
+        search_paths += [
+            "/usr/share/gir-1.0",
+            "/usr/local/share/gir-1.0",
+            "/app/share/gir-1.0",
+        ]
+
+    if data_paths := os.environ.get("XDG_DATA_DIRS"):
+        search_paths += [os.path.join(path, "gir-1.0") for path in data_paths.split(os.pathsep)]
+
+    filename = f"{namespace}-{version}.gir"
+
+    if filename not in _xml_cache:
+        for search_path in search_paths:
+            path = os.path.join(search_path, filename)
+
+            if os.path.exists(path) and os.path.isfile(path):
+                _xml_cache[filename] = xml_reader.parse(path)
+                break
+
+        if filename not in _xml_cache:
+            raise CompileError(
+                f"GObject introspection file '{namespace}-{version}.gir' could not be found",
+                hints=["search path: " + os.pathsep.join(search_paths)],
+            )
+
+    return _xml_cache[filename]
+
+
 class GirType:
     @property
     def doc(self):
@@ -115,9 +166,9 @@ _BASIC_TYPES = {
 }
 
 class GirNode:
-    def __init__(self, container, xml):
+    def __init__(self, container, tl):
         self.container = container
-        self.xml = xml
+        self.tl = tl
 
     def get_containing(self, container_type):
         if self.container is None:
@@ -127,9 +178,15 @@ class GirNode:
         else:
             return self.container.get_containing(container_type)
 
+    @cached_property
+    def xml(self):
+        for el in self.container.xml.children:
+            if el.attrs.get("name") == self.name:
+                return el
+
     @cached_property
     def glib_type_name(self):
-        return self.xml["glib:type-name"]
+        return self.tl.OBJ_GTYPE_NAME
 
     @cached_property
     def full_name(self):
@@ -140,11 +197,11 @@ class GirNode:
 
     @cached_property
     def name(self) -> str:
-        return self.xml["name"]
+        return self.tl.BLOB_NAME
 
     @cached_property
     def cname(self) -> str:
-        return self.xml["c:type"]
+        return self.tl.OBJ_GTYPE_NAME
 
     @cached_property
     def available_in(self) -> str:
@@ -169,7 +226,7 @@ class GirNode:
 
     @property
     def type_name(self):
-        return self.xml.get_elements('type')[0]['name']
+        return self.type.name
 
     @property
     def type(self):
@@ -177,76 +234,164 @@ class GirNode:
 
 
 class Property(GirNode):
-    def __init__(self, klass, xml: xml_reader.Element):
-        super().__init__(klass, xml)
+    def __init__(self, klass, tl: typelib.Typelib):
+        super().__init__(klass, tl)
 
-    @property
+    @cached_property
+    def name(self):
+        return self.tl.PROP_NAME
+
+    @cached_property
+    def type(self):
+        return self.get_containing(Repository)._resolve_type_id(self.tl.PROP_TYPE)
+
+    @cached_property
     def signature(self):
         return f"{self.type_name} {self.container.name}.{self.name}"
 
     @property
     def writable(self):
-        return self.xml["writable"] == "1"
+        return self.tl.PROP_WRITABLE == 1
 
     @property
     def construct_only(self):
-        return self.xml["construct-only"] == "1"
+        return self.tl.PROP_CONSTRUCT_ONLY == 1
 
 
 class Parameter(GirNode):
-    def __init__(self, container: GirNode, xml: xml_reader.Element):
-        super().__init__(container, xml)
+    def __init__(self, container: GirNode, tl: typelib.Typelib):
+        super().__init__(container, tl)
 
 
 class Signal(GirNode):
-    def __init__(self, klass, xml: xml_reader.Element):
-        super().__init__(klass, xml)
-        if parameters := xml.get_elements('parameters'):
-            self.params = [Parameter(self, child) for child in parameters[0].get_elements('parameter')]
-        else:
-            self.params = []
+    def __init__(self, klass, tl: typelib.Typelib):
+        super().__init__(klass, tl)
+        # if parameters := xml.get_elements('parameters'):
+        #     self.params = [Parameter(self, child) for child in parameters[0].get_elements('parameter')]
+        # else:
+        #     self.params = []
 
     @property
     def signature(self):
-        args = ", ".join([f"{p.type_name} {p.name}" for p in self.params])
+        # TODO: fix
+        # args = ", ".join([f"{p.type_name} {p.name}" for p in self.params])
+        args = ""
         return f"signal {self.container.name}.{self.name} ({args})"
 
 
 class Interface(GirNode, GirType):
-    def __init__(self, ns, xml: xml_reader.Element):
-        super().__init__(ns, xml)
-        self.properties = {child["name"]: Property(self, child) for child in xml.get_elements("property")}
-        self.signals = {child["name"]: Signal(self, child) for child in xml.get_elements("glib:signal")}
-        self.prerequisites = [child["name"] for child in xml.get_elements("prerequisite")]
+    def __init__(self, ns, tl: typelib.Typelib):
+        super().__init__(ns, tl)
+
+    @cached_property
+    def properties(self):
+        n_prerequisites = self.tl.INTERFACE_N_PREREQUISITES
+        offset = self.tl.header.HEADER_INTERFACE_BLOB_SIZE
+        offset += (n_prerequisites + n_prerequisites % 2) * 2
+        n_properties = self.tl.INTERFACE_N_PROPERTIES
+        property_size = self.tl.header.HEADER_PROPERTY_BLOB_SIZE
+        result = {}
+        for i in range(n_properties):
+            property = Property(self, self.tl[offset + i * property_size])
+            result[property.name] = property
+        return result
+
+    @cached_property
+    def signals(self):
+        n_prerequisites = self.tl.INTERFACE_N_PREREQUISITES
+        offset = self.tl.header.HEADER_INTERFACE_BLOB_SIZE
+        offset += (n_prerequisites + n_prerequisites % 2) * 2
+        offset += self.tl.INTERFACE_N_PROPERTIES * self.tl.header.HEADER_PROPERTY_BLOB_SIZE
+        offset += self.tl.INTERFACE_N_METHODS * self.tl.header.HEADER_FUNCTION_BLOB_SIZE
+        n_signals = self.tl.INTERFACE_N_SIGNALS
+        property_size = self.tl.header.HEADER_SIGNAL_BLOB_SIZE
+        result = {}
+        for i in range(n_signals):
+            signal = Signal(self, self.tl[offset + i * property_size])
+            result[signal.name] = signal
+        return result
+
+    @cached_property
+    def prerequisites(self):
+        n_prerequisites = self.tl.INTERFACE_N_PREREQUISITES
+        result = []
+        for i in range(n_prerequisites):
+            entry = self.tl.INTERFACE_PREREQUISITES[i * 2].AS_DIR_ENTRY
+            result.append(self.get_containing(Repository)._resolve_dir_entry(entry))
+        return result
 
     def assignable_to(self, other) -> bool:
         if self == other:
             return True
         for pre in self.prerequisites:
-            if self.get_containing(Namespace).lookup_type(pre).assignable_to(other):
+            if pre.assignable_to(other):
                 return True
         return False
 
 
 class Class(GirNode, GirType):
-    def __init__(self, ns, xml: xml_reader.Element):
-        super().__init__(ns, xml)
-        self._parent = xml["parent"]
-        self.implements = [impl["name"] for impl in xml.get_elements("implements")]
-        self.own_properties = {child["name"]: Property(self, child) for child in xml.get_elements("property")}
-        self.own_signals = {child["name"]: Signal(self, child) for child in xml.get_elements("glib:signal")}
+    def __init__(self, ns, tl: typelib.Typelib):
+        super().__init__(ns, tl)
 
     @property
     def abstract(self):
-        return self.xml["abstract"] == "1"
+        return self.tl.OBJ_ABSTRACT == 1
 
-    @property
+    @cached_property
+    def implements(self):
+        n_interfaces = self.tl.OBJ_N_INTERFACES
+        result = []
+        for i in range(n_interfaces):
+            entry = self.tl[self.tl.header.HEADER_OBJECT_BLOB_SIZE + i * 2].AS_DIR_ENTRY
+            result.append(self.get_containing(Repository)._resolve_dir_entry(entry))
+        return result
+
+    @cached_property
+    def own_properties(self):
+        n_interfaces = self.tl.OBJ_N_INTERFACES
+        offset = self.tl.header.HEADER_OBJECT_BLOB_SIZE
+        offset += (n_interfaces + n_interfaces % 2) * 2
+        offset += self.tl.OBJ_N_FIELDS * self.tl.header.HEADER_FIELD_BLOB_SIZE
+        offset += self.tl.OBJ_N_FIELD_CALLBACKS * self.tl.header.HEADER_CALLBACK_BLOB_SIZE
+        n_properties = self.tl.OBJ_N_PROPERTIES
+        property_size = self.tl.header.HEADER_PROPERTY_BLOB_SIZE
+        result = {}
+        for i in range(n_properties):
+            property = Property(self, self.tl[offset + i * property_size])
+            result[property.name] = property
+        return result
+
+    @cached_property
+    def own_signals(self):
+        n_interfaces = self.tl.OBJ_N_INTERFACES
+        offset = self.tl.header.HEADER_OBJECT_BLOB_SIZE
+        offset += (n_interfaces + n_interfaces % 2) * 2
+        offset += self.tl.OBJ_N_FIELDS * self.tl.header.HEADER_FIELD_BLOB_SIZE
+        offset += self.tl.OBJ_N_FIELD_CALLBACKS * self.tl.header.HEADER_CALLBACK_BLOB_SIZE
+        offset += self.tl.OBJ_N_PROPERTIES * self.tl.header.HEADER_PROPERTY_BLOB_SIZE
+        offset += self.tl.OBJ_N_METHODS * self.tl.header.HEADER_FUNCTION_BLOB_SIZE
+        n_signals = self.tl.OBJ_N_SIGNALS
+        signal_size = self.tl.header.HEADER_SIGNAL_BLOB_SIZE
+        result = {}
+        for i in range(n_signals):
+            signal = Signal(self, self.tl[offset][i * signal_size])
+            result[signal.name] = signal
+        return result
+
+    @cached_property
+    def parent(self):
+        if entry := self.tl.OBJ_PARENT:
+            return self.get_containing(Repository)._resolve_dir_entry(entry)
+        else:
+            return None
+
+    @cached_property
     def signature(self):
         result = f"class {self.container.name}.{self.name}"
         if self.parent is not None:
             result += f" : {self.parent.container.name}.{self.parent.name}"
         if len(self.implements):
-            result += " implements " + ", ".join(self.implements)
+            result += " implements " + ", ".join([impl.full_name for impl in self.implements])
         return result
 
     @cached_property
@@ -257,13 +402,6 @@ class Class(GirNode, GirType):
     def signals(self):
         return { s.name: s for s in self._enum_signals() }
 
-    @cached_property
-    def parent(self):
-        if self._parent is None:
-            return None
-        return self.get_containing(Namespace).lookup_type(self._parent)
-
-
     def assignable_to(self, other) -> bool:
         if self == other:
             return True
@@ -271,12 +409,11 @@ class Class(GirNode, GirType):
             return True
         else:
             for iface in self.implements:
-                if self.get_containing(Namespace).lookup_type(iface).assignable_to(other):
+                if iface.assignable_to(other):
                     return True
 
             return False
 
-
     def _enum_properties(self):
         yield from self.own_properties.values()
 
@@ -284,7 +421,7 @@ class Class(GirNode, GirType):
             yield from self.parent.properties.values()
 
         for impl in self.implements:
-            yield from self.get_containing(Namespace).lookup_type(impl).properties.values()
+            yield from impl.properties.values()
 
     def _enum_signals(self):
         yield from self.own_signals.values()
@@ -293,25 +430,28 @@ class Class(GirNode, GirType):
             yield from self.parent.signals.values()
 
         for impl in self.implements:
-            yield from self.get_containing(Namespace).lookup_type(impl).signals.values()
+            yield from impl.signals.values()
 
 
 class EnumMember(GirNode):
-    def __init__(self, ns, xml: xml_reader.Element):
-        super().__init__(ns, xml)
-        self._value = xml["value"]
+    def __init__(self, ns, tl: typelib.Typelib):
+        super().__init__(ns, tl)
 
     @property
     def value(self):
-        return self._value
+        return self.tl.VALUE_VALUE
 
-    @property
+    @cached_property
+    def name(self):
+        return self.tl.VALUE_NAME
+
+    @cached_property
     def nick(self):
-        return self.xml["glib:nick"]
+        return self.name.replace("_", "-")
 
     @property
     def c_ident(self):
-        return self.xml["c:identifier"]
+        return self.tl.attr("c:identifier")
 
     @property
     def signature(self):
@@ -319,9 +459,19 @@ class EnumMember(GirNode):
 
 
 class Enumeration(GirNode, GirType):
-    def __init__(self, ns, xml: xml_reader.Element):
-        super().__init__(ns, xml)
-        self.members = { child["name"]: EnumMember(self, child) for child in xml.get_elements("member") }
+    def __init__(self, ns, tl: typelib.Typelib):
+        super().__init__(ns, tl)
+
+    @cached_property
+    def members(self):
+        members = {}
+        n_values = self.tl.ENUM_N_VALUES
+        values = self.tl.ENUM_VALUES
+        value_size = self.tl.header.HEADER_VALUE_BLOB_SIZE
+        for i in range(n_values):
+            member = EnumMember(self, values[i * value_size])
+            members[member.name] = member
+        return members
 
     @property
     def signature(self):
@@ -331,64 +481,68 @@ class Enumeration(GirNode, GirType):
         return type == self
 
 
-class BitfieldMember(GirNode):
-    def __init__(self, ns, xml: xml_reader.Element):
-        super().__init__(ns, xml)
-        self._value = xml["value"]
-
-    @property
-    def value(self):
-        return self._value
-
-    @property
-    def signature(self):
-        return f"bitfield member {self.full_name} = {bin(self.value)}"
-
-
-class Bitfield(GirNode, GirType):
-    def __init__(self, ns, xml: xml_reader.Element):
-        super().__init__(ns, xml)
-        self.members = { child["name"]: EnumMember(self, child) for child in xml.get_elements("member") }
-
-    @property
-    def signature(self):
-        return f"bitfield {self.full_name}"
-
-    def assignable_to(self, type):
-        return type == self
+class Bitfield(Enumeration):
+    def __init__(self, ns, tl: typelib.Typelib):
+        super().__init__(ns, tl)
 
 
 class Namespace(GirNode):
-    def __init__(self, repo, xml: xml_reader.Element):
-        super().__init__(repo, xml)
-        self.classes = { child["name"]: Class(self, child) for child in xml.get_elements("class") }
-        self.interfaces = { child["name"]: Interface(self, child) for child in xml.get_elements("interface") }
-        self.enumerations = { child["name"]: Enumeration(self, child) for child in xml.get_elements("enumeration") }
-        self.bitfields = { child["name"]: Bitfield(self, child) for child in xml.get_elements("bitfield") }
-        self.version = xml["version"]
+    def __init__(self, repo, tl: typelib.Typelib):
+        super().__init__(repo, tl)
+
+        self.entries: T.Dict[str, GirNode] = {}
+
+        n_local_entries = tl.HEADER_N_ENTRIES
+        directory = tl.HEADER_DIRECTORY
+        for i in range(n_local_entries):
+            entry = directory[i * tl.HEADER_ENTRY_BLOB_SIZE]
+            entry_name = entry.DIR_ENTRY_NAME
+            entry_type = entry.DIR_ENTRY_BLOB_TYPE
+            entry_blob = entry.DIR_ENTRY_OFFSET
+
+            if entry_type == typelib.BLOB_TYPE_ENUM:
+                self.entries[entry_name] = Enumeration(self, entry_blob)
+            elif entry_type == typelib.BLOB_TYPE_FLAGS:
+                self.entries[entry_name] = Bitfield(self, entry_blob)
+            elif entry_type == typelib.BLOB_TYPE_OBJECT:
+                self.entries[entry_name] = Class(self, entry_blob)
+            elif entry_type == typelib.BLOB_TYPE_INTERFACE:
+                 self.entries[entry_name] = Interface(self, entry_blob)
+
+    @cached_property
+    def xml(self):
+        return get_xml(self.name, self.version).get_elements("namespace")[0]
+
+    @cached_property
+    def name(self):
+        return self.tl.HEADER_NAMESPACE
+
+    @cached_property
+    def version(self):
+        return self.tl.HEADER_NSVERSION
 
     @property
     def signature(self):
         return f"namespace {self.name} {self.version}"
 
+    @cached_property
+    def classes(self):
+        return { name: entry for name, entry in self.entries.items() if isinstance(entry, Class) }
+
+    @cached_property
+    def interfaces(self):
+        return { name: entry for name, entry in self.entries.items() if isinstance(entry, Interface) }
 
     def get_type(self, name):
         """ Gets a type (class, interface, enum, etc.) from this namespace. """
-        return (
-            self.classes.get(name)
-            or self.interfaces.get(name)
-            or self.enumerations.get(name)
-            or self.bitfields.get(name)
-        )
-
+        return self.entries.get(name)
 
     def get_type_by_cname(self, cname: str):
         """ Gets a type from this namespace by its C name. """
-        for item in [*self.classes.values(), *self.interfaces.values(), *self.enumerations.values()]:
-            if item.cname == cname:
+        for item in self.entries.values():
+            if hasattr(item, "cname") and item.cname == cname:
                 return item
 
-
     def lookup_type(self, type_name: str):
         """ Looks up a type in the scope of this namespace (including in the
         namespace's dependencies). """
@@ -403,25 +557,26 @@ class Namespace(GirNode):
 
 
 class Repository(GirNode):
-    def __init__(self, xml: xml_reader.Element):
-        super().__init__(None, xml)
-        self.namespaces = { child["name"]: Namespace(self, child) for child in xml.get_elements("namespace") }
+    def __init__(self, tl: typelib.Typelib):
+        super().__init__(None, tl)
 
-        try:
-            self.includes = { include["name"]: get_namespace(include["name"], include["version"]) for include in xml.get_elements("include") }
-        except:
-            raise CompilerBugError(f"Failed to load dependencies.")
+        self.namespace = Namespace(self, tl)
 
+        if dependencies := tl[0x24].string:
+            deps = [tuple(dep.split("-", 1)) for dep in dependencies.split("|")]
+            try:
+                self.includes = { name: get_namespace(name, version) for name, version in deps }
+            except:
+                raise CompilerBugError(f"Failed to load dependencies.")
+        else:
+            self.includes = {}
 
     def get_type(self, name: str, ns: str) -> T.Optional[GirNode]:
-        if namespace := self.namespaces.get(ns):
-            return namespace.get_type(name)
-        else:
-            return self.lookup_namespace(ns).get_type(name)
+        return self.lookup_namespace(ns).get_type(name)
 
 
     def get_type_by_cname(self, name: str) -> T.Optional[GirNode]:
-        for ns in self.namespaces.values():
+        for ns in [self.namespace, *self.includes.values()]:
             if type := ns.get_type_by_cname(name):
                 return type
         return None
@@ -429,13 +584,40 @@ class Repository(GirNode):
 
     def lookup_namespace(self, ns: str):
         """ Finds a namespace among this namespace's dependencies. """
-        if namespace := self.namespaces.get(ns):
-            return namespace
+        if ns == self.namespace.name:
+            return self.namespace
         else:
             for include in self.includes.values():
                 if namespace := include.get_containing(Repository).lookup_namespace(ns):
                     return namespace
 
+    def _resolve_dir_entry(self, dir_entry: typelib.Typelib):
+        if dir_entry.DIR_ENTRY_LOCAL:
+            return self.namespace.get_type(dir_entry.DIR_ENTRY_NAME)
+        else:
+            ns = dir_entry.DIR_ENTRY_NAMESPACE
+            return self.lookup_namespace(ns).get_type(dir_entry.DIR_ENTRY_NAME)
+
+    def _resolve_type_id(self, type_id: int):
+        if type_id & 0xFFFFFF == 0:
+            type_id = (type_id >> 27) & 0x1F
+            # simple type
+            if type_id == typelib.TYPE_BOOLEAN:
+                return BoolType()
+            elif type_id in [typelib.TYPE_FLOAT, typelib.TYPE_DOUBLE]:
+                return FloatType()
+            elif type_id in [typelib.TYPE_INT8, typelib.TYPE_INT16, typelib.TYPE_INT32, typelib.TYPE_INT64]:
+                return IntType()
+            elif type_id in [typelib.TYPE_UINT8, typelib.TYPE_UINT16, typelib.TYPE_UINT32, typelib.TYPE_UINT64]:
+                return UIntType()
+            elif type_id == typelib.TYPE_UTF8:
+                return StringType()
+            else:
+                raise CompilerBugError("Unknown type ID", type_id)
+        else:
+            return self._resolve_dir_entry(self.tl.header[type_id].INTERFACE_TYPE_INTERFACE)
+
+
 
 class GirContext:
     def __init__(self):
diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index cdef888..682f8cd 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -41,8 +41,14 @@ class GtkDirective(AstNode):
 
         try:
             gir.get_namespace("Gtk", self.tokens["version"])
-        except:
-            raise CompileError("Could not find GTK 4 introspection files. Is gobject-introspection installed?", fatal=True)
+        except CompileError as e:
+            raise CompileError(
+                "Could not find GTK 4 introspection files. Is gobject-introspection installed?",
+                fatal=True,
+                # preserve the hints from the original error, because it contains
+                # useful debugging information
+                hints=e.hints,
+            )
 
 
     @property
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 29e5d98..f39db53 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -153,7 +153,7 @@ class IdentValue(Value):
     def validate_for_type(self):
         type = self.parent.value_type
 
-        if isinstance(type, gir.Enumeration) or isinstance(type, gir.Bitfield):
+        if isinstance(type, gir.Enumeration):
             if self.tokens["value"] not in type.members:
                 raise CompileError(
                     f"{self.tokens['value']} is not a member of {type.full_name}",
@@ -183,7 +183,7 @@ class IdentValue(Value):
     @docs()
     def docs(self):
         type = self.parent.value_type
-        if isinstance(type, gir.Enumeration) or isinstance(type, gir.Bitfield):
+        if isinstance(type, gir.Enumeration):
             if member := type.members.get(self.tokens["value"]):
                 return member.doc
             else:
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 1a5e92a..d528e7e 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -28,6 +28,7 @@ from .utils import Colors
 from .xml_emitter import XmlEmitter
 
 VERSION = "uninstalled"
+LIBDIR = None
 
 class BlueprintApp:
     def main(self):
@@ -144,7 +145,7 @@ class BlueprintApp:
         return ast.generate(), warnings
 
 
-def main(version):
-    global VERSION
-    VERSION = version
+def main(version, libdir):
+    global VERSION, LIBDIR
+    VERSION, LIBDIR = version, libdir
     BlueprintApp().main()
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
new file mode 100644
index 0000000..be1f366
--- /dev/null
+++ b/blueprintcompiler/typelib.py
@@ -0,0 +1,292 @@
+# typelib.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
+
+
+import typing as T
+import math
+from ctypes import *
+import mmap, os
+
+from .errors import CompilerBugError
+
+
+BLOB_TYPE_ENUM = 5
+BLOB_TYPE_FLAGS = 6
+BLOB_TYPE_OBJECT = 7
+BLOB_TYPE_INTERFACE = 8
+
+TYPE_VOID = 0
+TYPE_BOOLEAN = 1
+TYPE_INT8 = 2
+TYPE_UINT8 = 3
+TYPE_INT16 = 4
+TYPE_UINT16 = 5
+TYPE_INT32 = 6
+TYPE_UINT32 = 7
+TYPE_INT64 = 8
+TYPE_UINT64 = 9
+TYPE_FLOAT = 10
+TYPE_DOUBLE = 11
+TYPE_GTYPE = 12
+TYPE_UTF8 = 13
+TYPE_FILENAME = 14
+TYPE_ARRAY = 15
+TYPE_INTERFACE = 16
+TYPE_GLIST = 17
+TYPE_GSLIST = 18
+TYPE_GHASH = 19
+TYPE_ERROR = 20
+TYPE_UNICHAR = 21
+
+
+class Field:
+    def __init__(self, offset, type, shift=0, mask=None):
+        self._offset = offset
+        self._type = type
+        self._shift = shift
+        self._mask = (1 << mask) - 1 if mask else None
+        self._name = f"{offset}__{type}__{shift}__{mask}"
+
+    def __get__(self, typelib, _objtype=None):
+        if typelib is None:
+            return self
+
+        def shift_mask(n):
+            n = n >> self._shift
+            if self._mask:
+                n = n & self._mask
+            return n
+
+        tl = typelib[self._offset]
+        if self._type == "u8":
+            return shift_mask(tl.u8)
+        elif self._type == "u16":
+            return shift_mask(tl.u16)
+        elif self._type == "u32":
+            return shift_mask(tl.u32)
+        elif self._type == "i8":
+            return shift_mask(tl.i8)
+        elif self._type == "i16":
+            return shift_mask(tl.i16)
+        elif self._type == "i32":
+            return shift_mask(tl.i32)
+        elif self._type == "pointer":
+            return tl.header[tl.u32]
+        elif self._type == "offset":
+            return tl
+        elif self._type == "string":
+            return tl.string
+        elif self._type == "dir_entry":
+            return tl.header.dir_entry(tl.u16)
+        else:
+            raise CompilerBugError(self._type)
+
+
+class Typelib:
+    AS_DIR_ENTRY = Field(0, "dir_entry")
+
+    HEADER_N_ENTRIES = Field(0x14, "u16")
+    HEADER_N_LOCAL_ENTRIES = Field(0x16, "u16")
+    HEADER_DIRECTORY = Field(0x18, "pointer")
+    HEADER_N_ATTRIBUTES = Field(0x1C, "u32")
+    HEADER_ATTRIBUTES = Field(0x20, "pointer")
+
+    HEADER_DEPENDENCIES = Field(0x24, "pointer")
+
+    HEADER_NAMESPACE = Field(0x2C, "string")
+    HEADER_NSVERSION = Field(0x30, "string")
+
+    HEADER_ENTRY_BLOB_SIZE = Field(0x3C, "u16")
+    HEADER_FUNCTION_BLOB_SIZE = Field(0x3E, "u16")
+    HEADER_CALLBACK_BLOB_SIZE = Field(0x40, "u16")
+    HEADER_SIGNAL_BLOB_SIZE = Field(0x42, "u16")
+    HEADER_PROPERTY_BLOB_SIZE = Field(0x48, "u16")
+    HEADER_FIELD_BLOB_SIZE = Field(0x4A, "u16")
+    HEADER_VALUE_BLOB_SIZE = Field(0x4C, "u16")
+    HEADER_ATTRIBUTE_BLOB_SIZE = Field(0x4E, "u16")
+    HEADER_ENUM_BLOB_SIZE = Field(0x56, "u16")
+    HEADER_OBJECT_BLOB_SIZE = Field(0x5A, "u16")
+    HEADER_INTERFACE_BLOB_SIZE = Field(0x5C, "u16")
+
+    DIR_ENTRY_BLOB_TYPE = Field(0x0, "u16")
+    DIR_ENTRY_LOCAL = Field(0x2, "u16", 0, 1)
+    DIR_ENTRY_NAME = Field(0x4, "string")
+    DIR_ENTRY_OFFSET = Field(0x8, "pointer")
+    DIR_ENTRY_NAMESPACE = Field(0x8, "string")
+
+    ATTR_OFFSET = Field(0x0, "u32")
+    ATTR_NAME = Field(0x0, "string")
+    ATTR_VALUE = Field(0x0, "string")
+
+    INTERFACE_TYPE_INTERFACE = Field(0x2, "dir_entry")
+
+    BLOB_NAME = Field(0x4, "string")
+
+    ENUM_GTYPE_NAME = Field(0x8, "string")
+    ENUM_N_VALUES = Field(0x10, "u16")
+    ENUM_N_METHODS = Field(0x12, "u16")
+    ENUM_VALUES = Field(0x18, "offset")
+
+    INTERFACE_GTYPE_NAME = Field(0x8, "string")
+    INTERFACE_N_PREREQUISITES = Field(0x12, "u16")
+    INTERFACE_N_PROPERTIES = Field(0x14, "u16")
+    INTERFACE_N_METHODS = Field(0x16, "u16")
+    INTERFACE_N_SIGNALS = Field(0x18, "u16")
+    INTERFACE_N_VFUNCS = Field(0x1A, "u16")
+    INTERFACE_N_CONSTANTS = Field(0x1C, "u16")
+    INTERFACE_PREREQUISITES = Field(0x28, "offset")
+
+    OBJ_DEPRECATED = Field(0x02, "u16", 0, 1)
+    OBJ_ABSTRACT = Field(0x02, "u16", 1, 1)
+    OBJ_FUNDAMENTAL = Field(0x02, "u16", 2, 1)
+    OBJ_FINAL = Field(0x02, "u16", 3, 1)
+    OBJ_GTYPE_NAME = Field(0x08, "string")
+    OBJ_PARENT = Field(0x10, "dir_entry")
+    OBJ_GTYPE_STRUCT = Field(0x14, "string")
+    OBJ_N_INTERFACES = Field(0x14, "u16")
+    OBJ_N_FIELDS = Field(0x16, "u16")
+    OBJ_N_PROPERTIES = Field(0x18, "u16")
+    OBJ_N_METHODS = Field(0x1A, "u16")
+    OBJ_N_SIGNALS = Field(0x1C, "u16")
+    OBJ_N_VFUNCS = Field(0x1E, "u16")
+    OBJ_N_CONSTANTS = Field(0x20, "u16")
+    OBJ_N_FIELD_CALLBACKS = Field(0x22, "u16")
+
+    PROP_NAME = Field(0x0, "string")
+    PROP_DEPRECATED = Field(0x4, "u32", 0, 1)
+    PROP_READABLE = Field(0x4, "u32", 1, 1)
+    PROP_WRITABLE = Field(0x4, "u32", 2, 1)
+    PROP_CONSTRUCT = Field(0x4, "u32", 3, 1)
+    PROP_CONSTRUCT_ONLY = Field(0x4, "u32", 4, 1)
+    PROP_TYPE = Field(0xC, "u32")
+
+    VALUE_NAME = Field(0x4, "string")
+    VALUE_VALUE = Field(0x8, "i32")
+
+    def __init__(self, typelib_file, offset):
+        self._typelib_file = typelib_file
+        self._offset = offset
+
+    def __getitem__(self, index):
+        return Typelib(self._typelib_file, self._offset + index)
+
+    def attr(self, name):
+        return self.header.attr(self._offset, name)
+
+    @property
+    def header(self):
+        return TypelibHeader(self._typelib_file)
+
+    @property
+    def u8(self):
+        """Gets the 8-bit unsigned int at this location."""
+        return self._int(1, False)
+
+    @property
+    def u16(self):
+        """Gets the 16-bit unsigned int at this location."""
+        return self._int(2, False)
+
+    @property
+    def u32(self):
+        """Gets the 32-bit unsigned int at this location."""
+        return self._int(4, False)
+
+    @property
+    def i8(self):
+        """Gets the 8-bit unsigned int at this location."""
+        return self._int(1, True)
+
+    @property
+    def i16(self):
+        """Gets the 16-bit unsigned int at this location."""
+        return self._int(2, True)
+
+    @property
+    def i32(self):
+        """Gets the 32-bit unsigned int at this location."""
+        return self._int(4, True)
+
+    @property
+    def string(self) -> T.Optional[str]:
+        """Interprets the 32-bit unsigned int at this location as a pointer
+        within the typelib file, and returns the null-terminated string at that
+        pointer."""
+
+        loc = self.u32
+        if loc == 0:
+            return None
+
+        end = loc
+        while self._typelib_file[end] != 0:
+            end += 1
+        return self._typelib_file[loc:end].decode("utf-8")
+
+    def _int(self, size, signed):
+        return int.from_bytes(self._typelib_file[self._offset:self._offset + size], 'little')
+
+
+class TypelibHeader(Typelib):
+    def __init__(self, typelib_file):
+        super().__init__(typelib_file, 0)
+
+    def dir_entry(self, index):
+        if index == 0:
+            return None
+        else:
+            return self.HEADER_DIRECTORY[(index - 1) * self.HEADER_ENTRY_BLOB_SIZE]
+
+    def attr(self, offset, name):
+        lower = 0
+        upper = self.HEADER_N_ATTRIBUTES
+        attr_size = self.HEADER_ATTRIBUTE_BLOB_SIZE
+        attrs = self.HEADER_ATTRIBUTES
+        mid = 0
+
+        while lower <= upper:
+            mid = math.floor((upper + lower) / 2)
+            attr = attrs[mid * attr_size]
+            if attr.ATTR_OFFSET < offset:
+                lower = mid + 1
+            elif attr.ATTR_OFFSET > offset:
+                upper = mid - 1
+            else:
+                while mid >= 0 and attrs[(mid - 1) * attr_size].ATTR_OFFSET == offset:
+                    mid -= 1
+                break
+        if attrs[mid * attr_size].ATTR_OFFSET != offset:
+            # no match found
+            return None
+        while attrs[mid * attr_size].ATTR_OFFSET == offset:
+            if attrs[mid * attr_size].ATTR_NAME == name:
+                return attrs[mid * attr_size].ATTR_VALUE
+            mid += 1
+        return None
+
+    def attr_by_index(self, index):
+        pass
+
+    @property
+    def dir_entries(self):
+        return [self.dir_entry(i) for i in range(self[0x16].u16)]
+
+
+def load_typelib(path: str) -> Typelib:
+    with open(path, "rb") as f:
+        return Typelib(f.read(), 0)
diff --git a/blueprintcompiler/xml_reader.py b/blueprintcompiler/xml_reader.py
index 877d20a..24ae5ff 100644
--- a/blueprintcompiler/xml_reader.py
+++ b/blueprintcompiler/xml_reader.py
@@ -36,7 +36,7 @@ class Element:
     def __init__(self, tag, attrs: T.Dict[str, str]):
         self.tag = tag
         self.attrs = attrs
-        self.children: T.Dict[str, T.List["Element"]] = defaultdict(list)
+        self.children: T.List["Element"] = []
         self.cdata_chunks: T.List[str] = []
 
     @cached_property
@@ -44,50 +44,42 @@ class Element:
         return ''.join(self.cdata_chunks)
 
     def get_elements(self, name) -> T.List["Element"]:
-        return self.children.get(name, [])
+        return [
+            child
+            for child in self.children
+            if child.tag == name
+        ]
 
     def __getitem__(self, key):
         return self.attrs.get(key)
 
 
 class Handler(sax.handler.ContentHandler):
-    def __init__(self, parse_type):
+    def __init__(self):
         self.root = None
         self.stack = []
-        self.skipping = 0
-        self._interesting_elements = parse_type
 
     def startElement(self, name, attrs):
-        if self._interesting_elements is not None and name not in self._interesting_elements:
-            self.skipping += 1
-        if self.skipping > 0:
-            return
-
         element = Element(name, attrs.copy())
 
         if len(self.stack):
             last = self.stack[-1]
-            last.children[name].append(element)
+            last.children.append(element)
         else:
             self.root = element
 
         self.stack.append(element)
 
-
     def endElement(self, name):
-        if self.skipping == 0:
-            self.stack.pop()
-        if self._interesting_elements is not None and name not in self._interesting_elements:
-            self.skipping -= 1
+        self.stack.pop()
 
     def characters(self, content):
-        if not self.skipping:
-            self.stack[-1].cdata_chunks.append(content)
+        self.stack[-1].cdata_chunks.append(content)
 
 
-def parse(filename, parse_type=None):
+def parse(filename):
     parser = sax.make_parser()
-    handler = Handler(parse_type)
+    handler = Handler()
     parser.setContentHandler(handler)
     parser.parse(filename)
     return handler.root
diff --git a/tests/fuzz.py b/tests/fuzz.py
index 17f2eeb..4f7c879 100644
--- a/tests/fuzz.py
+++ b/tests/fuzz.py
@@ -3,7 +3,7 @@ from pythonfuzz.main import PythonFuzz
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
-from blueprintcompiler import tokenizer, parser, decompiler
+from blueprintcompiler import tokenizer, parser, decompiler, gir
 from blueprintcompiler.completions import complete
 from blueprintcompiler.errors import PrintableError, MultipleErrors, CompileError, CompilerBugError
 from blueprintcompiler.tokenizer import Token, TokenType, tokenize
@@ -27,4 +27,8 @@ def fuzz(buf):
         pass
 
 if __name__ == "__main__":
+    # Make sure Gtk 4.0 is accessible, otherwise every test will fail on that
+    # and nothing interesting will be tested
+    gir.get_namespace("Gtk", "4.0")
+
     fuzz()

From c5f2e4ed4b06cdea568cb57f71968b27ada1705a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 24 Jun 2022 17:16:51 -0500
Subject: [PATCH 009/290] gir: Gracefully handle missing .gir files

They aren't required for compilation anymore, and not being able to show
documentation on hover is probably not worth crashing the language
server over.
---
 blueprintcompiler/gir.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 1085222..2515ab1 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -214,9 +214,14 @@ class GirNode:
         if self.signature:
             sections.append("```\n" + self.signature + "\n```")
 
-        el = self.xml.get_elements("doc")
-        if len(el) == 1:
-            sections.append(el[0].cdata.strip())
+        try:
+            el = self.xml.get_elements("doc")
+            if len(el) == 1:
+                sections.append(el[0].cdata.strip())
+        except:
+            # Not a huge deal, but if you want docs in the language server you
+            # should ensure .gir files are installed
+            pass
 
         return "\n\n---\n\n".join(sections)
 

From cfae48a65acb92e3cc5679b75c1688e4e391c8c5 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 24 Jun 2022 17:25:56 -0500
Subject: [PATCH 010/290] docs: Add notes for distro packagers

---
 docs/index.rst     |  1 +
 docs/packaging.rst | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 docs/packaging.rst

diff --git a/docs/index.rst b/docs/index.rst
index 1b2ec6e..8d560e5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -11,6 +11,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
    translations
    flatpak
    examples
+   packaging
 
 
 .. code-block::
diff --git a/docs/packaging.rst b/docs/packaging.rst
new file mode 100644
index 0000000..b0cd4e8
--- /dev/null
+++ b/docs/packaging.rst
@@ -0,0 +1,39 @@
+====================
+For Distro Packagers
+====================
+
+blueprint-compiler is a build tool that converts UI definitions written in
+Blueprint into XML files that are installed with the app and that GTK can read.
+So for most applications that use blueprint-compiler, it is a build dependency.
+It is a Python program, but like most GNOME-related projects, it uses
+`Meson <https://mesonbuild.com>`_ as its build system.
+
+GObject Introspection
+~~~~~~~~~~~~~~~~~~~~~
+
+Blueprint files can import GObject Introspection namespaces like this:
+
+.. code-block::
+
+   using Gtk 4.0;
+   using Adw 1;
+
+To compile a blueprint file, ``.typelib`` files for all of the imported
+namespaces must be installed. All blueprint files must import Gtk 4.0, so
+``Gtk-4.0.typelib`` is effectively a runtime dependency of blueprint-compiler.
+
+So, if a package uses blueprint-compiler, its build dependencies should include
+the typelib files for any namespaces imported in its blueprint files. (Note
+that many apps also have the same typelib files as runtime dependencies,
+separately from blueprint).
+
+The search path for typelib files is defined by the
+`libdir <https://mesonbuild.com/Builtin-options.html#directories>`_ that Meson
+uses. Additional paths may be passed at runtime through the ``GI_TYPELIB_PATH``
+environment variable.
+
+In addition, the blueprint language server uses ``.gir`` files to provide
+documentation on hover. Some distros package these files separately from the
+main package (e.g. in a ``-devel`` package). The language server will not crash
+if these files are not present, but for a good user experience you should make
+sure they are installed.
\ No newline at end of file

From 68610a7dbabb30a788d99a1e9a1556aa578d1dcd Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 28 Jun 2022 23:43:01 -0500
Subject: [PATCH 011/290] typelib: Use GIRepository to find typelib path

---
 blueprintcompiler/gir.py | 32 +++++---------------------------
 docs/packaging.rst       |  7 ++-----
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 2515ab1..2b09027 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -21,6 +21,10 @@ from functools import cached_property
 import typing as T
 import os, sys
 
+import gi # type: ignore
+gi.require_version("GIRepository", "2.0")
+from gi.repository import GIRepository # type: ignore
+
 from .errors import CompileError, CompilerBugError
 from . import typelib, xml_reader
 
@@ -29,25 +33,7 @@ _xml_cache = {}
 
 
 def get_namespace(namespace, version):
-    from .main import LIBDIR, VERSION
-    search_paths = []
-    if LIBDIR is not None:
-        search_paths.append(os.path.join(LIBDIR, "girepository-1.0"))
-
-    # This is a fragile hack to make blueprint-compiler work uninstalled on
-    # most systems.
-    if VERSION == "uninstalled":
-        search_paths += [
-            "/usr/lib/girepository-1.0",
-            "/usr/local/lib/girepository-1.0",
-            "/app/lib/girepository-1.0",
-            "/usr/lib64/girepository-1.0",
-            "/usr/local/lib64/girepository-1.0",
-            "/app/lib64/girepository-1.0",
-        ]
-
-    if typelib_path := os.environ.get("GI_TYPELIB_PATH"):
-        search_paths.append(typelib_path)
+    search_paths = GIRepository.Repository.get_search_path()
 
     filename = f"{namespace}-{version}.typelib"
 
@@ -76,14 +62,6 @@ def get_xml(namespace, version):
     from xml.etree import ElementTree
     search_paths = []
 
-    # Same fragile hack as before
-    if VERSION == "uninstalled":
-        search_paths += [
-            "/usr/share/gir-1.0",
-            "/usr/local/share/gir-1.0",
-            "/app/share/gir-1.0",
-        ]
-
     if data_paths := os.environ.get("XDG_DATA_DIRS"):
         search_paths += [os.path.join(path, "gir-1.0") for path in data_paths.split(os.pathsep)]
 
diff --git a/docs/packaging.rst b/docs/packaging.rst
index b0cd4e8..4f248e6 100644
--- a/docs/packaging.rst
+++ b/docs/packaging.rst
@@ -21,17 +21,14 @@ Blueprint files can import GObject Introspection namespaces like this:
 To compile a blueprint file, ``.typelib`` files for all of the imported
 namespaces must be installed. All blueprint files must import Gtk 4.0, so
 ``Gtk-4.0.typelib`` is effectively a runtime dependency of blueprint-compiler.
+blueprint-compiler also depends on pygobject, because it uses GIRepository
+to determine the search path for typelib files.
 
 So, if a package uses blueprint-compiler, its build dependencies should include
 the typelib files for any namespaces imported in its blueprint files. (Note
 that many apps also have the same typelib files as runtime dependencies,
 separately from blueprint).
 
-The search path for typelib files is defined by the
-`libdir <https://mesonbuild.com/Builtin-options.html#directories>`_ that Meson
-uses. Additional paths may be passed at runtime through the ``GI_TYPELIB_PATH``
-environment variable.
-
 In addition, the blueprint language server uses ``.gir`` files to provide
 documentation on hover. Some distros package these files separately from the
 main package (e.g. in a ``-devel`` package). The language server will not crash

From 12c9a434f10912c395bd71dd093472e9951dab8b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 29 Jun 2022 02:24:06 -0500
Subject: [PATCH 012/290] ci: Install pygobject in CI image

---
 build-aux/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build-aux/Dockerfile b/build-aux/Dockerfile
index f2f168e..4b9e0af 100644
--- a/build-aux/Dockerfile
+++ b/build-aux/Dockerfile
@@ -1,9 +1,8 @@
 FROM fedora:latest
 
-RUN dnf install -y meson python3-pip gtk4-devel gobject-introspection-devel libadwaita-devel python3-devel
+RUN dnf install -y meson python3-pip gtk4-devel gobject-introspection-devel \
+	libadwaita-devel python3-devel python3-gobject git
 RUN pip3 install furo mypy sphinx coverage
 
 # The version on PyPI is very old and doesn't install. Use the upstream package registry instead.
-RUN pip install pythonfuzz --extra-index-url https://gitlab.com/api/v4/projects/19904939/packages/pypi/simple
-
-RUN dnf install -y git
+RUN pip install pythonfuzz --extra-index-url https://gitlab.com/api/v4/projects/19904939/packages/pypi/simple
\ No newline at end of file

From 9542f72ce2b515af6649e97463f5180c7c27fe32 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 8 Jul 2022 10:29:46 -0500
Subject: [PATCH 013/290] Ci: Update coverage configuration

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd40630..79cac6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,9 @@ build:
       - _build
       - htmlcov
     reports:
-      cobertura: coverage.xml
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
 
 fuzz:
   image: registry.gitlab.gnome.org/jwestman/blueprint-compiler

From f6eacaa3d904b3c5e43f18900b11a48022ab84ab Mon Sep 17 00:00:00 2001
From: Alexander Bisono <sbisonol@gmail.com>
Date: Sat, 25 Jun 2022 20:15:43 -0400
Subject: [PATCH 014/290] Add emacs major mode to 'Editor Plugins'

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index ed0cb8f..ad1f204 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,10 @@ template ShumateDemoWindow : Gtk.ApplicationWindow {
 - [Syntax highlighting by thetek42](https://github.com/thetek42/vim-blueprint-syntax)
 - [Syntax highlighting by gabmus](https://gitlab.com/gabmus/vim-blueprint)
 
+### GNU Emacs
+
+- [Major mode by DrBluefall](https://github.com/DrBluefall/blueprint-mode)
+
 ## License
 
 Copyright (C) 2021 James Westman <james@jwestman.net>

From b9fdc5a5f1f7e00598e01e005d4d8c6ac0b9ccdb Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 9 Jul 2022 14:47:07 -0500
Subject: [PATCH 015/290] Fix action widgets in templates

Fixes #69.
---
 blueprintcompiler/language/gobject_object.py      | 8 +++++---
 blueprintcompiler/language/gtkbuilder_template.py | 5 +----
 tests/samples/action_widgets.blp                  | 2 +-
 tests/samples/action_widgets.ui                   | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index e36e4ce..e3960ab 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -97,13 +97,15 @@ class Object(AstNode):
             if child.response_id
         ]
 
-    def emit_xml(self, xml: XmlEmitter):
-        from .gtkbuilder_child import Child
-
+    def emit_start_tag(self, xml: XmlEmitter):
         xml.start_tag("object", **{
             "class": self.gir_class or self.tokens["class_name"],
             "id": self.tokens["id"],
         })
+
+    def emit_xml(self, xml: XmlEmitter):
+        self.emit_start_tag(xml)
+
         for child in self.children:
             child.emit_xml(xml)
 
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 0de7381..7806285 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -41,15 +41,12 @@ class Template(Object):
     def unique_in_parent(self):
         self.validate_unique_in_parent(f"Only one template may be defined per file, but this file contains {len(self.parent.children[Template])}",)
 
-    def emit_xml(self, xml: XmlEmitter):
+    def emit_start_tag(self, xml: XmlEmitter):
         xml.start_tag(
             "template",
             **{"class": self.tokens["name"]},
             parent=self.gir_class or self.tokens["class_name"]
         )
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
 
 
 @decompiler("template")
diff --git a/tests/samples/action_widgets.blp b/tests/samples/action_widgets.blp
index 2d4d6ae..34293a0 100644
--- a/tests/samples/action_widgets.blp
+++ b/tests/samples/action_widgets.blp
@@ -1,6 +1,6 @@
 using Gtk 4.0;
 
-Dialog {
+template MyDialog : Dialog {
     [action response=cancel]
     Button cancel_button {
         label: _("Cancel");
diff --git a/tests/samples/action_widgets.ui b/tests/samples/action_widgets.ui
index 91b6e64..8c41bb2 100644
--- a/tests/samples/action_widgets.ui
+++ b/tests/samples/action_widgets.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <object class="GtkDialog">
+  <template class="MyDialog" parent="GtkDialog">
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="label" translatable="true">Cancel</property>
@@ -22,7 +22,7 @@
       <action-widget response="9">custom_response_button</action-widget>
       <action-widget response="ok" default="True">ok_button</action-widget>
     </action-widgets>
-  </object>
+  </template>
   <object class="GtkInfoBar">
     <child type="action">
       <object class="GtkButton" id="ok_info_button">

From 2da6be7618f4052352479e3fb556774efd1e4eab Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sat, 9 Jul 2022 21:04:28 +0200
Subject: [PATCH 016/290] lsp: Fix crash when import version missing

The issue is specific to the language server, since it's trying to use
an AST that contains errors. The test would not fail but was added
anyway.
---
 CONTRIBUTING.md                           | 9 +++++++++
 blueprintcompiler/language/imports.py     | 7 ++++---
 tests/sample_errors/no_import_version.blp | 1 +
 tests/sample_errors/no_import_version.err | 1 +
 tests/test_samples.py                     | 1 +
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 CONTRIBUTING.md
 create mode 100644 tests/sample_errors/no_import_version.blp
 create mode 100644 tests/sample_errors/no_import_version.err

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..b7690a2
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+First of all, thank you for contributing to Blueprint.
+
+If you learn something useful, please add it to this file.
+
+# Run the test suite
+
+```
+python -m unittest
+```
diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index 682f8cd..4fac192 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -31,16 +31,17 @@ class GtkDirective(AstNode):
 
     @validate("version")
     def gtk_version(self):
-        if self.tokens["version"] not in ["4.0"]:
+        version = self.tokens["version"]
+        if version not in ["4.0"]:
             err = CompileError("Only GTK 4 is supported")
-            if self.tokens["version"].startswith("4"):
+            if version and version.startswith("4"):
                 err.hint("Expected the GIR version, not an exact version number. Use 'using Gtk 4.0;'.")
             else:
                 err.hint("Expected 'using Gtk 4.0;'")
             raise err
 
         try:
-            gir.get_namespace("Gtk", self.tokens["version"])
+            gir.get_namespace("Gtk", version)
         except CompileError as e:
             raise CompileError(
                 "Could not find GTK 4 introspection files. Is gobject-introspection installed?",
diff --git a/tests/sample_errors/no_import_version.blp b/tests/sample_errors/no_import_version.blp
new file mode 100644
index 0000000..665ce62
--- /dev/null
+++ b/tests/sample_errors/no_import_version.blp
@@ -0,0 +1 @@
+using Gtk 
\ No newline at end of file
diff --git a/tests/sample_errors/no_import_version.err b/tests/sample_errors/no_import_version.err
new file mode 100644
index 0000000..4ee792f
--- /dev/null
+++ b/tests/sample_errors/no_import_version.err
@@ -0,0 +1 @@
+1,10,0,Expected a version number for GTK
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 84cdb4f..ea6b2ea 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -188,6 +188,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("gtk_exact_version")
         self.assert_sample_error("invalid_bool")
         self.assert_sample_error("layout_in_non_widget")
+        self.assert_sample_error("no_import_version")
         self.assert_sample_error("ns_not_imported")
         self.assert_sample_error("not_a_class")
         self.assert_sample_error("object_dne")

From 012fc6192671e835e3df7f5c0f82088da1ebf111 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sat, 9 Jul 2022 21:31:54 +0200
Subject: [PATCH 017/290] Update documentation

---
 README.md      | 28 +++++++++++++++++-----------
 docs/index.rst | 21 +++++++++++++++------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index ad1f204..503d7a3 100644
--- a/README.md
+++ b/README.md
@@ -65,17 +65,31 @@ template ShumateDemoWindow : Gtk.ApplicationWindow {
 }
 ```
 
-## Editor plugins
+## Editors
 
-### Vim
+[Workbench](https://github.com/sonnyp/Workbench) and [GNOME Builder](https://apps.gnome.org/app/org.gnome.Builder/) have builtin support for Blueprint.
+
+Vim
 
 - [Syntax highlighting by thetek42](https://github.com/thetek42/vim-blueprint-syntax)
 - [Syntax highlighting by gabmus](https://gitlab.com/gabmus/vim-blueprint)
 
-### GNU Emacs
+GNU Emacs
 
 - [Major mode by DrBluefall](https://github.com/DrBluefall/blueprint-mode)
 
+Visual Studio Code
+
+- [Blueprint Language Plugin by bodil](https://github.com/bodil/vscode-blueprint)
+
+## Donate
+
+You can support my work on GitHub Sponsors! <https://github.com/sponsors/jameswestman>
+
+## Getting in Touch
+
+Matrix room: [#blueprint-language:matrix.org](https://matrix.to/#/#blueprint-language:matrix.org)
+
 ## License
 
 Copyright (C) 2021 James Westman <james@jwestman.net>
@@ -92,11 +106,3 @@ 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 <https://www.gnu.org/licenses/>.
-
-## Donate
-
-You can support my work on GitHub Sponsors! <https://github.com/sponsors/jameswestman>
-
-## Getting in Touch
-
-Matrix room: [#blueprint-language:matrix.org](https://matrix.to/#/#blueprint-language:matrix.org)
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index 8d560e5..f35e9fd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -51,25 +51,34 @@ Features
 - **Modern tooling.** IDE integration for `GNOME Builder <https://developer.gnome.org/documentation/introduction/builder.html>`_
   is in progress, and a VS Code extension is also planned.
 
+Links
+-----
+
+- `Source code <https://gitlab.gnome.org/jwestman/blueprint-compiler>`_
+- `Vim syntax highlighting plugin by thetek42 <https://github.com/thetek42/vim-blueprint-syntax>`_
+- `Vim syntax highlighting plugin by gabmus <https://gitlab.com/gabmus/vim-blueprint>`_
+- `GNU Emacs major mode by DrBluefall <https://github.com/DrBluefall/blueprint-mode>`_
+- `Visual Studio Code plugin by bodil <https://github.com/bodil/vscode-blueprint>`_
+
 Built with Blueprint
 --------------------
 
+- `Dialect <https://github.com/dialect-app/dialect>`_
 - `Extension Manager <https://github.com/mjakeman/extension-manager>`_
+- `favagtk <https://gitlab.gnome.org/johannesjh/favagtk>`_
 - `Feeds <https://gitlab.gnome.org/World/gfeeds>`_
 - `Geopard <https://github.com/ranfdev/Geopard>`_
 - `Giara <https://gitlab.gnome.org/World/giara>`_
 - `Health <https://gitlab.gnome.org/World/Health>`_
 - `HydraPaper <https://gitlab.com/gabmus/HydraPaper>`_
 - `Identity <https://gitlab.gnome.org/YaLTeR/identity>`_
+- `Login Manager Settings <https://github.com/realmazharhussain/gdm-settings>`_
+- `Paper <https://gitlab.com/posidon_software/paper>`_
+- `Passes <https://github.com/pablo-s/passes>`_
 - `Plitki <https://github.com/YaLTeR/plitki>`_
 - `Solanum <https://gitlab.gnome.org/World/Solanum>`_
+- `Swatch <https://gitlab.gnome.org/GabMus/swatch>`_
 - `Text Pieces <https://github.com/liferooter/textpieces>`_
 - `Video Trimmer <https://gitlab.gnome.org/YaLTeR/video-trimmer>`_
 - `WhatIP <https://gitlab.gnome.org/GabMus/whatip>`_
 - `Workbench <https://github.com/sonnyp/Workbench>`_
-
-Links
------
-
-- `Source code <https://gitlab.gnome.org/jwestman/blueprint-compiler>`_
-- `Vim syntax highlighting plugin <https://github.com/thetek42/vim-blueprint-syntax>`_

From 0a0389b1f8bdd918f6716cd7e9c9531f04c0da2c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 25 Jun 2022 01:04:41 -0500
Subject: [PATCH 018/290] grammar: Create an AST node for type names

---
 blueprintcompiler/completions.py              |   3 +-
 blueprintcompiler/gir.py                      |  17 +--
 blueprintcompiler/language/common.py          |   1 -
 blueprintcompiler/language/gobject_object.py  |  43 +-------
 .../language/gtkbuilder_template.py           |  18 +++-
 blueprintcompiler/language/types.py           | 101 ++++++++++++++++++
 blueprintcompiler/parser.py                   |   1 -
 blueprintcompiler/parser_utils.py             |  36 -------
 tests/sample_errors/class_dne.err             |   2 +-
 tests/sample_errors/not_a_class.err           |   2 +-
 10 files changed, 127 insertions(+), 97 deletions(-)
 create mode 100644 blueprintcompiler/language/types.py
 delete mode 100644 blueprintcompiler/parser_utils.py

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index e030961..7566f18 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -20,6 +20,7 @@
 import typing as T
 
 from . import gir, language
+from .language.types import ClassName
 from .ast_utils import AstNode
 from .completions_utils import *
 from .lsp_utils import Completion, CompletionItemKind
@@ -140,7 +141,7 @@ def signal_completer(ast_node, match_variables):
             if not isinstance(ast_node.parent, language.Object):
                 name = "on"
             else:
-                name = "on_" + (ast_node.parent.tokens["id"] or ast_node.parent.tokens["class_name"].lower())
+                name = "on_" + (ast_node.parent.children[ClassName][0].tokens["id"] or ast_node.parent.children[ClassName][0].tokens["class_name"].lower())
             yield Completion(signal, CompletionItemKind.Property, snippet=f"{signal} => ${{1:{name}_{signal.replace('-', '_')}}}()$0;")
 
 
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 2b09027..3786078 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -651,24 +651,17 @@ class GirContext:
                 did_you_mean=(ns, self.namespaces.keys()),
             )
 
+    def validate_type(self, name: str, ns: str):
+        """ Raises an exception if there is a problem looking up the given type. """
 
-    def validate_class(self, name: str, ns: str):
-        """ Raises an exception if there is a problem looking up the given
-        class (it doesn't exist, it isn't a class, etc.) """
-
-        ns = ns or "Gtk"
         self.validate_ns(ns)
 
         type = self.get_type(name, ns)
 
+        ns = ns or "Gtk"
+
         if type is None:
             raise CompileError(
-                f"Namespace {ns} does not contain a class called {name}",
+                f"Namespace {ns} does not contain a type called {name}",
                 did_you_mean=(name, self.namespaces[ns].classes.keys()),
             )
-        elif not isinstance(type, Class):
-            raise CompileError(
-                f"{ns}.{name} is not a class",
-                did_you_mean=(name, self.namespaces[ns].classes.keys()),
-            )
-
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index 03cb428..deeb5fc 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -27,7 +27,6 @@ from ..decompiler import DecompileCtx, decompiler
 from ..gir import StringType, BoolType, IntType, FloatType, GirType, Enumeration
 from ..lsp_utils import Completion, CompletionItemKind, SemanticToken, SemanticTokenType
 from ..parse_tree import *
-from ..parser_utils import *
 from ..xml_emitter import XmlEmitter
 
 
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index e3960ab..9a78667 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -23,6 +23,7 @@ from functools import cached_property
 
 from .common import *
 from .response_id import ResponseId
+from .types import ClassName, ConcreteClassName
 
 
 class ObjectContent(AstNode):
@@ -38,50 +39,14 @@ class ObjectContent(AstNode):
 
 class Object(AstNode):
     grammar: T.Any = [
-        class_name,
+        ConcreteClassName,
         Optional(UseIdent("id")),
         ObjectContent,
     ]
 
-    @validate("namespace")
-    def gir_ns_exists(self):
-        if not self.tokens["ignore_gir"]:
-            self.root.gir.validate_ns(self.tokens["namespace"])
-
-    @validate("class_name")
-    def gir_class_exists(self):
-        if self.tokens["class_name"] and not self.tokens["ignore_gir"] and self.gir_ns is not None:
-            self.root.gir.validate_class(self.tokens["class_name"], self.tokens["namespace"])
-
-    @validate("namespace", "class_name")
-    def not_abstract(self):
-        if self.gir_class is not None and self.gir_class.abstract:
-            raise CompileError(
-                f"{self.gir_class.full_name} can't be instantiated because it's abstract",
-                hints=[f"did you mean to use a subclass of {self.gir_class.full_name}?"]
-            )
-
-    @property
-    def gir_ns(self):
-        if not self.tokens["ignore_gir"]:
-            return self.root.gir.namespaces.get(self.tokens["namespace"] or "Gtk")
-
     @property
     def gir_class(self):
-        if self.tokens["class_name"] and not self.tokens["ignore_gir"]:
-            return self.root.gir.get_class(self.tokens["class_name"], self.tokens["namespace"])
-
-
-    @docs("namespace")
-    def namespace_docs(self):
-        if ns := self.root.gir.namespaces.get(self.tokens["namespace"]):
-            return ns.doc
-
-
-    @docs("class_name")
-    def class_docs(self):
-        if self.gir_class:
-            return self.gir_class.doc
+        return self.children[ClassName][0].gir_type
 
     @cached_property
     def action_widgets(self) -> T.List[ResponseId]:
@@ -99,7 +64,7 @@ class Object(AstNode):
 
     def emit_start_tag(self, xml: XmlEmitter):
         xml.start_tag("object", **{
-            "class": self.gir_class or self.tokens["class_name"],
+            "class": self.children[ClassName][0].glib_type_name,
             "id": self.tokens["id"],
         })
 
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 7806285..ffee11c 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -20,6 +20,7 @@
 
 from .gobject_object import Object, ObjectContent
 from .common import *
+from .types import ClassName
 
 
 class Template(Object):
@@ -28,24 +29,31 @@ class Template(Object):
         UseIdent("name").expected("template class name"),
         Optional([
             Match(":"),
-            class_name.expected("parent class"),
+            to_parse_node(ClassName).expected("parent class"),
         ]),
         ObjectContent,
     ]
 
-    @validate()
-    def not_abstract(self):
-        pass # does not apply to templates
+    @property
+    def gir_class(self):
+        # Templates might not have a parent class defined
+        if len(self.children[ClassName]):
+            return self.children[ClassName][0].gir_type
 
     @validate("name")
     def unique_in_parent(self):
         self.validate_unique_in_parent(f"Only one template may be defined per file, but this file contains {len(self.parent.children[Template])}",)
 
     def emit_start_tag(self, xml: XmlEmitter):
+        if len(self.children[ClassName]):
+            parent = self.children[ClassName][0].glib_type_name
+        else:
+            parent = None
+
         xml.start_tag(
             "template",
             **{"class": self.tokens["name"]},
-            parent=self.gir_class or self.tokens["class_name"]
+            parent=parent
         )
 
 
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
new file mode 100644
index 0000000..0d6b38c
--- /dev/null
+++ b/blueprintcompiler/language/types.py
@@ -0,0 +1,101 @@
+# types.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
+
+
+import typing as T
+from .common import *
+from ..gir import Class, Interface
+
+
+class TypeName(AstNode):
+    grammar = AnyOf(
+        [
+            UseIdent("namespace"),
+            ".",
+            UseIdent("class_name"),
+        ],
+        [
+            ".",
+            UseIdent("class_name"),
+            UseLiteral("ignore_gir", True),
+        ],
+        UseIdent("class_name"),
+    )
+
+    @validate("class_name")
+    def type_exists(self):
+        if not self.tokens["ignore_gir"] and self.gir_ns is not None:
+            self.root.gir.validate_type(self.tokens["class_name"], self.tokens["namespace"])
+
+    @validate("namespace")
+    def gir_ns_exists(self):
+        if not self.tokens["ignore_gir"]:
+            self.root.gir.validate_ns(self.tokens["namespace"])
+
+    @property
+    def gir_ns(self):
+        if not self.tokens["ignore_gir"]:
+            return self.root.gir.namespaces.get(self.tokens["namespace"] or "Gtk")
+
+    @property
+    def gir_type(self) -> T.Optional[gir.Class]:
+        if self.tokens["class_name"] and not self.tokens["ignore_gir"]:
+            return self.root.gir.get_type(self.tokens["class_name"], self.tokens["namespace"])
+        return None
+
+    @property
+    def glib_type_name(self) -> str:
+        if gir_type := self.gir_type:
+            return gir_type.glib_type_name
+        else:
+            return self.tokens["class_name"]
+
+    @docs("namespace")
+    def namespace_docs(self):
+        if ns := self.root.gir.namespaces.get(self.tokens["namespace"]):
+            return ns.doc
+
+    @docs("class_name")
+    def class_docs(self):
+        if self.gir_type:
+            return self.gir_type.doc
+
+    def emit_xml(self, xml: XmlEmitter):
+        pass
+
+
+class ClassName(TypeName):
+    @validate("namespace", "class_name")
+    def gir_class_exists(self):
+        if self.gir_type is not None and not isinstance(self.gir_type, Class):
+            if isinstance(self.gir_type, Interface):
+                raise CompileError(f"{self.gir_type.full_name} is an interface, not a class")
+            else:
+                raise CompileError(f"{self.gir_type.full_name} is not a class")
+
+
+class ConcreteClassName(ClassName):
+    @validate("namespace", "class_name")
+    def not_abstract(self):
+        if isinstance(self.gir_type, Class) and self.gir_type.abstract:
+            raise CompileError(
+                f"{self.gir_type.full_name} can't be instantiated because it's abstract",
+                hints=[f"did you mean to use a subclass of {self.gir_type.full_name}?"]
+            )
+
diff --git a/blueprintcompiler/parser.py b/blueprintcompiler/parser.py
index 6064481..7c62ae6 100644
--- a/blueprintcompiler/parser.py
+++ b/blueprintcompiler/parser.py
@@ -20,7 +20,6 @@
 
 from .errors import MultipleErrors, PrintableError
 from .parse_tree import *
-from .parser_utils import *
 from .tokenizer import TokenType
 from .language import OBJECT_HOOKS, OBJECT_CONTENT_HOOKS, VALUE_HOOKS, Template, UI
 
diff --git a/blueprintcompiler/parser_utils.py b/blueprintcompiler/parser_utils.py
deleted file mode 100644
index af951fe..0000000
--- a/blueprintcompiler/parser_utils.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# parser_utils.py
-#
-# Copyright 2021 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 .parse_tree import *
-
-
-class_name = AnyOf(
-    [
-        UseIdent("namespace"),
-        ".",
-        UseIdent("class_name"),
-    ],
-    [
-        ".",
-        UseIdent("class_name"),
-        UseLiteral("ignore_gir", True),
-    ],
-    UseIdent("class_name"),
-)
diff --git a/tests/sample_errors/class_dne.err b/tests/sample_errors/class_dne.err
index 573baf3..57d74f8 100644
--- a/tests/sample_errors/class_dne.err
+++ b/tests/sample_errors/class_dne.err
@@ -1 +1 @@
-3,29,13,Namespace Gtk does not contain a class called NotARealClass
+3,29,13,Namespace Gtk does not contain a type called NotARealClass
diff --git a/tests/sample_errors/not_a_class.err b/tests/sample_errors/not_a_class.err
index d0a7260..c69f602 100644
--- a/tests/sample_errors/not_a_class.err
+++ b/tests/sample_errors/not_a_class.err
@@ -1 +1 @@
-3,29,10,Gtk.Orientable is not a class
+3,25,14,Gtk.Orientable is an interface, not a class

From 664fa2250b02f64f2c1d8afd82801ab01e353c78 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 9 Jul 2022 16:40:02 -0500
Subject: [PATCH 019/290] Validate that an object can have children

Fixes #32.
---
 .../language/gtkbuilder_child.py              | 20 +++++++++++++++++++
 tests/sample_errors/children.blp              |  5 +++++
 tests/sample_errors/children.err              |  1 +
 tests/test_samples.py                         |  1 +
 4 files changed, 27 insertions(+)
 create mode 100644 tests/sample_errors/children.blp
 create mode 100644 tests/sample_errors/children.err

diff --git a/blueprintcompiler/language/gtkbuilder_child.py b/blueprintcompiler/language/gtkbuilder_child.py
index 83fadf7..72843a1 100644
--- a/blueprintcompiler/language/gtkbuilder_child.py
+++ b/blueprintcompiler/language/gtkbuilder_child.py
@@ -24,6 +24,10 @@ from .gobject_object import Object
 from .response_id import ResponseId
 from .common import *
 
+ALLOWED_PARENTS: T.List[T.Tuple[str, str]] = [
+    ("Gtk", "Buildable"),
+    ("Gio", "ListStore")
+]
 
 class Child(AstNode):
     grammar = [
@@ -37,6 +41,22 @@ class Child(AstNode):
         Object,
     ]
 
+    @validate()
+    def parent_can_have_child(self):
+        if gir_class := self.parent.gir_class:
+            for namespace, name in ALLOWED_PARENTS:
+                parent_type = self.root.gir.get_type(name, namespace)
+                if gir_class.assignable_to(parent_type):
+                    break
+            else:
+                hints=["only Gio.ListStore or Gtk.Buildable implementors can have children"]
+                if "child" in gir_class.properties:
+                    hints.append("did you mean to assign this object to the 'child' property?")
+                raise CompileError(
+                    f"{gir_class.full_name} doesn't have children",
+                    hints=hints,
+                )
+
     @cached_property
     def response_id(self) -> T.Optional[ResponseId]:
         """Get action widget's response ID.
diff --git a/tests/sample_errors/children.blp b/tests/sample_errors/children.blp
new file mode 100644
index 0000000..400fe2d
--- /dev/null
+++ b/tests/sample_errors/children.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+ListItem {
+  Label {}
+}
\ No newline at end of file
diff --git a/tests/sample_errors/children.err b/tests/sample_errors/children.err
new file mode 100644
index 0000000..d294464
--- /dev/null
+++ b/tests/sample_errors/children.err
@@ -0,0 +1 @@
+4,3,8,Gtk.ListItem doesn't have children
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index ea6b2ea..4fdb5c0 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -175,6 +175,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("action_widget_response_dne")
         self.assert_sample_error("action_widget_negative_response")
         self.assert_sample_error("bitfield_member_dne")
+        self.assert_sample_error("children")
         self.assert_sample_error("class_assign")
         self.assert_sample_error("class_dne")
         self.assert_sample_error("consecutive_unexpected_tokens")

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

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

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

From 30f0deea34851aa6fbb4f8a5dcd9216f5ac714f9 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 23 Jul 2022 15:05:40 -0500
Subject: [PATCH 021/290] Exit with error code when a bug is reported

---
 blueprintcompiler/errors.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 8ee80b9..70aea2a 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -157,3 +157,5 @@ 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.CLEAR}""")
 
+    sys.exit(1)
+

From 50db59f2d2c88fe0ee2fc979e11e7c989eaa07da Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sun, 24 Jul 2022 23:12:05 +0200
Subject: [PATCH 022/290] lsp: Report error hints

---
 blueprintcompiler/lsp.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 8c2a009..bbe4c1d 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -270,9 +270,14 @@ class LanguageServer:
         })
 
     def _create_diagnostic(self, text, uri, err):
+        message = err.message
+
+        for hint in err.hints:
+          message += '\nhint: ' + hint
+
         result = {
             "range": utils.idxs_to_range(err.start, err.end, text),
-            "message": err.message,
+            "message": message,
             "severity": DiagnosticSeverity.Warning if isinstance(err, CompileWarning) else DiagnosticSeverity.Error,
         }
 

From 59283a76adc8d270ff5f67b630b7dfa905ec34a9 Mon Sep 17 00:00:00 2001
From: Alan Beveridge <adbeveridge@protonmail.com>
Date: Tue, 9 Aug 2022 15:41:09 +0000
Subject: [PATCH 023/290] Update docs/index.rst

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

diff --git a/docs/index.rst b/docs/index.rst
index f35e9fd..373dcb6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -67,6 +67,7 @@ Built with Blueprint
 - `Extension Manager <https://github.com/mjakeman/extension-manager>`_
 - `favagtk <https://gitlab.gnome.org/johannesjh/favagtk>`_
 - `Feeds <https://gitlab.gnome.org/World/gfeeds>`_
+- `File Shredder <https://github.com/ADBeveridge/raider>`_
 - `Geopard <https://github.com/ranfdev/Geopard>`_
 - `Giara <https://gitlab.gnome.org/World/giara>`_
 - `Health <https://gitlab.gnome.org/World/Health>`_

From ad71324ccb8d834e2ccebc5579776db8a495de76 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 4 Sep 2022 14:02:05 -0500
Subject: [PATCH 024/290] Add MAINTENANCE.md

---
 MAINTENANCE.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 MAINTENANCE.md

diff --git a/MAINTENANCE.md b/MAINTENANCE.md
new file mode 100644
index 0000000..a1eab84
--- /dev/null
+++ b/MAINTENANCE.md
@@ -0,0 +1,9 @@
+## Releasing a new version
+
+1. Look at the git log since the previous release. Note every significant change
+in the NEWS file.
+2. Update the version number at the top of meson.build according to semver.
+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. Announce the release through relevant channels (Twitter, TWIG, etc.)

From 75a6d95988736ec0471d22ceb07579c0cedac2ad Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 4 Sep 2022 14:04:03 -0500
Subject: [PATCH 025/290] Release v0.4.0

---
 NEWS.md     | 19 +++++++++++++++++++
 meson.build |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 NEWS.md

diff --git a/NEWS.md b/NEWS.md
new file mode 100644
index 0000000..bd533d6
--- /dev/null
+++ b/NEWS.md
@@ -0,0 +1,19 @@
+# v0.4.0
+
+## Added
+- Lookup expressions
+- With the language server, hovering over a diagnostic message now shows any
+  associated hints.
+
+## Changed
+- The compiler now uses .typelib files rather than XML .gir files, which reduces
+  dependencies and should reduce compile times by about half a second.
+
+## Fixed
+- Fix the decompiler/porting tool not importing the Adw namespace when needed
+- Fix a crash when trying to compile an empty file
+- Fix parsing of number tokens
+- Fix a bug where action widgets did not work in templates
+- Fix a crash in the language server that occurred when a `using` statement had
+no version
+- If a compiler bug is reported, the process now exits with a non-zero code
diff --git a/meson.build b/meson.build
index 540c0ec..1302995 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.3.0',
+  version: '0.4.0',
 )
 
 subdir('docs')

From 6ad1433587fa487e0d72c545178a61f8961c3b21 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 4 Sep 2022 16:54:21 -0500
Subject: [PATCH 026/290] Post-release version bump

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

diff --git a/meson.build b/meson.build
index 1302995..be517bc 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.4.0',
+  version: '0.5.0',
 )
 
 subdir('docs')

From c998655af6e01d9f6c70b6af9bb5ed98eeabb945 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@sonny.re>
Date: Tue, 4 Oct 2022 01:26:38 +0000
Subject: [PATCH 027/290] doc: Add more apps built with Blueprint

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

diff --git a/docs/index.rst b/docs/index.rst
index 373dcb6..3439413 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -63,6 +63,8 @@ Links
 Built with Blueprint
 --------------------
 
+- `Bottles <https://github.com/bottlesdevs/Bottles>`_
+- `Commit <https://github.com/sonnyp/Commit/>`_
 - `Dialect <https://github.com/dialect-app/dialect>`_
 - `Extension Manager <https://github.com/mjakeman/extension-manager>`_
 - `favagtk <https://gitlab.gnome.org/johannesjh/favagtk>`_
@@ -70,15 +72,19 @@ Built with Blueprint
 - `File Shredder <https://github.com/ADBeveridge/raider>`_
 - `Geopard <https://github.com/ranfdev/Geopard>`_
 - `Giara <https://gitlab.gnome.org/World/giara>`_
+- `Gradience <https://github.com/GradienceTeam/Gradience>`_
 - `Health <https://gitlab.gnome.org/World/Health>`_
 - `HydraPaper <https://gitlab.com/gabmus/HydraPaper>`_
 - `Identity <https://gitlab.gnome.org/YaLTeR/identity>`_
+- `Junction <https://github.com/sonnyp/Junction/>`_
 - `Login Manager Settings <https://github.com/realmazharhussain/gdm-settings>`_
 - `Paper <https://gitlab.com/posidon_software/paper>`_
 - `Passes <https://github.com/pablo-s/passes>`_
+- `Playhouse <https://github.com/sonnyp/Playhouse>`_
 - `Plitki <https://github.com/YaLTeR/plitki>`_
 - `Solanum <https://gitlab.gnome.org/World/Solanum>`_
 - `Swatch <https://gitlab.gnome.org/GabMus/swatch>`_
+- `Tangram <https://github.com/sonnyp/Tangram/>`_
 - `Text Pieces <https://github.com/liferooter/textpieces>`_
 - `Video Trimmer <https://gitlab.gnome.org/YaLTeR/video-trimmer>`_
 - `WhatIP <https://gitlab.gnome.org/GabMus/whatip>`_

From 12c1c7b8d6c2e950ee72a0c5963d03c09798ca5e Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 2 Oct 2022 14:42:06 -0500
Subject: [PATCH 028/290] docs: Fix build setting

The docs need to be set to build_always_stale so you don't need to
delete the directory to rebuild them. This also means we want to disable
build_by_default.
---
 .gitlab-ci.yml   | 1 +
 docs/meson.build | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79cac6a..1315899 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ build:
     - ninja -C _build
     - ninja -C _build test
     - ninja -C _build install
+    - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
     - git checkout 6f164f5e259f1602fd3bfae5e64852fed7687b9f
diff --git a/docs/meson.build b/docs/meson.build
index 9b76852..95e545d 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -3,9 +3,9 @@ if get_option('docs')
 sphinx = find_program(['sphinx-build-3', 'sphinx-build'], required: true)
 
 custom_target('docs',
-           command: [sphinx, '-b', 'html', '-c', meson.current_source_dir(), meson.current_source_dir(), '@OUTPUT@'],
-            output: 'en',
-  build_by_default: true
+  command: [sphinx, '-b', 'html', '-c', meson.current_source_dir(), meson.current_source_dir(), '@OUTPUT@'],
+  output: 'en',
+  build_always_stale: true,
 )
 
 endif

From 82980a466b1c4d6e66199e9ec6c0f34aa759927e Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sat, 17 Sep 2022 22:36:24 +0200
Subject: [PATCH 029/290] doc: Add documentation for Gtk.Label attributes

---
 docs/examples.rst | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/examples.rst b/docs/examples.rst
index 4d9c1cd..9b123d2 100644
--- a/docs/examples.rst
+++ b/docs/examples.rst
@@ -418,3 +418,26 @@ Gtk.Dialog and Gtk.InfoBar
      [action response=9]
      Gtk.Button app_defined_response {}
    }
+
+Gtk.Label
+~~~~~~~~~
+
+Blueprint does not have syntax for `attributes` on `Gtk.Label`.
+
+Instead, you should use `platform classes <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/style-classes.html>`_, `CSS <https://docs.gtk.org/gtk4/css-properties.html>`_, `Pango Markup <https://docs.gtk.org/Pango/pango_markup.html>`_ or `Gtk.Label.set_attributes <https://docs.gtk.org/gtk4/method.Label.set_attributes.html>`_.
+
+Examples
+
+.. code-block::
+
+   Gtk.Label {
+     label: "Hello, World!";
+     styles ["title-1"]
+   }
+
+.. code-block::
+
+   Gtk.Label {
+     label: "<b>Hello, World!</b>";
+     use-markup: true;
+   }

From 302903b89c2a5be6148a8b258387b437fa2da698 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sat, 17 Sep 2022 22:37:00 +0200
Subject: [PATCH 030/290] doc: Add documentation to contribute

---
 CONTRIBUTING.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b7690a2..d817250 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,6 +4,21 @@ If you learn something useful, please add it to this file.
 
 # Run the test suite
 
-```
+```sh
 python -m unittest
 ```
+
+# Build the docs
+
+```sh
+pip install -U sphinx furo
+
+meson -Ddocs=true build
+# or
+meson --reconfigure -Ddocs=true build
+
+ninja -C build docs/en
+
+python -m http.server 2310 --bind 127.0.0.1 --directory build/docs/en/
+xdg-open http://127.0.0.1:2310/
+```

From 15496353dec101dc4ac5fba582231b5b9705b783 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 4 Oct 2022 12:08:43 -0500
Subject: [PATCH 031/290] ci: Update regression tests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1315899..822c7dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ build:
     - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
-    - git checkout 6f164f5e259f1602fd3bfae5e64852fed7687b9f
+    - git checkout c61f425d5df359261f1369722e791f947bc3ede1
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'

From ee2b9b2950ef9c542e668a02715295144ffb85f9 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 6 Oct 2022 04:13:38 +0000
Subject: [PATCH 032/290] Update MAINTENANCE.md

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

diff --git a/MAINTENANCE.md b/MAINTENANCE.md
index a1eab84..a487b88 100644
--- a/MAINTENANCE.md
+++ b/MAINTENANCE.md
@@ -6,4 +6,5 @@ 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. Announce the release through relevant channels (Twitter, TWIG, etc.)
+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.)

From c0c40b15771ad3e0edbf8f2f13408dfe62d0fc4f Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 16 Sep 2022 22:33:49 -0500
Subject: [PATCH 033/290] language: Support boxed types and GType

- Add support for type checking boxed types
- Remove support for converting string and number literals
- Add the `typeof()` operator for GType literals
---
 .gitlab-ci.yml                         |  2 +-
 NEWS.md                                |  7 +++
 blueprintcompiler/gir.py               | 25 +++++++-
 blueprintcompiler/language/__init__.py |  6 +-
 blueprintcompiler/language/values.py   | 85 +++++++++++++++++++-------
 blueprintcompiler/typelib.py           |  2 +
 tests/sample_errors/a11y_prop_type.err |  2 +-
 tests/samples/parseable.blp            |  9 +++
 tests/samples/parseable.ui             |  6 ++
 tests/samples/typeof.blp               | 11 ++++
 tests/samples/typeof.ui                | 10 +++
 tests/test_samples.py                  |  1 +
 12 files changed, 140 insertions(+), 26 deletions(-)
 create mode 100644 tests/samples/typeof.blp
 create mode 100644 tests/samples/typeof.ui

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 822c7dc..f4bc92d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ build:
     - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
-    - git checkout c61f425d5df359261f1369722e791f947bc3ede1
+    - git checkout d14b95b6c1fc0cddd4b0ad21d224b05edee2d01f
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'
diff --git a/NEWS.md b/NEWS.md
index bd533d6..0997afb 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,10 @@
+# v0.6.0 (unreleased)
+
+## Breaking Changes
+- Quoted and numeric literals are no longer interchangeable (e.g. `"800"` is
+no longer an accepted value for an integer type).
+- Boxed types are now type checked.
+
 # v0.4.0
 
 ## Added
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 3786078..b1ecf08 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -129,6 +129,11 @@ class StringType(BasicType):
     def assignable_to(self, other) -> bool:
         return isinstance(other, StringType)
 
+class TypeType(BasicType):
+    name = "GType"
+    def assignable_to(self, other) -> bool:
+        return isinstance(other, TypeType)
+
 _BASIC_TYPES = {
     "gboolean": BoolType,
     "int": IntType,
@@ -141,6 +146,8 @@ _BASIC_TYPES = {
     "float": FloatType,
     "double": FloatType,
     "utf8": StringType,
+    "gtype": TypeType,
+    "type": TypeType,
 }
 
 class GirNode:
@@ -213,7 +220,7 @@ class GirNode:
 
     @property
     def type(self):
-        return self.get_containing(Namespace).lookup_type(self.type_name)
+        raise NotImplementedError()
 
 
 class Property(GirNode):
@@ -464,6 +471,18 @@ class Enumeration(GirNode, GirType):
         return type == self
 
 
+class Boxed(GirNode, GirType):
+    def __init__(self, ns, tl: typelib.Typelib):
+        super().__init__(ns, tl)
+
+    @property
+    def signature(self):
+        return f"boxed {self.full_name}"
+
+    def assignable_to(self, type):
+        return type == self
+
+
 class Bitfield(Enumeration):
     def __init__(self, ns, tl: typelib.Typelib):
         super().__init__(ns, tl)
@@ -491,6 +510,8 @@ class Namespace(GirNode):
                 self.entries[entry_name] = Class(self, entry_blob)
             elif entry_type == typelib.BLOB_TYPE_INTERFACE:
                  self.entries[entry_name] = Interface(self, entry_blob)
+            elif entry_type == typelib.BLOB_TYPE_BOXED or entry_type == typelib.BLOB_TYPE_STRUCT:
+                 self.entries[entry_name] = Boxed(self, entry_blob)
 
     @cached_property
     def xml(self):
@@ -595,6 +616,8 @@ class Repository(GirNode):
                 return UIntType()
             elif type_id == typelib.TYPE_UTF8:
                 return StringType()
+            elif type_id == typelib.TYPE_GTYPE:
+                return TypeType()
             else:
                 raise CompilerBugError("Unknown type ID", type_id)
         else:
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index feeb301..1b27040 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -18,7 +18,7 @@ from .gtkbuilder_child import Child
 from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
 from .ui import UI
-from .values import IdentValue, TranslatedStringValue, FlagsValue, LiteralValue
+from .values import TypeValue, IdentValue, TranslatedStringValue, FlagsValue, QuotedValue, NumberValue
 
 from .common import *
 
@@ -43,8 +43,10 @@ OBJECT_CONTENT_HOOKS.children = [
 ]
 
 VALUE_HOOKS.children = [
+    TypeValue,
     TranslatedStringValue,
     FlagsValue,
     IdentValue,
-    LiteralValue,
+    QuotedValue,
+    NumberValue,
 ]
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index f39db53..44e28ba 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -19,6 +19,7 @@
 
 
 from .common import *
+from .types import TypeName
 
 
 class Value(AstNode):
@@ -55,11 +56,68 @@ class TranslatedStringValue(Value):
         xml.put_text(self.tokens["value"])
 
 
-class LiteralValue(Value):
-    grammar = AnyOf(
-        UseNumber("value"),
-        UseQuoted("value"),
-    )
+class TypeValue(Value):
+    grammar = [
+        "typeof",
+        "(",
+        to_parse_node(TypeName).expected("type name"),
+        Match(")").expected(),
+    ]
+
+    @property
+    def type_name(self):
+        return self.children[TypeName][0]
+
+    def emit_xml(self, xml: XmlEmitter):
+        xml.put_text(self.type_name.glib_type_name)
+
+    @validate()
+    def validate_for_type(self):
+        type = self.parent.value_type
+        if type is not None and not isinstance(type, gir.TypeType):
+            raise CompileError(f"Cannot convert GType to {type.full_name}")
+
+
+class QuotedValue(Value):
+    grammar = UseQuoted("value")
+
+    def emit_xml(self, xml: XmlEmitter):
+        xml.put_text(self.tokens["value"])
+
+    @validate()
+    def validate_for_type(self):
+        type = self.parent.value_type
+        if isinstance(type, gir.IntType) or isinstance(type, gir.UIntType) or isinstance(type, gir.FloatType):
+            raise CompileError(f"Cannot convert string to number")
+
+        elif isinstance(type, gir.StringType):
+            pass
+
+        elif isinstance(type, gir.Class) or isinstance(type, gir.Interface) or isinstance(type, gir.Boxed):
+            parseable_types = [
+                "Gdk.Paintable",
+                "Gdk.Texture",
+                "Gdk.Pixbuf",
+                "GLib.File",
+                "Gtk.ShortcutTrigger",
+                "Gtk.ShortcutAction",
+                "Gdk.RGBA",
+                "Gdk.ContentFormats",
+                "Gsk.Transform",
+                "GLib.Variant",
+            ]
+            if type.full_name not in parseable_types:
+                hints = []
+                if isinstance(type, gir.TypeType):
+                    hints.append(f"use the typeof operator: 'typeof({self.tokens('value')})'")
+                raise CompileError(f"Cannot convert string to {type.full_name}", hints=hints)
+
+        elif type is not None:
+            raise CompileError(f"Cannot convert string to {type.full_name}")
+
+
+class NumberValue(Value):
+    grammar = UseNumber("value")
 
     def emit_xml(self, xml: XmlEmitter):
         xml.put_text(self.tokens["value"])
@@ -87,23 +145,8 @@ class LiteralValue(Value):
             except:
                 raise CompileError(f"Cannot convert {self.group.tokens['value']} to float")
 
-        elif isinstance(type, gir.StringType):
-            pass
-
-        elif isinstance(type, gir.Class) or isinstance(type, gir.Interface):
-            parseable_types = [
-                "Gdk.Paintable",
-                "Gdk.Texture",
-                "Gdk.Pixbuf",
-                "GLib.File",
-                "Gtk.ShortcutTrigger",
-                "Gtk.ShortcutAction",
-            ]
-            if type.full_name not in parseable_types:
-                raise CompileError(f"Cannot convert {self.group.tokens['value']} to {type.full_name}")
-
         elif type is not None:
-            raise CompileError(f"Cannot convert {self.group.tokens['value']} to {type.full_name}")
+            raise CompileError(f"Cannot convert number to {type.full_name}")
 
 
 class Flag(AstNode):
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index be1f366..e8b9152 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -26,6 +26,8 @@ import mmap, os
 from .errors import CompilerBugError
 
 
+BLOB_TYPE_STRUCT = 3
+BLOB_TYPE_BOXED = 4
 BLOB_TYPE_ENUM = 5
 BLOB_TYPE_FLAGS = 6
 BLOB_TYPE_OBJECT = 7
diff --git a/tests/sample_errors/a11y_prop_type.err b/tests/sample_errors/a11y_prop_type.err
index c8cb1d5..cc0b0db 100644
--- a/tests/sample_errors/a11y_prop_type.err
+++ b/tests/sample_errors/a11y_prop_type.err
@@ -1 +1 @@
-5,18,1,Cannot convert 1 to Gtk.Orientation
+5,18,1,Cannot convert number to Gtk.Orientation
diff --git a/tests/samples/parseable.blp b/tests/samples/parseable.blp
index 3bc3584..f4e8c2f 100644
--- a/tests/samples/parseable.blp
+++ b/tests/samples/parseable.blp
@@ -1,5 +1,14 @@
 using Gtk 4.0;
+using Gio 2.0;
 
 Gtk.Shortcut {
   trigger: "Escape";
 }
+
+Picture {
+  paintable: "/path/to/paintable";
+}
+
+ColorButton {
+  rgba: "rgb(0, 0, 0)";
+}
\ No newline at end of file
diff --git a/tests/samples/parseable.ui b/tests/samples/parseable.ui
index 78ceacb..231a25c 100644
--- a/tests/samples/parseable.ui
+++ b/tests/samples/parseable.ui
@@ -4,4 +4,10 @@
   <object class="GtkShortcut">
     <property name="trigger">Escape</property>
   </object>
+  <object class="GtkPicture">
+    <property name="paintable">/path/to/paintable</property>
+  </object>
+  <object class="GtkColorButton">
+    <property name="rgba">rgb(0, 0, 0)</property>
+  </object>
 </interface>
diff --git a/tests/samples/typeof.blp b/tests/samples/typeof.blp
new file mode 100644
index 0000000..5c5e2e5
--- /dev/null
+++ b/tests/samples/typeof.blp
@@ -0,0 +1,11 @@
+using Gtk 4.0;
+using GObject 2.0;
+using Gio 2.0;
+
+Gio.ListStore {
+  item-type: typeof(GObject.Object);
+}
+
+Gio.ListStore {
+  item-type: typeof(.MyObject);
+}
\ No newline at end of file
diff --git a/tests/samples/typeof.ui b/tests/samples/typeof.ui
new file mode 100644
index 0000000..4c45869
--- /dev/null
+++ b/tests/samples/typeof.ui
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GListStore">
+    <property name="item-type">GObject</property>
+  </object>
+  <object class="GListStore">
+    <property name="item-type">MyObject</property>
+  </object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 4fdb5c0..ba39ada 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -155,6 +155,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("template")
         self.assert_sample("template_no_parent")
         self.assert_sample("translated")
+        self.assert_sample("typeof")
         self.assert_sample("uint")
         self.assert_sample("unchecked_class")
         self.assert_sample("using")

From f1c3413dc1549061972a8b444a14441bd3e8524b Mon Sep 17 00:00:00 2001
From: William Roy <wroy@proton.me>
Date: Fri, 7 Oct 2022 18:02:39 +0000
Subject: [PATCH 034/290] Escape backlash on Windows

---
 blueprint-compiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprint-compiler.py b/blueprint-compiler.py
index f6a542e..61eae79 100755
--- a/blueprint-compiler.py
+++ b/blueprint-compiler.py
@@ -24,8 +24,8 @@ import os, sys
 # These variables should be set by meson. If they aren't, we're running
 # uninstalled, and we might have to guess some values.
 version = "@VERSION@"
-module_path = "@MODULE_PATH@"
-libdir = "@LIBDIR@"
+module_path = r"@MODULE_PATH@"
+libdir = r"@LIBDIR@"
 
 if version == "\u0040VERSION@":
     version = "uninstalled"

From 447785ec8c2c8c1f9fc842a5bd73c43f17d09ee7 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 14 Oct 2022 21:16:18 -0500
Subject: [PATCH 035/290] language: Remove inline menus

Inline menus didn't work anyway--menus have to be referenced by ID
(though, curiously, you *can* put the <menu> within the <property> tag
and immediately reference it--but that's a hack, and not what
blueprint-compiler was doing).
---
 blueprintcompiler/language/__init__.py           | 5 -----
 blueprintcompiler/language/common.py             | 1 -
 blueprintcompiler/language/gobject_property.py   | 2 +-
 blueprintcompiler/language/gtk_menu.py           | 5 +++--
 blueprintcompiler/language/ui.py                 | 5 ++++-
 blueprintcompiler/parser.py                      | 2 +-
 tests/sample_errors/assign_inline_menu.blp       | 5 -----
 tests/sample_errors/assign_inline_menu.err       | 1 -
 tests/{samples => sample_errors}/inline_menu.blp | 0
 tests/sample_errors/inline_menu.err              | 1 +
 tests/samples/inline_menu.ui                     | 9 ---------
 tests/test_samples.py                            | 3 +--
 12 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 tests/sample_errors/assign_inline_menu.blp
 delete mode 100644 tests/sample_errors/assign_inline_menu.err
 rename tests/{samples => sample_errors}/inline_menu.blp (100%)
 create mode 100644 tests/sample_errors/inline_menu.err
 delete mode 100644 tests/samples/inline_menu.ui

diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 1b27040..ce247c3 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -22,11 +22,6 @@ from .values import TypeValue, IdentValue, TranslatedStringValue, FlagsValue, Qu
 
 from .common import *
 
-OBJECT_HOOKS.children = [
-    menu,
-    Object,
-]
-
 OBJECT_CONTENT_HOOKS.children = [
     Signal,
     Property,
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index deeb5fc..108c43a 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -30,6 +30,5 @@ from ..parse_tree import *
 from ..xml_emitter import XmlEmitter
 
 
-OBJECT_HOOKS = AnyOf()
 OBJECT_CONTENT_HOOKS = AnyOf()
 VALUE_HOOKS = AnyOf()
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index f0a2ef4..e5d753b 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -53,7 +53,7 @@ class Property(AstNode):
             UseIdent("name"),
             ":",
             AnyOf(
-                OBJECT_HOOKS,
+                Object,
                 VALUE_HOOKS,
             ).expected("a value"),
         ),
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index b63233c..2c4131a 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -17,10 +17,10 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+import typing as T
 
 from .attributes import BaseAttribute
 from .gobject_object import Object, ObjectContent
-from .ui import UI
 from .common import *
 
 
@@ -128,7 +128,7 @@ menu_contents.children = [
     ), "}"),
 ]
 
-menu = Group(
+menu: Group = Group(
     Menu,
     [
         "menu",
@@ -138,6 +138,7 @@ menu = Group(
     ],
 )
 
+from .ui import UI
 
 @completer(
     applies_in=[UI],
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index 9123bf8..c1adbde 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -21,6 +21,8 @@
 from .. import gir
 from .imports import GtkDirective, Import
 from .gtkbuilder_template import Template
+from .gobject_object import Object
+from .gtk_menu import menu
 from .common import *
 
 
@@ -32,7 +34,8 @@ class UI(AstNode):
         ZeroOrMore(Import),
         Until(AnyOf(
             Template,
-            OBJECT_HOOKS,
+            menu,
+            Object,
         ), Eof()),
     ]
 
diff --git a/blueprintcompiler/parser.py b/blueprintcompiler/parser.py
index 7c62ae6..739a165 100644
--- a/blueprintcompiler/parser.py
+++ b/blueprintcompiler/parser.py
@@ -21,7 +21,7 @@
 from .errors import MultipleErrors, PrintableError
 from .parse_tree import *
 from .tokenizer import TokenType
-from .language import OBJECT_HOOKS, OBJECT_CONTENT_HOOKS, VALUE_HOOKS, Template, UI
+from .language import OBJECT_CONTENT_HOOKS, VALUE_HOOKS, Template, UI
 
 
 def parse(tokens) -> T.Tuple[UI, T.Optional[MultipleErrors], T.List[PrintableError]]:
diff --git a/tests/sample_errors/assign_inline_menu.blp b/tests/sample_errors/assign_inline_menu.blp
deleted file mode 100644
index 9e5a944..0000000
--- a/tests/sample_errors/assign_inline_menu.blp
+++ /dev/null
@@ -1,5 +0,0 @@
-using Gtk 4.0;
-
-Button {
-  label: menu {};
-}
diff --git a/tests/sample_errors/assign_inline_menu.err b/tests/sample_errors/assign_inline_menu.err
deleted file mode 100644
index 5200603..0000000
--- a/tests/sample_errors/assign_inline_menu.err
+++ /dev/null
@@ -1 +0,0 @@
-4,3,15,Cannot assign Gio.Menu to string
diff --git a/tests/samples/inline_menu.blp b/tests/sample_errors/inline_menu.blp
similarity index 100%
rename from tests/samples/inline_menu.blp
rename to tests/sample_errors/inline_menu.blp
diff --git a/tests/sample_errors/inline_menu.err b/tests/sample_errors/inline_menu.err
new file mode 100644
index 0000000..3115750
--- /dev/null
+++ b/tests/sample_errors/inline_menu.err
@@ -0,0 +1 @@
+4,15,4,Namespace Gtk does not contain a type called menu
\ No newline at end of file
diff --git a/tests/samples/inline_menu.ui b/tests/samples/inline_menu.ui
deleted file mode 100644
index a6f2bcc..0000000
--- a/tests/samples/inline_menu.ui
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk" version="4.0"/>
-  <object class="GtkMenuButton">
-    <property name="menu-model">
-      <menu id="primary_menu"></menu>
-    </property>
-  </object>
-</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index ba39ada..b5d3e3e 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -140,7 +140,6 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("file_filter")
         self.assert_sample("flags")
         self.assert_sample("id_prop")
-        self.assert_sample("inline_menu")
         self.assert_sample("layout")
         self.assert_sample("menu")
         self.assert_sample("numbers")
@@ -167,7 +166,6 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("a11y_prop_obj_dne")
         self.assert_sample_error("a11y_prop_type")
         self.assert_sample_error("abstract_class")
-        self.assert_sample_error("assign_inline_menu")
         self.assert_sample_error("action_widget_float_response")
         self.assert_sample_error("action_widget_have_no_id")
         self.assert_sample_error("action_widget_multiple_default")
@@ -188,6 +186,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("filters_in_non_file_filter")
         self.assert_sample_error("gtk_3")
         self.assert_sample_error("gtk_exact_version")
+        self.assert_sample_error("inline_menu")
         self.assert_sample_error("invalid_bool")
         self.assert_sample_error("layout_in_non_widget")
         self.assert_sample_error("no_import_version")

From b3783b9c6ac0de02ff3da1fb5226d1e7396ecd61 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 15 Oct 2022 11:26:18 -0500
Subject: [PATCH 036/290] lsp: Log to stderr rather than a file

---
 blueprintcompiler/lsp.py  | 19 ++++++++-----------
 blueprintcompiler/main.py |  3 +--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index bbe4c1d..b1610d7 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -27,6 +27,10 @@ from .lsp_utils import *
 from . import tokenizer, parser, utils, xml_reader
 
 
+def printerr(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
+
+
 def command(json_method):
     def decorator(func):
         func._json_method = json_method
@@ -89,10 +93,9 @@ class OpenFile:
 class LanguageServer:
     commands: T.Dict[str, T.Callable] = {}
 
-    def __init__(self, logfile=None):
+    def __init__(self):
         self.client_capabilities = {}
         self._open_files: {str: OpenFile} = {}
-        self.logfile = logfile
 
     def run(self):
         # Read <doc> tags from gir files. During normal compilation these are
@@ -110,7 +113,7 @@ class LanguageServer:
                     if line.startswith("Content-Length:"):
                         content_len = int(line.split("Content-Length:")[1].strip())
                 line = sys.stdin.buffer.read(content_len).decode()
-                self._log("input: " + line)
+                printerr("input: " + line)
 
                 data = json.loads(line)
                 method = data.get("method")
@@ -120,22 +123,16 @@ class LanguageServer:
                 if method in self.commands:
                     self.commands[method](self, id, params)
         except Exception as e:
-            self._log(traceback.format_exc())
+            printerr(traceback.format_exc())
 
 
     def _send(self, data):
         data["jsonrpc"] = "2.0"
         line = json.dumps(data, separators=(",", ":")) + "\r\n"
-        self._log("output: " + line)
+        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}")
         sys.stdout.flush()
 
-    def _log(self, msg):
-        if self.logfile is not None:
-            self.logfile.write(str(msg))
-            self.logfile.write("\n")
-            self.logfile.flush()
-
     def _send_response(self, id, result):
         self._send({
             "id": id,
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index d528e7e..9f2f4c2 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -48,7 +48,6 @@ class BlueprintApp:
         port = self.add_subcommand("port", "Interactive porting tool", self.cmd_port)
 
         lsp = self.add_subcommand("lsp", "Run the language server (for internal use by IDEs)", self.cmd_lsp)
-        lsp.add_argument("--logfile", dest="logfile", default=None, type=argparse.FileType('a'))
 
         self.add_subcommand("help", "Show this message", self.cmd_help)
 
@@ -125,7 +124,7 @@ class BlueprintApp:
 
 
     def cmd_lsp(self, opts):
-        langserv = LanguageServer(opts.logfile)
+        langserv = LanguageServer()
         langserv.run()
 
 

From 8cf793023da75b479f365c5633da9873acd6915b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 15 Oct 2022 11:47:42 -0500
Subject: [PATCH 037/290] Fix crash in language server

---
 blueprintcompiler/language/imports.py | 3 ++-
 blueprintcompiler/language/ui.py      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index 4fac192..823baec 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -57,7 +57,8 @@ class GtkDirective(AstNode):
         # validate the GTK version first to make sure the more specific error
         # message is emitted
         self.gtk_version()
-        return gir.get_namespace("Gtk", self.tokens["version"])
+        if self.tokens["version"] is not None:
+            return gir.get_namespace("Gtk", self.tokens["version"])
 
 
     def emit_xml(self, xml: XmlEmitter):
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index c1adbde..e0d5dcd 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -45,7 +45,8 @@ class UI(AstNode):
         self._gir_errors = []
 
         try:
-            gir_ctx.add_namespace(self.children[GtkDirective][0].gir_namespace)
+            if gtk := self.children[GtkDirective][0].gir_namespace:
+                gir_ctx.add_namespace(gtk)
         except CompileError as e:
             self._gir_errors.append(e)
 

From a24f16109fdc06e2d1a220a0e84d5f4a1fb80189 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 14 Oct 2022 21:04:37 -0500
Subject: [PATCH 038/290] Separate output into its own module

---
 .gitlab-ci.yml                                |   2 +-
 blueprintcompiler/ast_utils.py                |  11 -
 blueprintcompiler/gir.py                      |   8 +-
 blueprintcompiler/interactive_port.py         |   4 +-
 blueprintcompiler/language/__init__.py        |  12 +-
 blueprintcompiler/language/attributes.py      |  11 -
 blueprintcompiler/language/common.py          |   1 -
 blueprintcompiler/language/expression.py      |  17 +-
 blueprintcompiler/language/gobject_object.py  |  40 +--
 .../language/gobject_property.py              |  41 ---
 blueprintcompiler/language/gobject_signal.py  |  37 ++-
 blueprintcompiler/language/gtk_a11y.py        |   6 -
 .../language/gtk_combo_box_text.py            |   6 -
 blueprintcompiler/language/gtk_file_filter.py |  11 +-
 blueprintcompiler/language/gtk_layout.py      |   6 -
 blueprintcompiler/language/gtk_menu.py        |  22 +-
 blueprintcompiler/language/gtk_size_group.py  |   9 -
 blueprintcompiler/language/gtk_string_list.py |  13 -
 blueprintcompiler/language/gtk_styles.py      |   9 -
 .../language/gtkbuilder_child.py              |  15 +-
 .../language/gtkbuilder_template.py           |  27 +-
 blueprintcompiler/language/imports.py         |   7 -
 blueprintcompiler/language/response_id.py     |  30 +-
 blueprintcompiler/language/types.py           |   3 -
 blueprintcompiler/language/ui.py              |   7 -
 blueprintcompiler/language/values.py          |  34 +--
 blueprintcompiler/main.py                     |   6 +-
 blueprintcompiler/outputs/__init__.py         |   7 +
 blueprintcompiler/outputs/xml/__init__.py     | 272 ++++++++++++++++++
 .../{ => outputs/xml}/xml_emitter.py          |  13 +-
 tests/fuzz.py                                 |   5 +-
 tests/samples/signal.ui                       |   2 +-
 tests/test_samples.py                         |   4 +-
 33 files changed, 407 insertions(+), 291 deletions(-)
 create mode 100644 blueprintcompiler/outputs/__init__.py
 create mode 100644 blueprintcompiler/outputs/xml/__init__.py
 rename blueprintcompiler/{ => outputs/xml}/xml_emitter.py (86%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4bc92d..2790cd1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ build:
     - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
-    - git checkout d14b95b6c1fc0cddd4b0ad21d224b05edee2d01f
+    - git checkout 94613f275efc810610768d5ee8b2aec28392c3e8
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'
diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 1f3eb5b..cc5c44d 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -23,7 +23,6 @@ import typing as T
 
 from .errors import *
 from .lsp_utils import SemanticToken
-from .xml_emitter import XmlEmitter
 
 
 class Children:
@@ -96,16 +95,6 @@ class AstNode:
             if isinstance(item, attr_type):
                 yield name, item
 
-    def generate(self) -> str:
-        """ Generates an XML string from the node. """
-        xml = XmlEmitter()
-        self.emit_xml(xml)
-        return xml.result
-
-    def emit_xml(self, xml: XmlEmitter):
-        """ Emits the XML representation of this AST node to the XmlEmitter. """
-        raise NotImplementedError()
-
     def get_docs(self, idx: int) -> T.Optional[str]:
         for name, attr in self._attrs_by_type(Docs):
             if attr.token_name:
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index b1ecf08..78335ee 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -28,11 +28,11 @@ from gi.repository import GIRepository # type: ignore
 from .errors import CompileError, CompilerBugError
 from . import typelib, xml_reader
 
-_namespace_cache = {}
+_namespace_cache: T.Dict[str, "Namespace"] = {}
 _xml_cache = {}
 
 
-def get_namespace(namespace, version):
+def get_namespace(namespace, version) -> "Namespace":
     search_paths = GIRepository.Repository.get_search_path()
 
     filename = f"{namespace}-{version}.typelib"
@@ -518,11 +518,11 @@ class Namespace(GirNode):
         return get_xml(self.name, self.version).get_elements("namespace")[0]
 
     @cached_property
-    def name(self):
+    def name(self) -> str:
         return self.tl.HEADER_NAMESPACE
 
     @cached_property
-    def version(self):
+    def version(self) -> str:
         return self.tl.HEADER_NSVERSION
 
     @property
diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index ff551df..10a9b56 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -23,6 +23,7 @@ import difflib
 import os
 
 from . import decompiler, tokenizer, parser
+from .outputs.xml import XmlOutput
 from .errors import MultipleErrors, PrintableError
 from .utils import Colors
 
@@ -57,7 +58,8 @@ def decompile_file(in_file, out_file) -> T.Union[str, CouldNotPort]:
             if len(ast.errors):
                 raise MultipleErrors(ast.errors)
 
-            ast.generate()
+            output = XmlOutput()
+            output.emit(ast)
         except PrintableError as e:
             e.pretty_print(out_file, decompiled)
 
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index ce247c3..da5a44c 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,16 +1,13 @@
-""" Contains all the syntax beyond basic objects, properties, signal, and
-templates. """
-
 from .attributes import BaseAttribute, BaseTypedAttribute
-from .expression import Expr
+from .expression import IdentExpr, LookupOp, Expr
 from .gobject_object import Object, ObjectContent
 from .gobject_property import Property
 from .gobject_signal import Signal
 from .gtk_a11y import A11y
 from .gtk_combo_box_text import Items
-from .gtk_file_filter import mime_types, patterns, suffixes
+from .gtk_file_filter import mime_types, patterns, suffixes, Filters
 from .gtk_layout import Layout
-from .gtk_menu import menu
+from .gtk_menu import menu, Menu, MenuAttribute
 from .gtk_size_group import Widgets
 from .gtk_string_list import Strings
 from .gtk_styles import Styles
@@ -18,7 +15,8 @@ from .gtkbuilder_child import Child
 from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
 from .ui import UI
-from .values import TypeValue, IdentValue, TranslatedStringValue, FlagsValue, QuotedValue, NumberValue
+from .types import ClassName
+from .values import TypeValue, IdentValue, TranslatedStringValue, FlagsValue, Flag, QuotedValue, NumberValue, Value
 
 from .common import *
 
diff --git a/blueprintcompiler/language/attributes.py b/blueprintcompiler/language/attributes.py
index a6db9f1..66faa60 100644
--- a/blueprintcompiler/language/attributes.py
+++ b/blueprintcompiler/language/attributes.py
@@ -32,17 +32,6 @@ class BaseAttribute(AstNode):
     def name(self):
         return self.tokens["name"]
 
-    def emit_xml(self, xml: XmlEmitter):
-        value = self.children[Value][0]
-        attrs = { self.attr_name: self.name }
-
-        if isinstance(value, TranslatedStringValue):
-            attrs = { **attrs, **value.attrs }
-
-        xml.start_tag(self.tag_name, **attrs)
-        value.emit_xml(xml)
-        xml.end_tag()
-
 
 class BaseTypedAttribute(BaseAttribute):
     """ A BaseAttribute whose parent has a value_type property that can assist
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index 108c43a..f6a8f8e 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -27,7 +27,6 @@ from ..decompiler import DecompileCtx, decompiler
 from ..gir import StringType, BoolType, IntType, FloatType, GirType, Enumeration
 from ..lsp_utils import Completion, CompletionItemKind, SemanticToken, SemanticTokenType
 from ..parse_tree import *
-from ..xml_emitter import XmlEmitter
 
 
 OBJECT_CONTENT_HOOKS = AnyOf()
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index a684b39..29df93e 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -27,9 +27,6 @@ expr = Pratt()
 class Expr(AstNode):
     grammar = expr
 
-    def emit_xml(self, xml: XmlEmitter):
-        self.children[-1].emit_xml(xml)
-
 
 class InfixExpr(AstNode):
     @property
@@ -41,19 +38,17 @@ class InfixExpr(AstNode):
 class IdentExpr(AstNode):
     grammar = UseIdent("ident")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag("constant")
-        xml.put_text(self.tokens["ident"])
-        xml.end_tag()
+    @property
+    def ident(self) -> str:
+        return self.tokens["ident"]
 
 
 class LookupOp(InfixExpr):
     grammar = [".", UseIdent("property")]
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag("lookup", name=self.tokens["property"])
-        self.lhs.emit_xml(xml)
-        xml.end_tag()
+    @property
+    def property_name(self) -> str:
+        return self.tokens["property"]
 
 
 expr.children = [
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 9a78667..711795c 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -33,10 +33,6 @@ class ObjectContent(AstNode):
     def gir_class(self):
         return self.parent.gir_class
 
-    def emit_xml(self, xml: XmlEmitter):
-        for x in self.children:
-            x.emit_xml(xml)
-
 class Object(AstNode):
     grammar: T.Any = [
         ConcreteClassName,
@@ -44,9 +40,21 @@ class Object(AstNode):
         ObjectContent,
     ]
 
+    @property
+    def id(self) -> str:
+        return self.tokens["id"]
+
+    @property
+    def class_name(self) -> ClassName | None:
+        return self.children[ClassName][0]
+
+    @property
+    def content(self) -> ObjectContent:
+        return self.children[ObjectContent][0]
+
     @property
     def gir_class(self):
-        return self.children[ClassName][0].gir_type
+        return self.class_name.gir_type
 
     @cached_property
     def action_widgets(self) -> T.List[ResponseId]:
@@ -62,28 +70,6 @@ class Object(AstNode):
             if child.response_id
         ]
 
-    def emit_start_tag(self, xml: XmlEmitter):
-        xml.start_tag("object", **{
-            "class": self.children[ClassName][0].glib_type_name,
-            "id": self.tokens["id"],
-        })
-
-    def emit_xml(self, xml: XmlEmitter):
-        self.emit_start_tag(xml)
-
-        for child in self.children:
-            child.emit_xml(xml)
-
-        # List action widgets
-        action_widgets = self.action_widgets
-        if action_widgets:
-            xml.start_tag("action-widgets")
-            for action_widget in action_widgets:
-                action_widget.emit_action_widget(xml)
-            xml.end_tag()
-
-        xml.end_tag()
-
 
 def validate_parent_type(node, ns: str, name: str, err_msg: str):
     parent = node.root.gir.get_type(name, ns)
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index e5d753b..4d47e80 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -133,44 +133,3 @@ class Property(AstNode):
     def property_docs(self):
         if self.gir_property is not None:
             return self.gir_property.doc
-
-
-    def emit_xml(self, xml: XmlEmitter):
-        values = self.children[Value]
-        value = values[0] if len(values) == 1 else None
-
-        bind_flags = []
-        if self.tokens["bind_source"] and not self.tokens["no_sync_create"]:
-            bind_flags.append("sync-create")
-        if self.tokens["inverted"]:
-            bind_flags.append("invert-boolean")
-        if self.tokens["bidirectional"]:
-            bind_flags.append("bidirectional")
-        bind_flags_str = "|".join(bind_flags) or None
-
-        props = {
-            "name": self.tokens["name"],
-            "bind-source": self.tokens["bind_source"],
-            "bind-property": self.tokens["bind_property"],
-            "bind-flags": bind_flags_str,
-        }
-
-        if isinstance(value, TranslatedStringValue):
-            props = { **props, **value.attrs }
-
-        if len(self.children[Object]) == 1:
-            xml.start_tag("property", **props)
-            self.children[Object][0].emit_xml(xml)
-            xml.end_tag()
-        elif value is None:
-            if self.tokens["binding"]:
-                xml.start_tag("binding", **props)
-                for x in self.children:
-                    x.emit_xml(xml)
-                xml.end_tag()
-            else:
-                xml.put_self_closing("property", **props);
-        else:
-            xml.start_tag("property", **props)
-            value.emit_xml(xml)
-            xml.end_tag()
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index a519dee..ba1b48b 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -40,6 +40,30 @@ class Signal(AstNode):
         )),
     )
 
+    @property
+    def name(self) -> str:
+        return self.tokens["name"]
+
+    @property
+    def detail_name(self) -> str | None:
+        return self.tokens["detail_name"]
+
+    @property
+    def handler(self) -> str:
+        return self.tokens["handler"]
+
+    @property
+    def object_id(self) -> str | None:
+        return self.tokens["object"]
+
+    @property
+    def is_swapped(self) -> bool:
+        return self.tokens["swapped"] or False
+
+    @property
+    def is_after(self) -> bool:
+        return self.tokens["after"] or False
+
 
     @property
     def gir_signal(self):
@@ -89,19 +113,6 @@ class Signal(AstNode):
             return self.gir_signal.doc
 
 
-    def emit_xml(self, xml: XmlEmitter):
-        name = self.tokens["name"]
-        if self.tokens["detail_name"]:
-            name += "::" + self.tokens["detail_name"]
-        xml.put_self_closing(
-            "signal",
-            name=name,
-            handler=self.tokens["handler"],
-            swapped="true" if self.tokens["swapped"] else None,
-            object=self.tokens["object"]
-        )
-
-
 @decompiler("signal")
 def decompile_signal(ctx, gir, name, handler, swapped="false", object=None):
     object_name = object or ""
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index 57bd6af..cab72e0 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -167,12 +167,6 @@ class A11y(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate accessibility block")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag("accessibility")
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
-
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index ecee31f..31d2d08 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -60,12 +60,6 @@ class Items(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate items block")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag("items")
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
-
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 39e563e..4419311 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -39,18 +39,9 @@ class Filters(AstNode):
             )
         wrapped_validator(self)
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag(self.tokens["tag_name"])
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
-
 
 class FilterString(AstNode):
-    def emit_xml(self, xml):
-        xml.start_tag(self.tokens["tag_name"])
-        xml.put_text(self.tokens["name"])
-        xml.end_tag()
+    pass
 
 
 def create_node(tag_name: str, singular: str):
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index 8ccc136..b52f7bc 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -64,12 +64,6 @@ class Layout(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate layout block")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag("layout")
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
-
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 2c4131a..355997a 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -19,22 +19,26 @@
 
 import typing as T
 
+from blueprintcompiler.language.values import Value
+
 from .attributes import BaseAttribute
 from .gobject_object import Object, ObjectContent
 from .common import *
 
 
-class Menu(Object):
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag(self.tokens["tag"], id=self.tokens["id"])
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
-
+class Menu(AstNode):
     @property
     def gir_class(self):
         return self.root.gir.namespaces["Gtk"].lookup_type("Gio.Menu")
 
+    @property
+    def id(self) -> str:
+        return self.tokens["id"]
+
+    @property
+    def tag(self) -> str:
+        return self.tokens["tag"]
+
 
 class MenuAttribute(BaseAttribute):
     tag_name = "attribute"
@@ -43,6 +47,10 @@ class MenuAttribute(BaseAttribute):
     def value_type(self):
         return None
 
+    @property
+    def value(self) -> Value:
+        return self.children[Value][0]
+
 
 menu_contents = Sequence()
 
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index de766ed..eb56043 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -39,9 +39,6 @@ class Widget(AstNode):
                 f"Cannot assign {object.gir_class.full_name} to {type.full_name}"
             )
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.put_self_closing("widget", name=self.tokens["name"])
-
 
 class Widgets(AstNode):
     grammar = [
@@ -59,12 +56,6 @@ class Widgets(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate widgets block")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag("widgets")
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
-
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index 4f19190..e7eb0f8 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -31,13 +31,6 @@ class Item(AstNode):
     def value_type(self):
         return StringType()
 
-    def emit_xml(self, xml: XmlEmitter):
-        value = self.children[Value][0]
-        attrs = value.attrs if isinstance(value, TranslatedStringValue) else {}
-        xml.start_tag("item", **attrs)
-        value.emit_xml(xml)
-        xml.end_tag()
-
 
 class Strings(AstNode):
     grammar = [
@@ -55,12 +48,6 @@ class Strings(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate strings block")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag("items")
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
-
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtk_styles.py b/blueprintcompiler/language/gtk_styles.py
index f93ddc0..644d8a3 100644
--- a/blueprintcompiler/language/gtk_styles.py
+++ b/blueprintcompiler/language/gtk_styles.py
@@ -25,9 +25,6 @@ from .common import *
 class StyleClass(AstNode):
     grammar = UseQuoted("name")
 
-    def emit_xml(self, xml):
-        xml.put_self_closing("class", name=self.tokens["name"])
-
 
 class Styles(AstNode):
     grammar = [
@@ -45,12 +42,6 @@ class Styles(AstNode):
     def unique_in_parent(self):
         self.validate_unique_in_parent("Duplicate styles block")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag("style")
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
-
 
 @completer(
     applies_in=[ObjectContent],
diff --git a/blueprintcompiler/language/gtkbuilder_child.py b/blueprintcompiler/language/gtkbuilder_child.py
index 72843a1..71efe19 100644
--- a/blueprintcompiler/language/gtkbuilder_child.py
+++ b/blueprintcompiler/language/gtkbuilder_child.py
@@ -41,6 +41,10 @@ class Child(AstNode):
         Object,
     ]
 
+    @property
+    def object(self) -> Object:
+        return self.children[Object][0]
+
     @validate()
     def parent_can_have_child(self):
         if gir_class := self.parent.gir_class:
@@ -70,17 +74,6 @@ class Child(AstNode):
         else:
             return None
 
-    def emit_xml(self, xml: XmlEmitter):
-        child_type = internal_child = None
-        if self.tokens["internal_child"]:
-            internal_child = self.tokens["child_type"]
-        else:
-            child_type = self.tokens["child_type"]
-        xml.start_tag("child", type=child_type, internal_child=internal_child)
-        for child in self.children:
-            child.emit_xml(xml)
-        xml.end_tag()
-
 
 @decompiler("child")
 def decompile_child(ctx, gir, type=None, internal_child=None):
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 6ab6c5a..35ef4f2 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -34,28 +34,27 @@ class Template(Object):
         ObjectContent,
     ]
 
+    @property
+    def id(self) -> str:
+        return self.tokens["id"]
+
+    @property
+    def class_name(self) -> ClassName | None:
+        if len(self.children[ClassName]):
+            return self.children[ClassName][0]
+        else:
+            return None
+
     @property
     def gir_class(self):
         # Templates might not have a parent class defined
-        if len(self.children[ClassName]):
-            return self.children[ClassName][0].gir_type
+        if class_name := self.class_name:
+            return class_name.gir_type
 
     @validate("id")
     def unique_in_parent(self):
         self.validate_unique_in_parent(f"Only one template may be defined per file, but this file contains {len(self.parent.children[Template])}",)
 
-    def emit_start_tag(self, xml: XmlEmitter):
-        if len(self.children[ClassName]):
-            parent = self.children[ClassName][0].glib_type_name
-        else:
-            parent = None
-
-        xml.start_tag(
-            "template",
-            **{"class": self.tokens["id"]},
-            parent=parent
-        )
-
 
 @decompiler("template")
 def decompile_template(ctx: DecompileCtx, gir, klass, parent="Widget"):
diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index 823baec..f0fe3df 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -61,10 +61,6 @@ class GtkDirective(AstNode):
             return gir.get_namespace("Gtk", self.tokens["version"])
 
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.put_self_closing("requires", lib="gtk", version=self.tokens["version"])
-
-
 class Import(AstNode):
     grammar = Statement(
         "using",
@@ -82,6 +78,3 @@ class Import(AstNode):
             return gir.get_namespace(self.tokens["namespace"], self.tokens["version"])
         except CompileError:
             return None
-
-    def emit_xml(self, xml):
-        pass
diff --git a/blueprintcompiler/language/response_id.py b/blueprintcompiler/language/response_id.py
index 7dce2f2..745c73f 100644
--- a/blueprintcompiler/language/response_id.py
+++ b/blueprintcompiler/language/response_id.py
@@ -120,6 +120,14 @@ class ResponseId(AstNode):
             if widget.tokens["is_default"]:
                 raise CompileError("Default response is already set")
 
+    @property
+    def response_id(self) -> str:
+        return self.tokens["response_id"]
+
+    @property
+    def is_default(self) -> bool:
+        return self.tokens["is_default"] or False
+
     @property
     def widget_id(self) -> str:
         """Get action widget ID."""
@@ -128,25 +136,3 @@ class ResponseId(AstNode):
         _object: Object = self.parent.children[Object][0]
         return _object.tokens["id"]
 
-    def emit_xml(self, xml: XmlEmitter) -> None:
-        """Emit nothing.
-
-        Response ID don't have to emit any XML in place,
-        but have to emit action-widget tag in separate
-        place (see `ResponseId.emit_action_widget`)
-        """
-
-    def emit_action_widget(self, xml: XmlEmitter) -> None:
-        """Emit action-widget XML.
-
-        Must be called while <action-widgets> tag is open.
-
-        For more details see `GtkDialog` and `GtkInfoBar` docs.
-        """
-        xml.start_tag(
-            "action-widget",
-            response=self.tokens["response_id"],
-            default=self.tokens["is_default"]
-        )
-        xml.put_text(self.widget_id)
-        xml.end_tag()
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index 0d6b38c..8f39cbf 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -76,9 +76,6 @@ class TypeName(AstNode):
         if self.gir_type:
             return self.gir_type.doc
 
-    def emit_xml(self, xml: XmlEmitter):
-        pass
-
 
 class ClassName(TypeName):
     @validate("namespace", "class_name")
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index e0d5dcd..5a9c4fb 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -86,10 +86,3 @@ class UI(AstNode):
                 token = obj.group.tokens["id"]
                 raise CompileError(f"Duplicate object ID '{obj.tokens['id']}'", token.start, token.end)
             passed[obj.tokens["id"]] = obj
-
-
-    def emit_xml(self, xml: XmlEmitter):
-        xml.start_tag("interface")
-        for x in self.children:
-            x.emit_xml(xml)
-        xml.end_tag()
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 44e28ba..5030774 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -46,14 +46,12 @@ class TranslatedStringValue(Value):
     )
 
     @property
-    def attrs(self):
-        attrs = { "translatable": "true" }
-        if "context" in self.tokens:
-            attrs["context"] = self.tokens["context"]
-        return attrs
+    def string(self) -> str:
+        return self.tokens["value"]
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.put_text(self.tokens["value"])
+    @property
+    def context(self) -> str | None:
+        return self.tokens["context"]
 
 
 class TypeValue(Value):
@@ -68,9 +66,6 @@ class TypeValue(Value):
     def type_name(self):
         return self.children[TypeName][0]
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.put_text(self.type_name.glib_type_name)
-
     @validate()
     def validate_for_type(self):
         type = self.parent.value_type
@@ -81,8 +76,9 @@ class TypeValue(Value):
 class QuotedValue(Value):
     grammar = UseQuoted("value")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.put_text(self.tokens["value"])
+    @property
+    def value(self) -> str:
+        return self.tokens["value"]
 
     @validate()
     def validate_for_type(self):
@@ -119,8 +115,9 @@ class QuotedValue(Value):
 class NumberValue(Value):
     grammar = UseNumber("value")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.put_text(self.tokens["value"])
+    @property
+    def value(self) -> int | float:
+        return self.tokens["value"]
 
     @validate()
     def validate_for_type(self):
@@ -179,19 +176,10 @@ class FlagsValue(Value):
         if type is not None and not isinstance(type, gir.Bitfield):
             raise CompileError(f"{type.full_name} is not a bitfield type")
 
-    def emit_xml(self, xml: XmlEmitter):
-        xml.put_text("|".join([flag.tokens["value"] for flag in self.children[Flag]]))
-
 
 class IdentValue(Value):
     grammar = UseIdent("value")
 
-    def emit_xml(self, xml: XmlEmitter):
-        if isinstance(self.parent.value_type, gir.Enumeration):
-            xml.put_text(self.parent.value_type.members[self.tokens["value"]].nick)
-        else:
-            xml.put_text(self.tokens["value"])
-
     @validate()
     def validate_for_type(self):
         type = self.parent.value_type
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 9f2f4c2..124654d 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -25,7 +25,7 @@ from .errors import PrintableError, report_bug, MultipleErrors
 from .lsp import LanguageServer
 from . import parser, tokenizer, decompiler, interactive_port
 from .utils import Colors
-from .xml_emitter import XmlEmitter
+from .outputs import XmlOutput
 
 VERSION = "uninstalled"
 LIBDIR = None
@@ -141,7 +141,9 @@ class BlueprintApp:
         if len(ast.errors):
             raise MultipleErrors(ast.errors)
 
-        return ast.generate(), warnings
+        formatter = XmlOutput()
+
+        return formatter.emit(ast), warnings
 
 
 def main(version, libdir):
diff --git a/blueprintcompiler/outputs/__init__.py b/blueprintcompiler/outputs/__init__.py
new file mode 100644
index 0000000..e3054a3
--- /dev/null
+++ b/blueprintcompiler/outputs/__init__.py
@@ -0,0 +1,7 @@
+from ..language import UI
+
+class OutputFormat:
+    def emit(self, ui: UI) -> str:
+        raise NotImplementedError()
+
+from .xml import XmlOutput
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
new file mode 100644
index 0000000..2cbb425
--- /dev/null
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -0,0 +1,272 @@
+from .. import OutputFormat
+from ...language import *
+from .xml_emitter import XmlEmitter
+
+
+class XmlOutput(OutputFormat):
+    def emit(self, ui: UI) -> str:
+        xml = XmlEmitter()
+        self._emit_ui(ui, xml)
+        return xml.result
+
+    def _emit_ui(self, ui: UI, xml: XmlEmitter):
+        xml.start_tag("interface")
+
+        for x in ui.children:
+            if isinstance(x, GtkDirective):
+                self._emit_gtk_directive(x, xml)
+            elif isinstance(x, Import):
+                pass
+            elif isinstance(x, Template):
+                self._emit_template(x, xml)
+            elif isinstance(x, Object):
+                self._emit_object(x, xml)
+            elif isinstance(x, Menu):
+                self._emit_menu(x, xml)
+            else:
+                raise CompilerBugError()
+
+        xml.end_tag()
+
+    def _emit_gtk_directive(self, gtk: GtkDirective, xml: XmlEmitter):
+        xml.put_self_closing("requires", lib="gtk", version=gtk.gir_namespace.version)
+
+    def _emit_template(self, template: Template, xml: XmlEmitter):
+        xml.start_tag("template", **{"class": template.id}, parent=template.class_name)
+        self._emit_object_or_template(template, xml)
+        xml.end_tag()
+
+    def _emit_object(self, obj: Object, xml: XmlEmitter):
+        xml.start_tag(
+            "object",
+            **{"class": obj.class_name},
+            id=obj.id,
+        )
+        self._emit_object_or_template(obj, xml)
+        xml.end_tag()
+
+    def _emit_object_or_template(self, obj: Object | Template, xml: XmlEmitter):
+        for child in obj.content.children:
+            if isinstance(child, Property):
+                self._emit_property(child, xml)
+            elif isinstance(child, Signal):
+                self._emit_signal(child, xml)
+            elif isinstance(child, Child):
+                self._emit_child(child, xml)
+            else:
+                self._emit_extensions(child, xml)
+
+        # List action widgets
+        action_widgets = obj.action_widgets
+        if action_widgets:
+            xml.start_tag("action-widgets")
+            for action_widget in action_widgets:
+                xml.start_tag(
+                    "action-widget",
+                    response=action_widget.response_id,
+                    default=action_widget.is_default or None,
+                )
+                xml.put_text(action_widget.widget_id)
+                xml.end_tag()
+            xml.end_tag()
+
+    def _emit_menu(self, menu: Menu, xml: XmlEmitter):
+        xml.start_tag(menu.tag, id=menu.id)
+        for child in menu.children:
+            if isinstance(child, Menu):
+                self._emit_menu(child, xml)
+            elif isinstance(child, MenuAttribute):
+                self._emit_attribute("attribute", "name", child.name, child.value, xml)
+            else:
+                raise CompilerBugError()
+        xml.end_tag()
+
+    def _emit_property(self, property: Property, xml: XmlEmitter):
+        values = property.children[Value]
+        value = values[0] if len(values) == 1 else None
+
+        bind_flags = []
+        if property.tokens["bind_source"] and not property.tokens["no_sync_create"]:
+            bind_flags.append("sync-create")
+        if property.tokens["inverted"]:
+            bind_flags.append("invert-boolean")
+        if property.tokens["bidirectional"]:
+            bind_flags.append("bidirectional")
+        bind_flags_str = "|".join(bind_flags) or None
+
+        props = {
+            "name": property.tokens["name"],
+            "bind-source": property.tokens["bind_source"],
+            "bind-property": property.tokens["bind_property"],
+            "bind-flags": bind_flags_str,
+        }
+
+        if isinstance(value, TranslatedStringValue):
+            xml.start_tag("property", **props, **self._translated_string_attrs(value))
+            xml.put_text(value.string)
+            xml.end_tag()
+        elif len(property.children[Object]) == 1:
+            xml.start_tag("property", **props)
+            self._emit_object(property.children[Object][0], xml)
+            xml.end_tag()
+        elif value is None:
+            if property.tokens["binding"]:
+                xml.start_tag("binding", **props)
+                self._emit_expression(property.children[Expr][0], xml)
+                xml.end_tag()
+            else:
+                xml.put_self_closing("property", **props)
+        else:
+            xml.start_tag("property", **props)
+            self._emit_value(value, xml)
+            xml.end_tag()
+
+    def _translated_string_attrs(
+        self, translated: TranslatedStringValue
+    ) -> T.Dict[str, str | None]:
+        return {
+            "translatable": "true",
+            "context": translated.context,
+        }
+
+    def _emit_signal(self, signal: Signal, xml: XmlEmitter):
+        name = signal.name
+        if signal.detail_name:
+            name += "::" + signal.detail_name
+        xml.put_self_closing(
+            "signal",
+            name=name,
+            handler=signal.handler,
+            swapped=signal.is_swapped or None,
+            object=signal.object_id,
+        )
+
+    def _emit_child(self, child: Child, xml: XmlEmitter):
+        child_type = internal_child = None
+
+        if child.tokens["internal_child"]:
+            internal_child = child.tokens["child_type"]
+        else:
+            child_type = child.tokens["child_type"]
+
+        xml.start_tag("child", type=child_type, internal_child=internal_child)
+        self._emit_object(child.object, xml)
+        xml.end_tag()
+
+    def _emit_value(self, value: Value, xml: XmlEmitter):
+        if isinstance(value, IdentValue):
+            if isinstance(value.parent.value_type, gir.Enumeration):
+                xml.put_text(
+                    value.parent.value_type.members[value.tokens["value"]].nick
+                )
+            else:
+                xml.put_text(value.tokens["value"])
+        elif isinstance(value, QuotedValue) or isinstance(value, NumberValue):
+            xml.put_text(value.value)
+        elif isinstance(value, FlagsValue):
+            xml.put_text("|".join([flag.tokens["value"] for flag in value.children]))
+        elif isinstance(value, TranslatedStringValue):
+            raise CompilerBugError("translated values must be handled in the parent")
+        elif isinstance(value, TypeValue):
+            xml.put_text(value.type_name.glib_type_name)
+        else:
+            raise CompilerBugError()
+
+    def _emit_expression(self, expression: Expr, xml: XmlEmitter):
+        self._emit_expression_part(expression.children[-1], xml)
+
+    def _emit_expression_part(self, expression, xml: XmlEmitter):
+        if isinstance(expression, IdentExpr):
+            self._emit_ident_expr(expression, xml)
+        elif isinstance(expression, LookupOp):
+            self._emit_lookup_op(expression, xml)
+        elif isinstance(expression, Expr):
+            self._emit_expression(expression, xml)
+        else:
+            raise CompilerBugError()
+
+    def _emit_ident_expr(self, expr: IdentExpr, xml: XmlEmitter):
+        xml.start_tag("constant")
+        xml.put_text(expr.ident)
+        xml.end_tag()
+
+    def _emit_lookup_op(self, expr: LookupOp, xml: XmlEmitter):
+        xml.start_tag("lookup", name=expr.property_name)
+        self._emit_expression_part(expr.lhs, xml)
+        xml.end_tag()
+
+    def _emit_attribute(
+        self, tag: str, attr: str, name: str, value: Value, xml: XmlEmitter
+    ):
+        attrs = {attr: name}
+
+        if isinstance(value, TranslatedStringValue):
+            xml.start_tag(tag, **attrs, **self._translated_string_attrs(value))
+            xml.put_text(value.string)
+            xml.end_tag()
+        else:
+            xml.start_tag(tag, **attrs)
+            self._emit_value(value, xml)
+            xml.end_tag()
+
+    def _emit_extensions(self, extension, xml: XmlEmitter):
+        if isinstance(extension, A11y):
+            xml.start_tag("accessibility")
+            for child in extension.children:
+                self._emit_attribute(
+                    child.tag_name, "name", child.name, child.children[Value][0], xml
+                )
+            xml.end_tag()
+
+        elif isinstance(extension, Filters):
+            xml.start_tag(extension.tokens["tag_name"])
+            for child in extension.children:
+                xml.start_tag(child.tokens["tag_name"])
+                xml.put_text(child.tokens["name"])
+                xml.end_tag()
+            xml.end_tag()
+
+        elif isinstance(extension, Items):
+            xml.start_tag("items")
+            for child in extension.children:
+                self._emit_attribute(
+                    "item", "id", child.name, child.children[Value][0], xml
+                )
+            xml.end_tag()
+
+        elif isinstance(extension, Layout):
+            xml.start_tag("layout")
+            for child in extension.children:
+                self._emit_attribute(
+                    "property", "name", child.name, child.children[Value][0], xml
+                )
+            xml.end_tag()
+
+        elif isinstance(extension, Strings):
+            xml.start_tag("items")
+            for child in extension.children:
+                value = child.children[Value][0]
+                if isinstance(value, TranslatedStringValue):
+                    xml.start_tag("item", **self._translated_string_attrs(value))
+                    xml.put_text(value.string)
+                    xml.end_tag()
+                else:
+                    xml.start_tag("item")
+                    self._emit_value(value, xml)
+                    xml.end_tag()
+            xml.end_tag()
+
+        elif isinstance(extension, Styles):
+            xml.start_tag("style")
+            for child in extension.children:
+                xml.put_self_closing("class", name=child.tokens["name"])
+            xml.end_tag()
+
+        elif isinstance(extension, Widgets):
+            xml.start_tag("widgets")
+            for child in extension.children:
+                xml.put_self_closing("widget", name=child.tokens["name"])
+            xml.end_tag()
+
+        else:
+            raise CompilerBugError()
diff --git a/blueprintcompiler/xml_emitter.py b/blueprintcompiler/outputs/xml/xml_emitter.py
similarity index 86%
rename from blueprintcompiler/xml_emitter.py
rename to blueprintcompiler/outputs/xml/xml_emitter.py
index d92d1bd..def58b5 100644
--- a/blueprintcompiler/xml_emitter.py
+++ b/blueprintcompiler/outputs/xml/xml_emitter.py
@@ -17,9 +17,10 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-
 from xml.sax import saxutils
-from . import gir
+
+from blueprintcompiler.gir import GirType
+from blueprintcompiler.language.types import ClassName
 
 
 class XmlEmitter:
@@ -29,7 +30,7 @@ class XmlEmitter:
         self._tag_stack = []
         self._needs_newline = False
 
-    def start_tag(self, tag, **attrs):
+    def start_tag(self, tag, **attrs: str | GirType | ClassName | bool | None):
         self._indent()
         self.result += f"<{tag}"
         for key, val in attrs.items():
@@ -55,7 +56,7 @@ class XmlEmitter:
         self.result += f"</{tag}>"
         self._needs_newline = True
 
-    def put_text(self, text):
+    def put_text(self, text: str | int | float):
         self.result += saxutils.escape(str(text))
         self._needs_newline = False
 
@@ -64,7 +65,9 @@ class XmlEmitter:
             self.result += "\n" + " " * (self.indent * len(self._tag_stack))
 
     def _to_string(self, val):
-        if isinstance(val, gir.GirType):
+        if isinstance(val, GirType):
+            return val.glib_type_name
+        elif isinstance(val, ClassName):
             return val.glib_type_name
         else:
             return str(val)
diff --git a/tests/fuzz.py b/tests/fuzz.py
index 4f7c879..1ebd02d 100644
--- a/tests/fuzz.py
+++ b/tests/fuzz.py
@@ -1,6 +1,8 @@
 import os, sys
 from pythonfuzz.main import PythonFuzz
 
+from blueprintcompiler.outputs.xml import XmlOutput
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
 from blueprintcompiler import tokenizer, parser, decompiler, gir
@@ -17,8 +19,9 @@ def fuzz(buf):
         tokens = tokenizer.tokenize(blueprint)
         ast, errors, warnings = parser.parse(tokens)
 
+        xml = XmlOutput()
         if errors is None and len(ast.errors) == 0:
-            actual = ast.generate()
+            xml.emit(ast)
     except CompilerBugError as e:
         raise e
     except PrintableError:
diff --git a/tests/samples/signal.ui b/tests/samples/signal.ui
index 52740fe..b361d69 100644
--- a/tests/samples/signal.ui
+++ b/tests/samples/signal.ui
@@ -5,7 +5,7 @@
     <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"/>
     <signal name="notify::visible" handler="on_button_notify_visible"/>
   </object>
 </interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index b5d3e3e..5f0d9e5 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -28,6 +28,7 @@ from blueprintcompiler.completions import complete
 from blueprintcompiler.errors import PrintableError, MultipleErrors, CompileError
 from blueprintcompiler.tokenizer import Token, TokenType, tokenize
 from blueprintcompiler import utils
+from blueprintcompiler.outputs.xml import XmlOutput
 
 
 class TestSamples(unittest.TestCase):
@@ -56,7 +57,8 @@ class TestSamples(unittest.TestCase):
             if len(warnings):
                 raise MultipleErrors(warnings)
 
-            actual = ast.generate()
+            xml = XmlOutput()
+            actual = xml.emit(ast)
             if actual.strip() != expected.strip(): # pragma: no cover
                 diff = difflib.unified_diff(expected.splitlines(), actual.splitlines())
                 print("\n".join(diff))

From a8a209550baebcdd58717fff8205576a05e8b888 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 18 Oct 2022 15:02:31 -0500
Subject: [PATCH 039/290] typelib: Fix big-endian architectures

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

diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index e8b9152..0946320 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -17,7 +17,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-
+import sys
 import typing as T
 import math
 from ctypes import *
@@ -241,7 +241,7 @@ class Typelib:
         return self._typelib_file[loc:end].decode("utf-8")
 
     def _int(self, size, signed):
-        return int.from_bytes(self._typelib_file[self._offset:self._offset + size], 'little')
+        return int.from_bytes(self._typelib_file[self._offset:self._offset + size], sys.byteorder)
 
 
 class TypelibHeader(Typelib):

From d6c6a66c15613c34cdbafb32ae5facd3bade6ddd Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Tue, 18 Oct 2022 20:49:16 +0000
Subject: [PATCH 040/290] port: Fix directory recursion

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

diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index 10a9b56..229f238 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -87,7 +87,7 @@ def listdir_recursive(subdir):
         full = os.path.join(subdir, file)
         if full == "./subprojects":
             # skip the subprojects directory
-            return
+            continue
         if os.path.isfile(full):
             yield full
         elif os.path.isdir(full):

From 0b8012b8e1b985d8d5d15e163d5e25aa4a168970 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 27 Oct 2022 13:15:58 -0500
Subject: [PATCH 041/290] Support Python 3.9

Remove the '|' syntax for type unions, since it's a 3.10 feature, and
set mypy to check with version 3.9.
---
 .gitlab-ci.yml                                    | 2 +-
 blueprintcompiler/language/gobject_object.py      | 2 +-
 blueprintcompiler/language/gobject_signal.py      | 5 +++--
 blueprintcompiler/language/gtkbuilder_template.py | 3 ++-
 blueprintcompiler/language/values.py              | 5 +++--
 blueprintcompiler/outputs/xml/__init__.py         | 6 ++++--
 blueprintcompiler/outputs/xml/xml_emitter.py      | 6 ++++--
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2790cd1..6982239 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ build:
   image: registry.gitlab.gnome.org/jwestman/blueprint-compiler
   stage: build
   script:
-    - mypy blueprintcompiler
+    - mypy --python-version=3.9 blueprintcompiler
     - coverage run -m unittest
     - coverage report
     - coverage html
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 711795c..2647a5a 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -45,7 +45,7 @@ class Object(AstNode):
         return self.tokens["id"]
 
     @property
-    def class_name(self) -> ClassName | None:
+    def class_name(self) -> T.Optional[ClassName]:
         return self.children[ClassName][0]
 
     @property
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index ba1b48b..1cba801 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -17,6 +17,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+import typing as T
 
 from .gtkbuilder_template import Template
 from .common import *
@@ -45,7 +46,7 @@ class Signal(AstNode):
         return self.tokens["name"]
 
     @property
-    def detail_name(self) -> str | None:
+    def detail_name(self) -> T.Optional[str]:
         return self.tokens["detail_name"]
 
     @property
@@ -53,7 +54,7 @@ class Signal(AstNode):
         return self.tokens["handler"]
 
     @property
-    def object_id(self) -> str | None:
+    def object_id(self) -> T.Optional[str]:
         return self.tokens["object"]
 
     @property
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 35ef4f2..7392782 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -17,6 +17,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+import typing as T
 
 from .gobject_object import Object, ObjectContent
 from .common import *
@@ -39,7 +40,7 @@ class Template(Object):
         return self.tokens["id"]
 
     @property
-    def class_name(self) -> ClassName | None:
+    def class_name(self) -> T.Optional[ClassName]:
         if len(self.children[ClassName]):
             return self.children[ClassName][0]
         else:
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 5030774..2a889ec 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -17,6 +17,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+import typing as T
 
 from .common import *
 from .types import TypeName
@@ -50,7 +51,7 @@ class TranslatedStringValue(Value):
         return self.tokens["value"]
 
     @property
-    def context(self) -> str | None:
+    def context(self) -> T.Optional[str]:
         return self.tokens["context"]
 
 
@@ -116,7 +117,7 @@ class NumberValue(Value):
     grammar = UseNumber("value")
 
     @property
-    def value(self) -> int | float:
+    def value(self) -> T.Union[int, float]:
         return self.tokens["value"]
 
     @validate()
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 2cbb425..e7e33d9 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -1,3 +1,5 @@
+import typing as T
+
 from .. import OutputFormat
 from ...language import *
 from .xml_emitter import XmlEmitter
@@ -45,7 +47,7 @@ class XmlOutput(OutputFormat):
         self._emit_object_or_template(obj, xml)
         xml.end_tag()
 
-    def _emit_object_or_template(self, obj: Object | Template, xml: XmlEmitter):
+    def _emit_object_or_template(self, obj: T.Union[Object, Template], xml: XmlEmitter):
         for child in obj.content.children:
             if isinstance(child, Property):
                 self._emit_property(child, xml)
@@ -123,7 +125,7 @@ class XmlOutput(OutputFormat):
 
     def _translated_string_attrs(
         self, translated: TranslatedStringValue
-    ) -> T.Dict[str, str | None]:
+    ) -> T.Dict[str, T.Optional[str]]:
         return {
             "translatable": "true",
             "context": translated.context,
diff --git a/blueprintcompiler/outputs/xml/xml_emitter.py b/blueprintcompiler/outputs/xml/xml_emitter.py
index def58b5..374b406 100644
--- a/blueprintcompiler/outputs/xml/xml_emitter.py
+++ b/blueprintcompiler/outputs/xml/xml_emitter.py
@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+import typing as T
+
 from xml.sax import saxutils
 
 from blueprintcompiler.gir import GirType
@@ -30,7 +32,7 @@ class XmlEmitter:
         self._tag_stack = []
         self._needs_newline = False
 
-    def start_tag(self, tag, **attrs: str | GirType | ClassName | bool | None):
+    def start_tag(self, tag, **attrs: T.Union[str, GirType, ClassName, bool, None]):
         self._indent()
         self.result += f"<{tag}"
         for key, val in attrs.items():
@@ -56,7 +58,7 @@ class XmlEmitter:
         self.result += f"</{tag}>"
         self._needs_newline = True
 
-    def put_text(self, text: str | int | float):
+    def put_text(self, text: T.Union[str, int, float]):
         self.result += saxutils.escape(str(text))
         self._needs_newline = False
 

From 8efc290e475507a709deb6568b909574cdf51be2 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@sonny.re>
Date: Wed, 2 Nov 2022 15:43:41 +0000
Subject: [PATCH 042/290] doc: Mention history and Workbench

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

diff --git a/docs/index.rst b/docs/index.rst
index 3439413..91b53a2 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -48,21 +48,32 @@ Features
 - **Easy to learn.** The syntax should be very familiar to most people. Scroll
   through the :doc:`examples page <examples>` for a quick overview of the whole
   language.
-- **Modern tooling.** IDE integration for `GNOME Builder <https://developer.gnome.org/documentation/introduction/builder.html>`_
-  is in progress, and a VS Code extension is also planned.
+- **Modern tooling.** Blueprint ships a `Language Server <https://microsoft.github.io/language-server-protocol/>`_ for IDE integration.
 
 Links
 -----
 
 - `Source code <https://gitlab.gnome.org/jwestman/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>`_
 - `Vim syntax highlighting plugin by gabmus <https://gitlab.com/gabmus/vim-blueprint>`_
 - `GNU Emacs major mode by DrBluefall <https://github.com/DrBluefall/blueprint-mode>`_
 - `Visual Studio Code plugin by bodil <https://github.com/bodil/vscode-blueprint>`_
 
+History
+-------
+
+1. `Simplify our UI declarative language, a strawman proposal <https://discourse.gnome.org/t/simplify-our-ui-declarative-language-a-strawman-proposal/2913>`_
+2. `A Markup Language for GTK <https://www.jwestman.net/2021/10/22/a-markup-language-for-gtk.html>`_
+3. `Introducing Blueprint: A New Way to Craft User Interfaces <https://www.jwestman.net/2021/12/02/introducing-blueprint-a-new-way-to-craft-user-interfaces.html>`_
+4. `Next Steps for Blueprint <https://www.jwestman.net/2022/04/12/next-steps-for-blueprint.html>`_
+
 Built with Blueprint
 --------------------
 
+- `AdwSteamGtk <https://github.com/Foldex/AdwSteamGtk>`_
+- `Blurble <https://gitlab.gnome.org/World/Blurble>`_
 - `Bottles <https://github.com/bottlesdevs/Bottles>`_
 - `Commit <https://github.com/sonnyp/Commit/>`_
 - `Dialect <https://github.com/dialect-app/dialect>`_
@@ -72,16 +83,21 @@ Built with Blueprint
 - `File Shredder <https://github.com/ADBeveridge/raider>`_
 - `Geopard <https://github.com/ranfdev/Geopard>`_
 - `Giara <https://gitlab.gnome.org/World/giara>`_
+- `Girens <https://gitlab.gnome.org/tijder/girens>`_
 - `Gradience <https://github.com/GradienceTeam/Gradience>`_
 - `Health <https://gitlab.gnome.org/World/Health>`_
 - `HydraPaper <https://gitlab.com/gabmus/HydraPaper>`_
 - `Identity <https://gitlab.gnome.org/YaLTeR/identity>`_
 - `Junction <https://github.com/sonnyp/Junction/>`_
 - `Login Manager Settings <https://github.com/realmazharhussain/gdm-settings>`_
+- `Maniatic Launcher <https://github.com/santiagocezar/maniatic-launcher/>`_
+- `NewCaw <https://github.com/CodedOre/NewCaw>`_
 - `Paper <https://gitlab.com/posidon_software/paper>`_
 - `Passes <https://github.com/pablo-s/passes>`_
 - `Playhouse <https://github.com/sonnyp/Playhouse>`_
 - `Plitki <https://github.com/YaLTeR/plitki>`_
+- `Raider <https://github.com/ADBeveridge/raider>`_
+- `Retro <https://github.com/sonnyp/Retro>`_
 - `Solanum <https://gitlab.gnome.org/World/Solanum>`_
 - `Swatch <https://gitlab.gnome.org/GabMus/swatch>`_
 - `Tangram <https://github.com/sonnyp/Tangram/>`_

From bc15ac9efbb762e9e960badb5bf35655e5d8603b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 2 Nov 2022 10:18:30 -0500
Subject: [PATCH 043/290] docs: Add warning that blueprint is experimental

---
 docs/_static/styles.css |   8 ++
 docs/conf.py            |   2 +
 docs/experimental.svg   | 163 ++++++++++++++++++++++++++++++++++++++++
 docs/index.rst          |   8 ++
 4 files changed, 181 insertions(+)
 create mode 100644 docs/_static/styles.css
 create mode 100644 docs/experimental.svg

diff --git a/docs/_static/styles.css b/docs/_static/styles.css
new file mode 100644
index 0000000..914861d
--- /dev/null
+++ b/docs/_static/styles.css
@@ -0,0 +1,8 @@
+.experimental-admonition {
+  display: flex;
+  align-items: center;
+}
+
+.experimental-admonition img {
+  width: 64px;
+}
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index fc413d9..b9d6d07 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,3 +50,5 @@ html_theme = 'furo'
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
+
+html_css_files = ['styles.css']
\ No newline at end of file
diff --git a/docs/experimental.svg b/docs/experimental.svg
new file mode 100644
index 0000000..4ebac45
--- /dev/null
+++ b/docs/experimental.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866666"
+   version="1.1"
+   id="svg145234"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   sodipodi:docname="beaker.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview145236"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="2.3786088"
+     inkscape:cx="113.72194"
+     inkscape:cy="67.26621"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid145800" />
+  </sodipodi:namedview>
+  <defs
+     id="defs145231">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath1082">
+      <path
+         sodipodi:nodetypes="ccsccccccccccssccccccsccccc"
+         inkscape:connector-curvature="0"
+         id="path1084"
+         d="m 59.306656,179.84113 c -1.539651,-0.0204 -2.554714,0.50293 -3.259361,1.28705 -0.704636,0.78405 -1.080179,1.88075 -1.080179,2.99185 0,1.1112 0.375543,2.20784 1.080179,2.99194 0.704647,0.78412 1.71971,1.30878 3.259361,1.28701 0.596478,-0.008 1.084356,0.47321 1.084359,1.06974 v 31.27782 c 4e-6,0.2286 -0.07322,0.45119 -0.208928,0.63515 l -29.921313,40.60614 c -5.03e-4,7.6e-4 -0.001,0.001 -0.002,0.002 -1.584091,2.39264 -1.933179,5.40515 -1.95979,7.96457 v 0.004 c -2.1e-5,0.002 2.1e-5,0.004 0,0.006 0.005,8.86974 7.174927,16.0356 16.046057,16.0356 H 97.83189 c 8.8738,0 16.04477,-7.17027 16.04594,-16.04397 -0.007,-2.82242 -0.49265,-5.62802 -1.97021,-7.97704 -9.97128,-13.53236 -19.94162,-27.0653 -29.91287,-40.59772 -0.13575,-0.18403 -0.20895,-0.40672 -0.20888,-0.6354 v -31.27771 c 1e-5,-0.59653 0.48788,-1.07782 1.08436,-1.06973 2.40019,0.0329 4.33954,-1.87832 4.33954,-4.27897 0,-2.40065 -1.93937,-4.31292 -4.33954,-4.27891 -0.005,3e-5 -0.01,3e-5 -0.0145,0 H 59.321313 c -0.0049,3e-5 -0.0097,3e-5 -0.01456,0 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#99c1f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1221"
+       x="-0.12864004"
+       width="1.2572789"
+       y="-0.10374497"
+       height="1.2074448">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="4.1703178"
+         id="feGaussianBlur1223" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1205"
+       id="radialGradient1271"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.9534006,0,0,0.87645096,-163.67294,29.472168)"
+       cx="41.498363"
+       cy="254.6526"
+       fx="41.498363"
+       fy="254.6526"
+       r="34.247517" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1205">
+      <stop
+         style="stop-color:#33d17a;stop-opacity:1"
+         offset="0"
+         id="stop1201" />
+      <stop
+         style="stop-color:#3584e4;stop-opacity:1"
+         offset="1"
+         id="stop1203" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1013"
+       id="radialGradient1273"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(9.0225063,0,0,6.9495164,-619.87454,-1384.9283)"
+       cx="62"
+       cy="229.19627"
+       fx="62"
+       fy="229.19627"
+       r="16.015505" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1013">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop1009" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop1011" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g425"
+       transform="matrix(0.26458333,0,0,0.26458333,32.647151,-39.952084)"
+       style="display:inline;enable-background:new">
+      <g
+         transform="translate(-130.47915,-20)"
+         clip-path="url(#clipPath1082)"
+         id="g1261">
+        <path
+           sodipodi:nodetypes="ccsccccccccccssccccccsccccc"
+           inkscape:connector-curvature="0"
+           id="path1255"
+           d="m 59.306656,179.84113 c -1.539651,-0.0204 -2.554714,0.50293 -3.259361,1.28705 -0.704636,0.78405 -1.080179,1.88075 -1.080179,2.99185 0,1.1112 0.375543,2.20784 1.080179,2.99194 0.704647,0.78412 1.71971,1.30878 3.259361,1.28701 0.596478,-0.008 1.084356,0.47321 1.084359,1.06974 v 31.27782 c 4e-6,0.2286 -0.07322,0.45119 -0.208928,0.63515 l -29.921313,40.60614 c -5.03e-4,7.6e-4 -0.001,0.001 -0.002,0.002 -1.584091,2.39264 -1.933179,5.40515 -1.95979,7.96457 v 0.004 c -2.1e-5,0.002 2.1e-5,0.004 0,0.006 0.005,8.86974 7.174927,16.0356 16.046057,16.0356 H 97.83189 c 8.8738,0 16.04477,-7.17027 16.04594,-16.04397 -0.007,-2.82242 -0.49265,-5.62802 -1.97021,-7.97704 -9.97128,-13.53236 -19.94162,-27.0653 -29.91287,-40.59772 -0.13575,-0.18403 -0.20895,-0.40672 -0.20888,-0.6354 v -31.27771 c 1e-5,-0.59653 0.48788,-1.07782 1.08436,-1.06973 2.40019,0.0329 4.33954,-1.87832 4.33954,-4.27897 0,-2.40065 -1.93937,-4.31292 -4.33954,-4.27891 -0.005,3e-5 -0.01,3e-5 -0.0145,0 H 59.321313 c -0.0049,3e-5 -0.0097,3e-5 -0.01456,0 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.322;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#99c1f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.81;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#1c71d8;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.881889;filter:url(#filter1221);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 59.306656,179.84113 c -1.539651,-0.0204 -2.554714,0.50293 -3.259361,1.28705 -0.704636,0.78405 -1.080179,1.88075 -1.080179,2.99185 0,1.1112 0.375543,2.20784 1.080179,2.99194 0.704647,0.78412 1.71971,1.30878 3.259361,1.28701 0.596478,-0.008 1.084356,0.47321 1.084359,1.06974 v 31.27782 c 4e-6,0.2286 -0.07322,0.45119 -0.208928,0.63515 l -29.921313,40.60614 c -5.03e-4,7.6e-4 -0.001,0.001 -0.002,0.002 -1.584091,2.39264 -1.933179,5.40515 -1.95979,7.96457 v 0.004 c -2.1e-5,0.002 2.1e-5,0.004 0,0.006 0.005,8.86974 7.174927,16.0356 16.046057,16.0356 H 97.83189 c 8.8738,0 16.04477,-7.17027 16.04594,-16.04397 -0.007,-2.82242 -0.49265,-5.62802 -1.97021,-7.97704 -9.97128,-13.53236 -19.94162,-27.0653 -29.91287,-40.59772 -0.13575,-0.18403 -0.20895,-0.40672 -0.20888,-0.6354 v -31.27771 c 1e-5,-0.59653 0.48788,-1.07782 1.08436,-1.06973 2.40019,0.0329 4.33954,-1.87832 4.33954,-4.27897 0,-2.40065 -1.93937,-4.31292 -4.33954,-4.27891 -0.005,3e-5 -0.01,3e-5 -0.0145,0 H 59.321313 c -0.0049,3e-5 -0.0097,3e-5 -0.01456,0 z"
+           id="path1257"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsccccccccccssccccccsccccc" />
+        <path
+           d="m 79,221 h 10 m -10,-4 h 10 m -10,-4 h 10 m -14,-4 h 10 m -6,-4 h 10 m -10,-4 h 10 m -10,-4 h 10 m -14,-4 h 10"
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.519685"
+           id="path1259"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccsscccccccc"
+         inkscape:connector-curvature="0"
+         id="path1263"
+         d="m -34.29794,233.66755 8.04173,10.91453 c 0.74491,1.13854 1.09081,3.07356 1.11345,5.02175 -0.009,5.8719 -4.66171,10.51971 -10.53703,10.51971 h -47.42097 c -5.87918,0 -10.53438,-4.65437 -10.53704,-10.53357 0.006,-2.0657 0.38011,-3.80592 1.16367,-5.07197 2.665,-3.61676 5.32998,-7.23362 7.99498,-10.85045 10.97111,12.38168 41.40432,-11.28458 50.18121,0 z m 8.04173,10.90414 c 0.0181,0.0184 0.48159,0.49211 0.74461,0.76019 -0.11172,-0.0775 -0.28578,-0.19921 -0.28572,-0.19914 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#1c71d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#radialGradient1271);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -84.48262,233.66755 -8.04173,10.91453 c -0.7449,1.13854 -1.09081,3.07356 -1.11345,5.02175 0.009,5.8719 4.66171,10.51971 10.53703,10.51971 h 47.42097 c 5.87918,0 10.53438,-4.65437 10.53704,-10.53357 -0.006,-2.0657 -0.38011,-3.80592 -1.16366,-5.07197 -2.66501,-3.61676 -5.32999,-7.23362 -7.99499,-10.85045 -10.97111,12.38168 -41.40431,-11.28458 -50.18121,0 z m -8.04173,10.90414 c -0.0181,0.0184 -0.48159,0.49211 -0.74461,0.76019 0.11172,-0.0775 0.28578,-0.19921 0.28572,-0.19914 z"
+         id="path1265"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccsscccccccc" />
+      <path
+         sodipodi:nodetypes="cssccccsscc"
+         inkscape:connector-curvature="0"
+         id="path1267"
+         d="M -16.64126,250.7207 C -17.04348,259.23501 -24.03184,266 -32.64712,266 h -53.48633 c -8.54507,0 -15.493,-6.65433 -15.99804,-15.07031 -0.0161,0.34274 -0.0454,0.69541 -0.0488,1.02539 v 0.004 c -2e-5,0.002 2e-5,0.004 0,0.006 0.005,8.8695 7.17574,16.03492 16.04687,16.03492 h 53.48633 c 8.8738,0 16.04375,-7.17122 16.04492,-16.04492 -10e-4,-0.41261 -0.016,-0.82386 -0.0391,-1.23438 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.623;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#1a5fb4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path1269"
+         d="m -66.48305,207.95117 a 4.0004,4.0004 0 0 0 -3.49219,2.10547 l -20,36 a 4.0004,4.0004 0 1 0 6.99219,3.88672 l 20,-36 a 4.0004,4.0004 0 0 0 -3.5,-5.99219 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.48;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#radialGradient1273);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" />
+    </g>
+  </g>
+</svg>
diff --git a/docs/index.rst b/docs/index.rst
index 91b53a2..dcde058 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,6 +1,14 @@
 Overview
 ========
 
+.. warning::
+  .. container:: experimental-admonition
+
+     .. image:: experimental.svg
+
+     **Blueprint is still experimental.** Future versions may have breaking changes, and most GTK tutorials use XML syntax.
+
+
 Blueprint is a markup language and compiler for GTK 4 user interfaces.
 
 .. toctree::

From 86b07ef0aec07d2d5d1f85c861094be637fbf24d Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 22 Nov 2022 11:38:00 -0600
Subject: [PATCH 044/290] Fix new mypy errors

---
 blueprintcompiler/errors.py     | 2 +-
 blueprintcompiler/parse_tree.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 70aea2a..e3bc787 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -141,7 +141,7 @@ class CompilerBugError(Exception):
     """ Emitted on assertion errors """
 
 
-def assert_true(truth: bool, message:str=None):
+def assert_true(truth: bool, message: T.Optional[str]=None):
     if not truth:
         raise CompilerBugError(message)
 
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index bc36415..0e2644b 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -444,7 +444,7 @@ class Match(ParseNode):
         token = ctx.next_token()
         return str(token) == self.op
 
-    def expected(self, expect: str = None):
+    def expected(self, expect: T.Optional[str] = None):
         """ Convenience method for err(). """
         if expect is None:
             return self.err(f"Expected '{self.op}'")

From 46a06bb7b699cca896e248b4781a13282beda0f2 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 22 Nov 2022 11:43:19 -0600
Subject: [PATCH 045/290] docs: Fix version in flatpak docs

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

diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index 6c40a9b..7382b47 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -16,7 +16,7 @@ a module in your flatpak manifest:
        {
          "type": "git",
          "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-         "branch": "main"
+         "tag": "v0.4.0"
        }
      ]
    }

From d8f1b41ef07057f35de135ef9e8a40ae51a9741d Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 26 Nov 2022 16:44:43 -0600
Subject: [PATCH 046/290] docs: Document the new typeof() operator

---
 docs/examples.rst | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/examples.rst b/docs/examples.rst
index 9b123d2..13b97a8 100644
--- a/docs/examples.rst
+++ b/docs/examples.rst
@@ -161,6 +161,26 @@ Defining object properties inline
    Note the semicolon after the closing brace of the ``Gtk.Adjustment``. It is
    required.
 
+Type Literals
+~~~~~~~~~~~~~
+
+Some properties have the type `GObject.Type <https://docs.gtk.org/gobject/alias.Type.html>`_, that is, their value is
+itself a description of a type in the GObject type system. An example is
+`Gio.ListStore:item-type <https://docs.gtk.org/gio/property.ListStore.item-type.html>`_. Such properties can be
+specified with the ``typeof()`` operator:
+
+.. code-block::
+
+   Gio.ListStore {
+     item-type: typeof(.MyDataModel);
+   }
+
+.. note::
+
+   Though it looks like a function, ``typeof()`` is actually a special operator. This is an important syntactic
+   distinction because the argument to ``typeof()`` is interpreted at the grammar level as a type, not a value or
+   expression.
+
 Bindings
 ~~~~~~~~
 

From b915c227f899473d807b609b29dfd4a52416db10 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 26 Nov 2022 17:10:53 -0600
Subject: [PATCH 047/290] Fix type declaration

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

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index b1610d7..6e43e3b 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -95,7 +95,7 @@ class LanguageServer:
 
     def __init__(self):
         self.client_capabilities = {}
-        self._open_files: {str: OpenFile} = {}
+        self._open_files: T.Dict[str, OpenFile] = {}
 
     def run(self):
         # Read <doc> tags from gir files. During normal compilation these are

From 97f0feaf7ea9ada0bd6ac51d6efd497a317009ca Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 26 Nov 2022 17:14:12 -0600
Subject: [PATCH 048/290] Update MAINTENANCE.md

---
 MAINTENANCE.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MAINTENANCE.md b/MAINTENANCE.md
index a487b88..3f62476 100644
--- a/MAINTENANCE.md
+++ b/MAINTENANCE.md
@@ -2,7 +2,9 @@
 
 1. Look at the git log since the previous release. Note every significant change
 in the NEWS file.
-2. Update the version number at the top of meson.build according to semver.
+2. Update the version number, according to semver:
+  - At the top of meson.build
+  - In docs/flatpak.rst
 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.

From 9adcab2d225fd6435edc85c72a0b67e33880e00b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 26 Nov 2022 17:14:49 -0600
Subject: [PATCH 049/290] Release v0.6.0

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

diff --git a/NEWS.md b/NEWS.md
index 0997afb..276d879 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,10 +1,31 @@
-# v0.6.0 (unreleased)
+# v0.6.0
 
 ## Breaking Changes
-- Quoted and numeric literals are no longer interchangeable (e.g. `"800"` is
-no longer an accepted value for an integer type).
+- Quoted and numeric literals are no longer interchangeable (e.g. `"800"` is no longer an accepted value for an
+  integer type).
 - Boxed types are now type checked.
 
+## Added
+- There is now syntax for `GType` literals: the `typeof()` pseudo-function. For example, list stores have an `item-type`
+  property which is now specifiable like this: `item-type: typeof(.MyDataModel)`. See the documentation for more details.
+
+## Changed
+- The language server now logs to stderr.
+
+## Fixed
+- Fix the build on Windows, where backslashes in paths were not escaped. (William Roy)
+- Remove the syntax for specifying menu objects inline, since it does not work.
+- Fix a crash in the language server that was triggered in files with incomplete `using Gtk 4.0;` statements.
+- Fixed compilation on big-endian systems.
+- Fix an issue in the interactive port tool that would lead to missed files. (Frank Dana)
+
+## Documentation
+- Fix an issue for documentation contributors where changing the documentation files would not trigger a rebuild.
+- Document the missing support for Gtk.Label `<attributes>`, which is intentional, and recommend alternatives. (Sonny
+  Piers)
+- Add a prominent warning that Blueprint is still experimental
+
+
 # v0.4.0
 
 ## Added
diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index 7382b47..f848671 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -16,7 +16,7 @@ a module in your flatpak manifest:
        {
          "type": "git",
          "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-         "tag": "v0.4.0"
+         "tag": "v0.6.0"
        }
      ]
    }
diff --git a/meson.build b/meson.build
index be517bc..2642084 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.5.0',
+  version: '0.6.0',
 )
 
 subdir('docs')

From 00a31d87bbac71133a7080a027e02371b511bdef Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 26 Nov 2022 17:20:04 -0600
Subject: [PATCH 050/290] Post-release version bump

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

diff --git a/meson.build b/meson.build
index 2642084..186c967 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.6.0',
+  version: '0.7.0',
 )
 
 subdir('docs')

From 6a36d923800738dbec65fa6ad9a992e5de89801a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 29 Nov 2022 09:19:31 -0600
Subject: [PATCH 051/290] ci: Update regression tests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6982239..598481b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ build:
     - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
-    - git checkout 94613f275efc810610768d5ee8b2aec28392c3e8
+    - git checkout e1a2b04ce13838794eec9678deff95802fa278d1
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'

From 8fee46ec686ca4232feffea6c6d1b51daff4f4c0 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 19 Dec 2022 11:49:10 -0600
Subject: [PATCH 052/290] Format using black

---
 blueprintcompiler/ast_utils.py                |  28 ++-
 blueprintcompiler/completions.py              |  49 +++--
 blueprintcompiler/completions_utils.py        |  15 +-
 blueprintcompiler/decompiler.py               | 103 +++++++---
 blueprintcompiler/errors.py                   |  51 +++--
 blueprintcompiler/gir.py                      | 127 ++++++++----
 blueprintcompiler/interactive_port.py         | 107 +++++++---
 blueprintcompiler/language/__init__.py        |  11 +-
 blueprintcompiler/language/attributes.py      |   6 +-
 blueprintcompiler/language/gobject_object.py  |   9 +-
 .../language/gobject_property.py              |  41 ++--
 blueprintcompiler/language/gobject_signal.py  |  31 ++-
 blueprintcompiler/language/gtk_a11y.py        |  13 +-
 .../language/gtk_combo_box_text.py            |  17 +-
 blueprintcompiler/language/gtk_file_filter.py |  18 +-
 blueprintcompiler/language/gtk_layout.py      |   7 +-
 blueprintcompiler/language/gtk_menu.py        | 120 +++++-------
 blueprintcompiler/language/gtk_size_group.py  |   2 +-
 blueprintcompiler/language/gtk_string_list.py |   5 +-
 blueprintcompiler/language/gtk_styles.py      |   3 +-
 .../language/gtkbuilder_child.py              |  27 ++-
 .../language/gtkbuilder_template.py           |  14 +-
 blueprintcompiler/language/imports.py         |  13 +-
 blueprintcompiler/language/response_id.py     |  24 +--
 blueprintcompiler/language/types.py           |  15 +-
 blueprintcompiler/language/ui.py              |  28 +--
 blueprintcompiler/language/values.py          |  43 ++--
 blueprintcompiler/lsp.py                      | 185 +++++++++++-------
 blueprintcompiler/lsp_utils.py                |  10 +-
 blueprintcompiler/main.py                     |  43 ++--
 blueprintcompiler/outputs/__init__.py         |   2 +
 blueprintcompiler/parse_tree.py               | 182 ++++++++++-------
 blueprintcompiler/parser.py                   |   2 +-
 blueprintcompiler/tokenizer.py                |  48 ++---
 blueprintcompiler/typelib.py                  |   4 +-
 blueprintcompiler/utils.py                    |  30 +--
 blueprintcompiler/xml_reader.py               |  31 +--
 tests/fuzz.py                                 |   9 +-
 tests/test_samples.py                         |  30 +--
 tests/test_tokenizer.py                       |  82 ++++----
 40 files changed, 975 insertions(+), 610 deletions(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index cc5c44d..e4f2efa 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -26,11 +26,14 @@ from .lsp_utils import SemanticToken
 
 
 class Children:
-    """ Allows accessing children by type using array syntax. """
+    """Allows accessing children by type using array syntax."""
+
     def __init__(self, children):
         self._children = children
+
     def __iter__(self):
         return iter(self._children)
+
     def __getitem__(self, key):
         if isinstance(key, int):
             return self._children[key]
@@ -39,7 +42,7 @@ class Children:
 
 
 class AstNode:
-    """ Base class for nodes in the abstract syntax tree. """
+    """Base class for nodes in the abstract syntax tree."""
 
     completers: T.List = []
 
@@ -55,8 +58,9 @@ class AstNode:
 
     def __init_subclass__(cls):
         cls.completers = []
-        cls.validators = [getattr(cls, f) for f in dir(cls) if hasattr(getattr(cls, f), "_validator")]
-
+        cls.validators = [
+            getattr(cls, f) for f in dir(cls) if hasattr(getattr(cls, f), "_validator")
+        ]
 
     @property
     def root(self):
@@ -116,13 +120,11 @@ class AstNode:
         for child in self.children:
             yield from child.get_semantic_tokens()
 
-
     def iterate_children_recursive(self) -> T.Iterator["AstNode"]:
         yield self
         for child in self.children:
             yield from child.iterate_children_recursive()
 
-
     def validate_unique_in_parent(self, error, check=None):
         for child in self.parent.children:
             if child is self:
@@ -132,13 +134,19 @@ class AstNode:
                 if check is None or check(child):
                     raise CompileError(
                         error,
-                        references=[ErrorReference(child.group.start, child.group.end, "previous declaration was here")]
+                        references=[
+                            ErrorReference(
+                                child.group.start,
+                                child.group.end,
+                                "previous declaration was here",
+                            )
+                        ],
                     )
 
 
 def validate(token_name=None, end_token_name=None, skip_incomplete=False):
-    """ Decorator for functions that validate an AST node. Exceptions raised
-    during validation are marked with range information from the tokens. """
+    """Decorator for functions that validate an AST node. Exceptions raised
+    during validation are marked with range information from the tokens."""
 
     def decorator(func):
         def inner(self):
@@ -191,7 +199,7 @@ class Docs:
 
 
 def docs(*args, **kwargs):
-    """ Decorator for functions that return documentation for tokens. """
+    """Decorator for functions that return documentation for tokens."""
 
     def decorator(func):
         return Docs(func, *args, **kwargs)
diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index 7566f18..085baee 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -30,9 +30,13 @@ from .tokenizer import TokenType, Token
 Pattern = T.List[T.Tuple[TokenType, T.Optional[str]]]
 
 
-def _complete(ast_node: AstNode, tokens: T.List[Token], idx: int, token_idx: int) -> T.Iterator[Completion]:
+def _complete(
+    ast_node: AstNode, tokens: T.List[Token], idx: int, token_idx: int
+) -> T.Iterator[Completion]:
     for child in ast_node.children:
-        if child.group.start <= idx and (idx < child.group.end or (idx == child.group.end and child.incomplete)):
+        if child.group.start <= idx and (
+            idx < child.group.end or (idx == child.group.end and child.incomplete)
+        ):
             yield from _complete(child, tokens, idx, token_idx)
             return
 
@@ -49,7 +53,9 @@ def _complete(ast_node: AstNode, tokens: T.List[Token], idx: int, token_idx: int
         yield from completer(prev_tokens, ast_node)
 
 
-def complete(ast_node: AstNode, tokens: T.List[Token], idx: int) -> T.Iterator[Completion]:
+def complete(
+    ast_node: AstNode, tokens: T.List[Token], idx: int
+) -> T.Iterator[Completion]:
     token_idx = 0
     # find the current token
     for i, token in enumerate(tokens):
@@ -71,13 +77,17 @@ def using_gtk(ast_node, match_variables):
 
 @completer(
     applies_in=[language.UI, language.ObjectContent, language.Template],
-    matches=new_statement_patterns
+    matches=new_statement_patterns,
 )
 def namespace(ast_node, match_variables):
     yield Completion("Gtk", CompletionItemKind.Module, text="Gtk.")
     for ns in ast_node.root.children[language.Import]:
         if ns.gir_namespace is not None:
-            yield Completion(ns.gir_namespace.name, CompletionItemKind.Module, text=ns.gir_namespace.name + ".")
+            yield Completion(
+                ns.gir_namespace.name,
+                CompletionItemKind.Module,
+                text=ns.gir_namespace.name + ".",
+            )
 
 
 @completer(
@@ -85,7 +95,7 @@ def namespace(ast_node, match_variables):
     matches=[
         [(TokenType.IDENT, None), (TokenType.OP, "."), (TokenType.IDENT, None)],
         [(TokenType.IDENT, None), (TokenType.OP, ".")],
-    ]
+    ],
 )
 def object_completer(ast_node, match_variables):
     ns = ast_node.root.gir.namespaces.get(match_variables[0])
@@ -117,9 +127,7 @@ def property_completer(ast_node, match_variables):
 
 @completer(
     applies_in=[language.Property, language.BaseTypedAttribute],
-    matches=[
-        [(TokenType.IDENT, None), (TokenType.OP, ":")]
-    ],
+    matches=[[(TokenType.IDENT, None), (TokenType.OP, ":")]],
 )
 def prop_value_completer(ast_node, match_variables):
     if isinstance(ast_node.value_type, gir.Enumeration):
@@ -141,16 +149,23 @@ def signal_completer(ast_node, match_variables):
             if not isinstance(ast_node.parent, language.Object):
                 name = "on"
             else:
-                name = "on_" + (ast_node.parent.children[ClassName][0].tokens["id"] or ast_node.parent.children[ClassName][0].tokens["class_name"].lower())
-            yield Completion(signal, CompletionItemKind.Property, snippet=f"{signal} => ${{1:{name}_{signal.replace('-', '_')}}}()$0;")
+                name = "on_" + (
+                    ast_node.parent.children[ClassName][0].tokens["id"]
+                    or ast_node.parent.children[ClassName][0]
+                    .tokens["class_name"]
+                    .lower()
+                )
+            yield Completion(
+                signal,
+                CompletionItemKind.Property,
+                snippet=f"{signal} => ${{1:{name}_{signal.replace('-', '_')}}}()$0;",
+            )
 
 
-@completer(
-    applies_in=[language.UI],
-    matches=new_statement_patterns
-)
+@completer(applies_in=[language.UI], matches=new_statement_patterns)
 def template_completer(ast_node, match_variables):
     yield Completion(
-        "template", CompletionItemKind.Snippet,
-        snippet="template ${1:ClassName} : ${2:ParentClass} {\n  $0\n}"
+        "template",
+        CompletionItemKind.Snippet,
+        snippet="template ${1:ClassName} : ${2:ParentClass} {\n  $0\n}",
     )
diff --git a/blueprintcompiler/completions_utils.py b/blueprintcompiler/completions_utils.py
index 85f5159..b9811b9 100644
--- a/blueprintcompiler/completions_utils.py
+++ b/blueprintcompiler/completions_utils.py
@@ -32,20 +32,25 @@ new_statement_patterns = [
 
 
 def applies_to(*ast_types):
-    """ Decorator describing which AST nodes the completer should apply in. """
+    """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 completer(applies_in: T.List, matches: T.List = [], applies_in_subclass=None):
     def decorator(func):
         def inner(prev_tokens: T.List[Token], ast_node):
             # For completers that apply in ObjectContent nodes, we can further
             # check that the object is the right class
             if applies_in_subclass is not None:
-                type = ast_node.root.gir.get_type(applies_in_subclass[1], applies_in_subclass[0])
+                type = ast_node.root.gir.get_type(
+                    applies_in_subclass[1], applies_in_subclass[0]
+                )
                 if ast_node.gir_class and not ast_node.gir_class.assignable_to(type):
                     return
 
@@ -59,7 +64,9 @@ def completer(applies_in: T.List, matches: T.List=[], applies_in_subclass=None):
                     for i in range(0, len(pattern)):
                         type, value = pattern[i]
                         token = prev_tokens[i - len(pattern)]
-                        if token.type != type or (value is not None and str(token) != value):
+                        if token.type != type or (
+                            value is not None and str(token) != value
+                        ):
                             break
                         if value is None:
                             match_variables.append(str(token))
diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index cd66386..145e4be 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -60,16 +60,16 @@ class DecompileCtx:
 
         self.gir.add_namespace(get_namespace("Gtk", "4.0"))
 
-
     @property
     def result(self):
-        imports = "\n".join([
-            f"using {ns} {namespace.version};"
-            for ns, namespace in self.gir.namespaces.items()
-        ])
+        imports = "\n".join(
+            [
+                f"using {ns} {namespace.version};"
+                for ns, namespace in self.gir.namespaces.items()
+            ]
+        )
         return imports + "\n" + self._result
 
-
     def type_by_cname(self, cname):
         if type := self.gir.get_type_by_cname(cname):
             return type
@@ -83,7 +83,6 @@ class DecompileCtx:
             except:
                 pass
 
-
     def start_block(self):
         self._blocks_need_end.append(None)
 
@@ -94,7 +93,6 @@ class DecompileCtx:
     def end_block_with(self, text):
         self._blocks_need_end[-1] = text
 
-
     def print(self, line, newline=True):
         if line == "}" or line == "]":
             self._indent -= 1
@@ -109,7 +107,11 @@ class DecompileCtx:
                 line_type = LineType.STMT
             else:
                 line_type = LineType.NONE
-            if line_type != self._last_line_type and self._last_line_type != LineType.BLOCK_START and line_type != LineType.BLOCK_END:
+            if (
+                line_type != self._last_line_type
+                and self._last_line_type != LineType.BLOCK_START
+                and line_type != LineType.BLOCK_END
+            ):
                 self._result += "\n"
             self._last_line_type = line_type
 
@@ -127,10 +129,10 @@ class DecompileCtx:
             for member in type.members.values():
                 if member.nick == value or member.c_ident == value:
                     return member.name
-            return value.replace('-', '_')
+            return value.replace("-", "_")
 
         if type is None:
-            self.print(f"{name}: \"{escape_quote(value)}\";")
+            self.print(f'{name}: "{escape_quote(value)}";')
         elif type.assignable_to(FloatType()):
             self.print(f"{name}: {value};")
         elif type.assignable_to(BoolType()):
@@ -139,12 +141,20 @@ class DecompileCtx:
         elif (
             type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gdk.Pixbuf"))
             or type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gdk.Texture"))
-            or type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gdk.Paintable"))
-            or type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gtk.ShortcutAction"))
-            or type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("Gtk.ShortcutTrigger"))
+            or type.assignable_to(
+                self.gir.namespaces["Gtk"].lookup_type("Gdk.Paintable")
+            )
+            or type.assignable_to(
+                self.gir.namespaces["Gtk"].lookup_type("Gtk.ShortcutAction")
+            )
+            or type.assignable_to(
+                self.gir.namespaces["Gtk"].lookup_type("Gtk.ShortcutTrigger")
+            )
+        ):
+            self.print(f'{name}: "{escape_quote(value)}";')
+        elif type.assignable_to(
+            self.gir.namespaces["Gtk"].lookup_type("GObject.Object")
         ):
-            self.print(f"{name}: \"{escape_quote(value)}\";")
-        elif type.assignable_to(self.gir.namespaces["Gtk"].lookup_type("GObject.Object")):
             self.print(f"{name}: {value};")
         elif isinstance(type, Bitfield):
             flags = [get_enum_name(flag) for flag in value.split("|")]
@@ -152,7 +162,7 @@ class DecompileCtx:
         elif isinstance(type, Enumeration):
             self.print(f"{name}: {get_enum_name(value)};")
         else:
-            self.print(f"{name}: \"{escape_quote(value)}\";")
+            self.print(f'{name}: "{escape_quote(value)}";')
 
 
 def _decompile_element(ctx: DecompileCtx, gir, xml):
@@ -191,19 +201,21 @@ def decompile(data):
     return ctx.result
 
 
-
 def canon(string: str) -> str:
     if string == "class":
         return "klass"
     else:
         return string.replace("-", "_").lower()
 
+
 def truthy(string: str) -> bool:
     return string.lower() in ["yes", "true", "t", "y", "1"]
 
+
 def full_name(gir):
     return gir.name if gir.full_name.startswith("Gtk.") else gir.full_name
 
+
 def lookup_by_cname(gir, cname: str):
     if isinstance(gir, GirContext):
         return gir.get_type_by_cname(cname)
@@ -216,15 +228,17 @@ def decompiler(tag, cdata=False):
         func._cdata = cdata
         _DECOMPILERS[tag] = func
         return func
+
     return decorator
 
 
 def escape_quote(string: str) -> str:
-    return (string
-            .replace("\\", "\\\\")
-            .replace("\'", "\\'")
-            .replace("\"", "\\\"")
-            .replace("\n", "\\n"))
+    return (
+        string.replace("\\", "\\\\")
+        .replace("'", "\\'")
+        .replace('"', '\\"')
+        .replace("\n", "\\n")
+    )
 
 
 @decompiler("interface")
@@ -243,7 +257,18 @@ def decompile_placeholder(ctx, gir):
 
 
 @decompiler("property", cdata=True)
-def decompile_property(ctx, gir, name, cdata, bind_source=None, bind_property=None, bind_flags=None, translatable="false", comments=None, context=None):
+def decompile_property(
+    ctx,
+    gir,
+    name,
+    cdata,
+    bind_source=None,
+    bind_property=None,
+    bind_flags=None,
+    translatable="false",
+    comments=None,
+    context=None,
+):
     name = name.replace("_", "-")
     if comments is not None:
         ctx.print(f"/* Translators: {comments} */")
@@ -263,18 +288,32 @@ def decompile_property(ctx, gir, name, cdata, bind_source=None, bind_property=No
         ctx.print(f"{name}: bind {bind_source}.{bind_property}{flags};")
     elif truthy(translatable):
         if context is not None:
-            ctx.print(f"{name}: C_(\"{escape_quote(context)}\", \"{escape_quote(cdata)}\");")
+            ctx.print(
+                f'{name}: C_("{escape_quote(context)}", "{escape_quote(cdata)}");'
+            )
         else:
-            ctx.print(f"{name}: _(\"{escape_quote(cdata)}\");")
+            ctx.print(f'{name}: _("{escape_quote(cdata)}");')
     elif gir is None or gir.properties.get(name) is None:
-        ctx.print(f"{name}: \"{escape_quote(cdata)}\";")
+        ctx.print(f'{name}: "{escape_quote(cdata)}";')
     else:
         ctx.print_attribute(name, cdata, gir.properties.get(name).type)
     return gir
 
+
 @decompiler("attribute", cdata=True)
-def decompile_attribute(ctx, gir, name, cdata, translatable="false", comments=None, context=None):
-    decompile_property(ctx, gir, name, cdata, translatable=translatable, comments=comments, context=context)
+def decompile_attribute(
+    ctx, gir, name, cdata, translatable="false", comments=None, context=None
+):
+    decompile_property(
+        ctx,
+        gir,
+        name,
+        cdata,
+        translatable=translatable,
+        comments=comments,
+        context=context,
+    )
+
 
 @decompiler("attributes")
 def decompile_attributes(ctx, gir):
@@ -291,5 +330,7 @@ class UnsupportedError(Exception):
         print(f"in {Colors.UNDERLINE}{filename}{Colors.NO_UNDERLINE}")
         if self.tag:
             print(f"in tag {Colors.BLUE}{self.tag}{Colors.CLEAR}")
-        print(f"""{Colors.FAINT}The compiler might support this feature, but the porting tool does not. You
-probably need to port this file manually.{Colors.CLEAR}\n""")
+        print(
+            f"""{Colors.FAINT}The compiler might support this feature, but the porting tool does not. You
+probably need to port this file manually.{Colors.CLEAR}\n"""
+        )
diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index e3bc787..7ddaef0 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -23,9 +23,10 @@ import sys, traceback
 from . import utils
 from .utils import Colors
 
+
 class PrintableError(Exception):
-    """ Parent class for errors that can be pretty-printed for the user, e.g.
-    compilation warnings and errors. """
+    """Parent class for errors that can be pretty-printed for the user, e.g.
+    compilation warnings and errors."""
 
     def pretty_print(self, filename, code):
         raise NotImplementedError()
@@ -39,12 +40,22 @@ class ErrorReference:
 
 
 class CompileError(PrintableError):
-    """ A PrintableError with a start/end position and optional hints """
+    """A PrintableError with a start/end position and optional hints"""
 
     category = "error"
     color = Colors.RED
 
-    def __init__(self, message, start=None, end=None, did_you_mean=None, hints=None, actions=None, fatal=False, references=None):
+    def __init__(
+        self,
+        message,
+        start=None,
+        end=None,
+        did_you_mean=None,
+        hints=None,
+        actions=None,
+        fatal=False,
+        references=None,
+    ):
         super().__init__(message)
 
         self.message = message
@@ -62,7 +73,6 @@ class CompileError(PrintableError):
         self.hints.append(hint)
         return self
 
-
     def _did_you_mean(self, word: str, options: T.List[str]):
         if word.replace("_", "-") in options:
             self.hint(f"use '-', not '_': `{word.replace('_', '-')}`")
@@ -86,9 +96,11 @@ class CompileError(PrintableError):
         # Display 1-based line numbers
         line_num += 1
 
-        stream.write(f"""{self.color}{Colors.BOLD}{self.category}: {self.message}{Colors.CLEAR}
+        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)}^{Colors.CLEAR}\n"""
+        )
 
         for hint in self.hints:
             stream.write(f"{Colors.FAINT}hint: {hint}{Colors.CLEAR}\n")
@@ -98,9 +110,11 @@ at {filename} line {line_num} column {col_num}:
             line = code.splitlines(True)[line_num]
             line_num += 1
 
-            stream.write(f"""{Colors.FAINT}note: {ref.message}:
+            stream.write(
+                f"""{Colors.FAINT}note: {ref.message}:
 at {filename} line {line_num} column {col_num}:
-{Colors.FAINT}{line_num :>4} |{line.rstrip()}\n     {Colors.FAINT}|{" "*(col_num-1)}^{Colors.CLEAR}\n""")
+{Colors.FAINT}{line_num :>4} |{line.rstrip()}\n     {Colors.FAINT}|{" "*(col_num-1)}^{Colors.CLEAR}\n"""
+            )
 
         stream.write("\n")
 
@@ -122,9 +136,9 @@ class CodeAction:
 
 
 class MultipleErrors(PrintableError):
-    """ If multiple errors occur during compilation, they can be collected into
+    """If multiple errors occur during compilation, they can be collected into
     a list and re-thrown using the MultipleErrors exception. It will
-    pretty-print all of the errors and a count of how many errors there are. """
+    pretty-print all of the errors and a count of how many errors there are."""
 
     def __init__(self, errors: T.List[CompileError]):
         super().__init__()
@@ -138,24 +152,25 @@ class MultipleErrors(PrintableError):
 
 
 class CompilerBugError(Exception):
-    """ Emitted on assertion errors """
+    """Emitted on assertion errors"""
 
 
-def assert_true(truth: bool, message: T.Optional[str]=None):
+def assert_true(truth: bool, message: T.Optional[str] = None):
     if not truth:
         raise CompilerBugError(message)
 
 
-def report_bug(): # pragma: no cover
-    """ Report an error and ask people to report it. """
+def report_bug():  # pragma: no cover
+    """Report an error and ask people to report it."""
 
     print(traceback.format_exc())
     print(f"Arguments: {sys.argv}\n")
-    print(f"""{Colors.BOLD}{Colors.RED}***** COMPILER BUG *****
+    print(
+        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.CLEAR}""")
+{Colors.CLEAR}"""
+    )
 
     sys.exit(1)
-
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 78335ee..a1bb419 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -21,9 +21,10 @@ from functools import cached_property
 import typing as T
 import os, sys
 
-import gi # type: ignore
+import gi  # type: ignore
+
 gi.require_version("GIRepository", "2.0")
-from gi.repository import GIRepository # type: ignore
+from gi.repository import GIRepository  # type: ignore
 
 from .errors import CompileError, CompilerBugError
 from . import typelib, xml_reader
@@ -60,10 +61,13 @@ def get_namespace(namespace, version) -> "Namespace":
 def get_xml(namespace, version):
     from .main import VERSION
     from xml.etree import ElementTree
+
     search_paths = []
 
     if data_paths := os.environ.get("XDG_DATA_DIRS"):
-        search_paths += [os.path.join(path, "gir-1.0") for path in data_paths.split(os.pathsep)]
+        search_paths += [
+            os.path.join(path, "gir-1.0") for path in data_paths.split(os.pathsep)
+        ]
 
     filename = f"{namespace}-{version}.gir"
 
@@ -104,36 +108,57 @@ class BasicType(GirType):
     def full_name(self) -> str:
         return self.name
 
+
 class BoolType(BasicType):
     name = "bool"
+
     def assignable_to(self, other) -> bool:
         return isinstance(other, BoolType)
 
+
 class IntType(BasicType):
     name = "int"
+
     def assignable_to(self, other) -> bool:
-        return isinstance(other, IntType) or isinstance(other, UIntType) or isinstance(other, FloatType)
+        return (
+            isinstance(other, IntType)
+            or isinstance(other, UIntType)
+            or isinstance(other, FloatType)
+        )
+
 
 class UIntType(BasicType):
     name = "uint"
+
     def assignable_to(self, other) -> bool:
-        return isinstance(other, IntType) or isinstance(other, UIntType) or isinstance(other, FloatType)
+        return (
+            isinstance(other, IntType)
+            or isinstance(other, UIntType)
+            or isinstance(other, FloatType)
+        )
+
 
 class FloatType(BasicType):
     name = "float"
+
     def assignable_to(self, other) -> bool:
         return isinstance(other, FloatType)
 
+
 class StringType(BasicType):
     name = "string"
+
     def assignable_to(self, other) -> bool:
         return isinstance(other, StringType)
 
+
 class TypeType(BasicType):
     name = "GType"
+
     def assignable_to(self, other) -> bool:
         return isinstance(other, TypeType)
 
+
 _BASIC_TYPES = {
     "gboolean": BoolType,
     "int": IntType,
@@ -150,6 +175,7 @@ _BASIC_TYPES = {
     "type": TypeType,
 }
 
+
 class GirNode:
     def __init__(self, container, tl):
         self.container = container
@@ -291,7 +317,9 @@ class Interface(GirNode, GirType):
         n_prerequisites = self.tl.INTERFACE_N_PREREQUISITES
         offset = self.tl.header.HEADER_INTERFACE_BLOB_SIZE
         offset += (n_prerequisites + n_prerequisites % 2) * 2
-        offset += self.tl.INTERFACE_N_PROPERTIES * self.tl.header.HEADER_PROPERTY_BLOB_SIZE
+        offset += (
+            self.tl.INTERFACE_N_PROPERTIES * self.tl.header.HEADER_PROPERTY_BLOB_SIZE
+        )
         offset += self.tl.INTERFACE_N_METHODS * self.tl.header.HEADER_FUNCTION_BLOB_SIZE
         n_signals = self.tl.INTERFACE_N_SIGNALS
         property_size = self.tl.header.HEADER_SIGNAL_BLOB_SIZE
@@ -342,7 +370,9 @@ class Class(GirNode, GirType):
         offset = self.tl.header.HEADER_OBJECT_BLOB_SIZE
         offset += (n_interfaces + n_interfaces % 2) * 2
         offset += self.tl.OBJ_N_FIELDS * self.tl.header.HEADER_FIELD_BLOB_SIZE
-        offset += self.tl.OBJ_N_FIELD_CALLBACKS * self.tl.header.HEADER_CALLBACK_BLOB_SIZE
+        offset += (
+            self.tl.OBJ_N_FIELD_CALLBACKS * self.tl.header.HEADER_CALLBACK_BLOB_SIZE
+        )
         n_properties = self.tl.OBJ_N_PROPERTIES
         property_size = self.tl.header.HEADER_PROPERTY_BLOB_SIZE
         result = {}
@@ -357,7 +387,9 @@ class Class(GirNode, GirType):
         offset = self.tl.header.HEADER_OBJECT_BLOB_SIZE
         offset += (n_interfaces + n_interfaces % 2) * 2
         offset += self.tl.OBJ_N_FIELDS * self.tl.header.HEADER_FIELD_BLOB_SIZE
-        offset += self.tl.OBJ_N_FIELD_CALLBACKS * self.tl.header.HEADER_CALLBACK_BLOB_SIZE
+        offset += (
+            self.tl.OBJ_N_FIELD_CALLBACKS * self.tl.header.HEADER_CALLBACK_BLOB_SIZE
+        )
         offset += self.tl.OBJ_N_PROPERTIES * self.tl.header.HEADER_PROPERTY_BLOB_SIZE
         offset += self.tl.OBJ_N_METHODS * self.tl.header.HEADER_FUNCTION_BLOB_SIZE
         n_signals = self.tl.OBJ_N_SIGNALS
@@ -381,16 +413,18 @@ class Class(GirNode, GirType):
         if self.parent is not None:
             result += f" : {self.parent.container.name}.{self.parent.name}"
         if len(self.implements):
-            result += " implements " + ", ".join([impl.full_name for impl in self.implements])
+            result += " implements " + ", ".join(
+                [impl.full_name for impl in self.implements]
+            )
         return result
 
     @cached_property
     def properties(self):
-        return { p.name: p for p in self._enum_properties() }
+        return {p.name: p for p in self._enum_properties()}
 
     @cached_property
     def signals(self):
-        return { s.name: s for s in self._enum_signals() }
+        return {s.name: s for s in self._enum_signals()}
 
     def assignable_to(self, other) -> bool:
         if self == other:
@@ -509,9 +543,12 @@ class Namespace(GirNode):
             elif entry_type == typelib.BLOB_TYPE_OBJECT:
                 self.entries[entry_name] = Class(self, entry_blob)
             elif entry_type == typelib.BLOB_TYPE_INTERFACE:
-                 self.entries[entry_name] = Interface(self, entry_blob)
-            elif entry_type == typelib.BLOB_TYPE_BOXED or entry_type == typelib.BLOB_TYPE_STRUCT:
-                 self.entries[entry_name] = Boxed(self, entry_blob)
+                self.entries[entry_name] = Interface(self, entry_blob)
+            elif (
+                entry_type == typelib.BLOB_TYPE_BOXED
+                or entry_type == typelib.BLOB_TYPE_STRUCT
+            ):
+                self.entries[entry_name] = Boxed(self, entry_blob)
 
     @cached_property
     def xml(self):
@@ -531,25 +568,33 @@ class Namespace(GirNode):
 
     @cached_property
     def classes(self):
-        return { name: entry for name, entry in self.entries.items() if isinstance(entry, Class) }
+        return {
+            name: entry
+            for name, entry in self.entries.items()
+            if isinstance(entry, Class)
+        }
 
     @cached_property
     def interfaces(self):
-        return { name: entry for name, entry in self.entries.items() if isinstance(entry, Interface) }
+        return {
+            name: entry
+            for name, entry in self.entries.items()
+            if isinstance(entry, Interface)
+        }
 
     def get_type(self, name):
-        """ Gets a type (class, interface, enum, etc.) from this namespace. """
+        """Gets a type (class, interface, enum, etc.) from this namespace."""
         return self.entries.get(name)
 
     def get_type_by_cname(self, cname: str):
-        """ Gets a type from this namespace by its C name. """
+        """Gets a type from this namespace by its C name."""
         for item in self.entries.values():
             if hasattr(item, "cname") and item.cname == cname:
                 return item
 
     def lookup_type(self, type_name: str):
-        """ Looks up a type in the scope of this namespace (including in the
-        namespace's dependencies). """
+        """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]()
@@ -569,7 +614,9 @@ class Repository(GirNode):
         if dependencies := tl[0x24].string:
             deps = [tuple(dep.split("-", 1)) for dep in dependencies.split("|")]
             try:
-                self.includes = { name: get_namespace(name, version) for name, version in deps }
+                self.includes = {
+                    name: get_namespace(name, version) for name, version in deps
+                }
             except:
                 raise CompilerBugError(f"Failed to load dependencies.")
         else:
@@ -578,16 +625,14 @@ class Repository(GirNode):
     def get_type(self, name: str, ns: str) -> T.Optional[GirNode]:
         return self.lookup_namespace(ns).get_type(name)
 
-
     def get_type_by_cname(self, name: str) -> T.Optional[GirNode]:
         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. """
+        """Finds a namespace among this namespace's dependencies."""
         if ns == self.namespace.name:
             return self.namespace
         else:
@@ -610,9 +655,19 @@ class Repository(GirNode):
                 return BoolType()
             elif type_id in [typelib.TYPE_FLOAT, typelib.TYPE_DOUBLE]:
                 return FloatType()
-            elif type_id in [typelib.TYPE_INT8, typelib.TYPE_INT16, typelib.TYPE_INT32, typelib.TYPE_INT64]:
+            elif type_id in [
+                typelib.TYPE_INT8,
+                typelib.TYPE_INT16,
+                typelib.TYPE_INT32,
+                typelib.TYPE_INT64,
+            ]:
                 return IntType()
-            elif type_id in [typelib.TYPE_UINT8, typelib.TYPE_UINT16, typelib.TYPE_UINT32, typelib.TYPE_UINT64]:
+            elif type_id in [
+                typelib.TYPE_UINT8,
+                typelib.TYPE_UINT16,
+                typelib.TYPE_UINT32,
+                typelib.TYPE_UINT64,
+            ]:
                 return UIntType()
             elif type_id == typelib.TYPE_UTF8:
                 return StringType()
@@ -621,30 +676,30 @@ class Repository(GirNode):
             else:
                 raise CompilerBugError("Unknown type ID", type_id)
         else:
-            return self._resolve_dir_entry(self.tl.header[type_id].INTERFACE_TYPE_INTERFACE)
-
+            return self._resolve_dir_entry(
+                self.tl.header[type_id].INTERFACE_TYPE_INTERFACE
+            )
 
 
 class GirContext:
     def __init__(self):
         self.namespaces = {}
 
-
     def add_namespace(self, namespace: Namespace):
         other = self.namespaces.get(namespace.name)
         if other is not None and other.version != namespace.version:
-            raise CompileError(f"Namespace {namespace.name}-{namespace.version} can't be imported because version {other.version} was imported earlier")
+            raise CompileError(
+                f"Namespace {namespace.name}-{namespace.version} can't be imported because version {other.version} was imported earlier"
+            )
 
         self.namespaces[namespace.name] = namespace
 
-
     def get_type_by_cname(self, name: str) -> T.Optional[GirNode]:
         for ns in self.namespaces.values():
             if type := ns.get_type_by_cname(name):
                 return type
         return None
 
-
     def get_type(self, name: str, ns: str) -> T.Optional[GirNode]:
         ns = ns or "Gtk"
 
@@ -653,7 +708,6 @@ class GirContext:
 
         return self.namespaces[ns].get_type(name)
 
-
     def get_class(self, name: str, ns: str) -> T.Optional[Class]:
         type = self.get_type(name, ns)
         if isinstance(type, Class):
@@ -661,10 +715,9 @@ class GirContext:
         else:
             return None
 
-
     def validate_ns(self, ns: str):
-        """ Raises an exception if there is a problem looking up the given
-        namespace. """
+        """Raises an exception if there is a problem looking up the given
+        namespace."""
 
         ns = ns or "Gtk"
 
@@ -675,7 +728,7 @@ class GirContext:
             )
 
     def validate_type(self, name: str, ns: str):
-        """ Raises an exception if there is a problem looking up the given type. """
+        """Raises an exception if there is a problem looking up the given type."""
 
         self.validate_ns(ns)
 
diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index 229f238..dd00317 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -35,9 +35,11 @@ class CouldNotPort:
     def __init__(self, message):
         self.message = message
 
+
 def change_suffix(f):
     return f.removesuffix(".ui") + ".blp"
 
+
 def decompile_file(in_file, out_file) -> T.Union[str, CouldNotPort]:
     if os.path.exists(out_file):
         return CouldNotPort("already exists")
@@ -63,12 +65,15 @@ def decompile_file(in_file, out_file) -> T.Union[str, CouldNotPort]:
         except PrintableError as e:
             e.pretty_print(out_file, decompiled)
 
-            print(f"{Colors.RED}{Colors.BOLD}error: the generated file does not compile{Colors.CLEAR}")
+            print(
+                f"{Colors.RED}{Colors.BOLD}error: the generated file does not compile{Colors.CLEAR}"
+            )
             print(f"in {Colors.UNDERLINE}{out_file}{Colors.NO_UNDERLINE}")
             print(
-f"""{Colors.FAINT}Either the original XML file had an error, or there is a bug in the
+                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/jwestman/blueprint-compiler/-/issues/new?issue{Colors.CLEAR}\n"""
+            )
 
             return CouldNotPort("does not compile")
 
@@ -108,7 +113,9 @@ def enter():
 
 
 def step1():
-    print(f"{Colors.BOLD}STEP 1: Create subprojects/blueprint-compiler.wrap{Colors.CLEAR}")
+    print(
+        f"{Colors.BOLD}STEP 1: Create subprojects/blueprint-compiler.wrap{Colors.CLEAR}"
+    )
 
     if os.path.exists("subprojects/blueprint-compiler.wrap"):
         print("subprojects/blueprint-compiler.wrap already exists, skipping\n")
@@ -121,17 +128,20 @@ def step1():
             pass
 
         from .main import VERSION
+
         VERSION = "main" if VERSION == "uninstalled" else "v" + VERSION
 
         with open("subprojects/blueprint-compiler.wrap", "w") as wrap:
-            wrap.write(f"""[wrap-git]
+            wrap.write(
+                f"""[wrap-git]
 directory = blueprint-compiler
 url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
 revision = {VERSION}
 depth = 1
 
 [provide]
-program_names = blueprint-compiler""")
+program_names = blueprint-compiler"""
+            )
 
     print()
 
@@ -146,7 +156,9 @@ def step2():
                 if yesno("Add '/subprojects/blueprint-compiler' to .gitignore?"):
                     gitignore.write("\n/subprojects/blueprint-compiler\n")
             else:
-                print("'/subprojects/blueprint-compiler' already in .gitignore, skipping")
+                print(
+                    "'/subprojects/blueprint-compiler' already in .gitignore, skipping"
+                )
     else:
         if yesno("Create .gitignore with '/subprojects/blueprint-compiler'?"):
             with open(".gitignore", "w") as gitignore:
@@ -169,9 +181,13 @@ def step3():
         if isinstance(result, CouldNotPort):
             if result.message == "already exists":
                 print(Colors.FAINT, end="")
-            print(f"{Colors.RED}will not port {Colors.UNDERLINE}{in_file}{Colors.NO_UNDERLINE} -> {Colors.UNDERLINE}{out_file}{Colors.NO_UNDERLINE} [{result.message}]{Colors.CLEAR}")
+            print(
+                f"{Colors.RED}will not port {Colors.UNDERLINE}{in_file}{Colors.NO_UNDERLINE} -> {Colors.UNDERLINE}{out_file}{Colors.NO_UNDERLINE} [{result.message}]{Colors.CLEAR}"
+            )
         else:
-            print(f"will port {Colors.UNDERLINE}{in_file}{Colors.CLEAR} -> {Colors.UNDERLINE}{out_file}{Colors.CLEAR}")
+            print(
+                f"will port {Colors.UNDERLINE}{in_file}{Colors.CLEAR} -> {Colors.UNDERLINE}{out_file}{Colors.CLEAR}"
+            )
             success += 1
 
     print()
@@ -180,7 +196,9 @@ def step3():
     elif success == len(files):
         print(f"{Colors.GREEN}All files were converted.{Colors.CLEAR}")
     elif success > 0:
-        print(f"{Colors.RED}{success} file(s) were converted, {len(files) - success} were not.{Colors.CLEAR}")
+        print(
+            f"{Colors.RED}{success} file(s) were converted, {len(files) - success} were not.{Colors.CLEAR}"
+        )
     else:
         print(f"{Colors.RED}None of the files could be converted.{Colors.CLEAR}")
 
@@ -204,22 +222,33 @@ def step3():
 
 def step4(ported):
     print(f"{Colors.BOLD}STEP 4: Set up meson.build{Colors.CLEAR}")
-    print(f"{Colors.BOLD}{Colors.YELLOW}NOTE: Depending on your build system setup, you may need to make some adjustments to this step.{Colors.CLEAR}")
+    print(
+        f"{Colors.BOLD}{Colors.YELLOW}NOTE: Depending on your build system setup, you may need to make some adjustments to this step.{Colors.CLEAR}"
+    )
 
-    meson_files = [file for file in listdir_recursive(".") if os.path.basename(file) == "meson.build"]
+    meson_files = [
+        file
+        for file in listdir_recursive(".")
+        if os.path.basename(file) == "meson.build"
+    ]
     for meson_file in meson_files:
         with open(meson_file, "r") as f:
             if "gnome.compile_resources" in f.read():
                 parent = os.path.dirname(meson_file)
-                file_list = "\n    ".join([
-                    f"'{os.path.relpath(file, parent)}',"
-                    for file in ported
-                    if file.startswith(parent)
-                ])
+                file_list = "\n    ".join(
+                    [
+                        f"'{os.path.relpath(file, parent)}',"
+                        for file in ported
+                        if file.startswith(parent)
+                    ]
+                )
 
                 if len(file_list):
-                    print(f"{Colors.BOLD}Paste the following into {Colors.UNDERLINE}{meson_file}{Colors.NO_UNDERLINE}:{Colors.CLEAR}")
-                    print(f"""
+                    print(
+                        f"{Colors.BOLD}Paste the following into {Colors.UNDERLINE}{meson_file}{Colors.NO_UNDERLINE}:{Colors.CLEAR}"
+                    )
+                    print(
+                        f"""
 blueprints = custom_target('blueprints',
   input: files(
     {file_list}
@@ -227,14 +256,17 @@ blueprints = custom_target('blueprints',
   output: '.',
   command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
 )
-""")
+"""
+                    )
                     enter()
 
-                    print(f"""{Colors.BOLD}Paste the following into the 'gnome.compile_resources()'
+                    print(
+                        f"""{Colors.BOLD}Paste the following into the 'gnome.compile_resources()'
 arguments in {Colors.UNDERLINE}{meson_file}{Colors.NO_UNDERLINE}:{Colors.CLEAR}
 
 dependencies: blueprints,
-    """)
+    """
+                    )
                     enter()
 
     print()
@@ -244,7 +276,9 @@ def step5(in_files):
     print(f"{Colors.BOLD}STEP 5: Update POTFILES.in{Colors.CLEAR}")
 
     if not os.path.exists("po/POTFILES.in"):
-        print(f"{Colors.UNDERLINE}po/POTFILES.in{Colors.NO_UNDERLINE} does not exist, skipping\n")
+        print(
+            f"{Colors.UNDERLINE}po/POTFILES.in{Colors.NO_UNDERLINE} does not exist, skipping\n"
+        )
         return
 
     with open("po/POTFILES.in", "r") as potfiles:
@@ -257,12 +291,24 @@ def step5(in_files):
 
         new_data = "".join(lines)
 
-    print(f"{Colors.BOLD}Will make the following changes to {Colors.UNDERLINE}po/POTFILES.in{Colors.CLEAR}")
     print(
-        "".join([
-            (Colors.GREEN if line.startswith('+') else Colors.RED + Colors.FAINT if line.startswith('-') else '') + line + Colors.CLEAR
-            for line in difflib.unified_diff(old_lines, lines)
-        ])
+        f"{Colors.BOLD}Will make the following changes to {Colors.UNDERLINE}po/POTFILES.in{Colors.CLEAR}"
+    )
+    print(
+        "".join(
+            [
+                (
+                    Colors.GREEN
+                    if line.startswith("+")
+                    else Colors.RED + Colors.FAINT
+                    if line.startswith("-")
+                    else ""
+                )
+                + line
+                + Colors.CLEAR
+                for line in difflib.unified_diff(old_lines, lines)
+            ]
+        )
     )
 
     if yesno("Is this ok?"):
@@ -291,5 +337,6 @@ def run(opts):
     step5(in_files)
     step6(in_files)
 
-    print(f"{Colors.BOLD}STEP 6: Done! Make sure your app still builds and runs correctly.{Colors.CLEAR}")
-
+    print(
+        f"{Colors.BOLD}STEP 6: Done! Make sure your app still builds and runs correctly.{Colors.CLEAR}"
+    )
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index da5a44c..58662b2 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -16,7 +16,16 @@ from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
 from .ui import UI
 from .types import ClassName
-from .values import TypeValue, IdentValue, TranslatedStringValue, FlagsValue, Flag, QuotedValue, NumberValue, Value
+from .values import (
+    TypeValue,
+    IdentValue,
+    TranslatedStringValue,
+    FlagsValue,
+    Flag,
+    QuotedValue,
+    NumberValue,
+    Value,
+)
 
 from .common import *
 
diff --git a/blueprintcompiler/language/attributes.py b/blueprintcompiler/language/attributes.py
index 66faa60..77f01f2 100644
--- a/blueprintcompiler/language/attributes.py
+++ b/blueprintcompiler/language/attributes.py
@@ -23,7 +23,7 @@ from .common import *
 
 
 class BaseAttribute(AstNode):
-    """ A helper class for attribute syntax of the form `name: literal_value;`"""
+    """A helper class for attribute syntax of the form `name: literal_value;`"""
 
     tag_name: str = ""
     attr_name: str = "name"
@@ -34,5 +34,5 @@ class BaseAttribute(AstNode):
 
 
 class BaseTypedAttribute(BaseAttribute):
-    """ A BaseAttribute whose parent has a value_type property that can assist
-    in validation. """
+    """A BaseAttribute whose parent has a value_type property that can assist
+    in validation."""
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 2647a5a..8e6fd23 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -33,6 +33,7 @@ class ObjectContent(AstNode):
     def gir_class(self):
         return self.parent.gir_class
 
+
 class Object(AstNode):
     grammar: T.Any = [
         ConcreteClassName,
@@ -75,13 +76,17 @@ def validate_parent_type(node, ns: str, name: str, err_msg: str):
     parent = node.root.gir.get_type(name, ns)
     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}")
+        raise CompileError(
+            f"{container_type.full_name} is not a {parent.full_name}, so it doesn't have {err_msg}"
+        )
 
 
 @decompiler("object")
 def decompile_object(ctx, 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
+    klass_name = (
+        decompile.full_name(gir_class) if gir_class is not None else "." + klass
+    )
     if id is None:
         ctx.print(f"{klass_name} {{")
     else:
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 4d47e80..2c1e2ae 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -34,12 +34,16 @@ class Property(AstNode):
             UseIdent("bind_source"),
             ".",
             UseIdent("bind_property"),
-            ZeroOrMore(AnyOf(
-                ["no-sync-create", UseLiteral("no_sync_create", True)],
-                ["inverted", UseLiteral("inverted", True)],
-                ["bidirectional", UseLiteral("bidirectional", True)],
-                Match("sync-create").warn("sync-create is deprecated in favor of no-sync-create"),
-            )),
+            ZeroOrMore(
+                AnyOf(
+                    ["no-sync-create", UseLiteral("no_sync_create", True)],
+                    ["inverted", UseLiteral("inverted", True)],
+                    ["bidirectional", UseLiteral("bidirectional", True)],
+                    Match("sync-create").warn(
+                        "sync-create is deprecated in favor of no-sync-create"
+                    ),
+                )
+            ),
             ";",
         ],
         Statement(
@@ -63,19 +67,16 @@ class Property(AstNode):
     def gir_class(self):
         return self.parent.parent.gir_class
 
-
     @property
     def gir_property(self):
         if self.gir_class is not None:
             return self.gir_class.properties.get(self.tokens["name"])
 
-
     @property
     def value_type(self):
         if self.gir_property is not None:
             return self.gir_property.type
 
-
     @validate("name")
     def property_exists(self):
         if self.gir_class is None:
@@ -91,15 +92,19 @@ class Property(AstNode):
         if self.gir_property is None:
             raise CompileError(
                 f"Class {self.gir_class.full_name} does not contain a property called {self.tokens['name']}",
-                did_you_mean=(self.tokens["name"], self.gir_class.properties.keys())
+                did_you_mean=(self.tokens["name"], self.gir_class.properties.keys()),
             )
 
     @validate("bind")
     def property_bindable(self):
-        if self.tokens["bind"] and self.gir_property is not None and self.gir_property.construct_only:
+        if (
+            self.tokens["bind"]
+            and self.gir_property is not None
+            and self.gir_property.construct_only
+        ):
             raise CompileError(
                 f"{self.gir_property.full_name} can't be bound because it is construct-only",
-                hints=["construct-only properties may only be set to a static value"]
+                hints=["construct-only properties may only be set to a static value"],
             )
 
     @validate("name")
@@ -107,7 +112,6 @@ class Property(AstNode):
         if self.gir_property is not None and not self.gir_property.writable:
             raise CompileError(f"{self.gir_property.full_name} is not writable")
 
-
     @validate()
     def obj_property_type(self):
         if len(self.children[Object]) == 0:
@@ -115,20 +119,23 @@ class Property(AstNode):
 
         object = self.children[Object][0]
         type = self.value_type
-        if object and type and object.gir_class and not object.gir_class.assignable_to(type):
+        if (
+            object
+            and type
+            and object.gir_class
+            and not object.gir_class.assignable_to(type)
+        ):
             raise CompileError(
                 f"Cannot assign {object.gir_class.full_name} to {type.full_name}"
             )
 
-
     @validate("name")
     def unique_in_parent(self):
         self.validate_unique_in_parent(
             f"Duplicate property '{self.tokens['name']}'",
-            check=lambda child: child.tokens["name"] == self.tokens["name"]
+            check=lambda child: child.tokens["name"] == self.tokens["name"],
         )
 
-
     @docs("name")
     def property_docs(self):
         if self.gir_property is not None:
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 1cba801..d50792e 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -26,19 +26,23 @@ from .common import *
 class Signal(AstNode):
     grammar = Statement(
         UseIdent("name"),
-        Optional([
-            "::",
-            UseIdent("detail_name").expected("a signal detail name"),
-        ]),
+        Optional(
+            [
+                "::",
+                UseIdent("detail_name").expected("a signal detail name"),
+            ]
+        ),
         "=>",
         UseIdent("handler").expected("the name of a function to handle the signal"),
         Match("(").expected("argument list"),
         Optional(UseIdent("object")).expected("object identifier"),
         Match(")").expected(),
-        ZeroOrMore(AnyOf(
-            [Keyword("swapped"), UseLiteral("swapped", True)],
-            [Keyword("after"), UseLiteral("after", True)],
-        )),
+        ZeroOrMore(
+            AnyOf(
+                [Keyword("swapped"), UseLiteral("swapped", True)],
+                [Keyword("after"), UseLiteral("after", True)],
+            )
+        ),
     )
 
     @property
@@ -65,18 +69,15 @@ class Signal(AstNode):
     def is_after(self) -> bool:
         return self.tokens["after"] or False
 
-
     @property
     def gir_signal(self):
         if self.gir_class is not None:
             return self.gir_class.signals.get(self.tokens["name"])
 
-
     @property
     def gir_class(self):
         return self.parent.parent.gir_class
 
-
     @validate("name")
     def signal_exists(self):
         if self.gir_class is None:
@@ -92,10 +93,9 @@ class Signal(AstNode):
         if self.gir_signal is None:
             raise CompileError(
                 f"Class {self.gir_class.full_name} does not contain a signal called {self.tokens['name']}",
-                did_you_mean=(self.tokens["name"], self.gir_class.signals.keys())
+                did_you_mean=(self.tokens["name"], self.gir_class.signals.keys()),
             )
 
-
     @validate("object")
     def object_exists(self):
         object_id = self.tokens["object"]
@@ -103,10 +103,7 @@ class Signal(AstNode):
             return
 
         if self.root.objects_by_id.get(object_id) is None:
-            raise CompileError(
-                f"Could not find object with ID '{object_id}'"
-            )
-
+            raise CompileError(f"Could not find object with ID '{object_id}'")
 
     @docs("name")
     def signal_docs(self):
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index cab72e0..f2066ff 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -86,6 +86,7 @@ def get_state_types(gir):
         "selected": BoolType(),
     }
 
+
 def get_types(gir):
     return {
         **get_property_types(gir),
@@ -93,6 +94,7 @@ def get_types(gir):
         **get_state_types(gir),
     }
 
+
 def _get_docs(gir, name):
     if gir_type := (
         gir.get_type("AccessibleProperty", "Gtk").members.get(name)
@@ -174,8 +176,7 @@ class A11y(AstNode):
 )
 def a11y_completer(ast_node, match_variables):
     yield Completion(
-        "accessibility", CompletionItemKind.Snippet,
-        snippet="accessibility {\n  $0\n}"
+        "accessibility", CompletionItemKind.Snippet, snippet="accessibility {\n  $0\n}"
     )
 
 
@@ -185,20 +186,24 @@ def a11y_completer(ast_node, match_variables):
 )
 def a11y_name_completer(ast_node, match_variables):
     for name, type in get_types(ast_node.root.gir).items():
-        yield Completion(name, CompletionItemKind.Property, docs=_get_docs(ast_node.root.gir, type))
+        yield Completion(
+            name, CompletionItemKind.Property, docs=_get_docs(ast_node.root.gir, type)
+        )
 
 
 @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)}\");")
+        ctx.print(f'{name}: _("{_escape_quote(cdata)}");')
     else:
         ctx.print_attribute(name, cdata, get_types(ctx.gir).get(name))
 
+
 @decompiler("accessibility")
 def decompile_accessibility(ctx, gir):
     ctx.print("accessibility {")
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index 31d2d08..f0f6f37 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -35,12 +35,14 @@ class Item(BaseTypedAttribute):
 item = Group(
     Item,
     [
-        Optional([
-            UseIdent("name"),
-            ":",
-        ]),
+        Optional(
+            [
+                UseIdent("name"),
+                ":",
+            ]
+        ),
         VALUE_HOOKS,
-    ]
+    ],
 )
 
 
@@ -67,7 +69,4 @@ class Items(AstNode):
     matches=new_statement_patterns,
 )
 def items_completer(ast_node, match_variables):
-    yield Completion(
-        "items", CompletionItemKind.Snippet,
-        snippet="items [$0]"
-    )
+    yield Completion("items", CompletionItemKind.Snippet, snippet="items [$0]")
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 4419311..9625094 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -37,6 +37,7 @@ class Filters(AstNode):
                 f"Duplicate {self.tokens['tag_name']} block",
                 check=lambda child: child.tokens["tag_name"] == self.tokens["tag_name"],
             )
+
         wrapped_validator(self)
 
 
@@ -57,12 +58,12 @@ def create_node(tag_name: str, singular: str):
                     [
                         UseQuoted("name"),
                         UseLiteral("tag_name", singular),
-                    ]
+                    ],
                 ),
                 ",",
             ),
             "]",
-        ]
+        ],
     )
 
 
@@ -77,31 +78,38 @@ suffixes = create_node("suffixes", "suffix")
     matches=new_statement_patterns,
 )
 def file_filter_completer(ast_node, match_variables):
-    yield Completion("mime-types", CompletionItemKind.Snippet, snippet="mime-types [\"$0\"]")
-    yield Completion("patterns", CompletionItemKind.Snippet, snippet="patterns [\"$0\"]")
-    yield Completion("suffixes", CompletionItemKind.Snippet, snippet="suffixes [\"$0\"]")
+    yield Completion(
+        "mime-types", CompletionItemKind.Snippet, snippet='mime-types ["$0"]'
+    )
+    yield Completion("patterns", CompletionItemKind.Snippet, snippet='patterns ["$0"]')
+    yield Completion("suffixes", CompletionItemKind.Snippet, snippet='suffixes ["$0"]')
 
 
 @decompiler("mime-types")
 def decompile_mime_types(ctx, gir):
     ctx.print("mime-types [")
 
+
 @decompiler("mime-type", cdata=True)
 def decompile_mime_type(ctx, gir, cdata):
     ctx.print(f'"{cdata}",')
 
+
 @decompiler("patterns")
 def decompile_patterns(ctx, gir):
     ctx.print("patterns [")
 
+
 @decompiler("pattern", cdata=True)
 def decompile_pattern(ctx, gir, cdata):
     ctx.print(f'"{cdata}",')
 
+
 @decompiler("suffixes")
 def decompile_suffixes(ctx, gir):
     ctx.print("suffixes [")
 
+
 @decompiler("suffix", cdata=True)
 def decompile_suffix(ctx, gir, cdata):
     ctx.print(f'"{cdata}",')
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index b52f7bc..9af82fd 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -45,7 +45,7 @@ layout_prop = Group(
         UseIdent("name"),
         ":",
         VALUE_HOOKS.expected("a value"),
-    )
+    ),
 )
 
 
@@ -71,10 +71,7 @@ class Layout(AstNode):
     matches=new_statement_patterns,
 )
 def layout_completer(ast_node, match_variables):
-    yield Completion(
-        "layout", CompletionItemKind.Snippet,
-        snippet="layout {\n  $0\n}"
-    )
+    yield Completion("layout", CompletionItemKind.Snippet, snippet="layout {\n  $0\n}")
 
 
 @decompiler("layout")
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 355997a..3d3e6ee 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -56,22 +56,12 @@ menu_contents = Sequence()
 
 menu_section = Group(
     Menu,
-    [
-        "section",
-        UseLiteral("tag", "section"),
-        Optional(UseIdent("id")),
-        menu_contents
-    ]
+    ["section", UseLiteral("tag", "section"), Optional(UseIdent("id")), menu_contents],
 )
 
 menu_submenu = Group(
     Menu,
-    [
-        "submenu",
-        UseLiteral("tag", "submenu"),
-        Optional(UseIdent("id")),
-        menu_contents
-    ]
+    ["submenu", UseLiteral("tag", "submenu"), Optional(UseIdent("id")), menu_contents],
 )
 
 menu_attribute = Group(
@@ -81,7 +71,7 @@ menu_attribute = Group(
         ":",
         VALUE_HOOKS.expected("a value"),
         Match(";").expected(),
-    ]
+    ],
 )
 
 menu_item = Group(
@@ -92,7 +82,7 @@ menu_item = Group(
         Optional(UseIdent("id")),
         Match("{").expected(),
         Until(menu_attribute, "}"),
-    ]
+    ],
 )
 
 menu_item_shorthand = Group(
@@ -105,58 +95,60 @@ menu_item_shorthand = Group(
             MenuAttribute,
             [UseLiteral("name", "label"), VALUE_HOOKS],
         ),
-        Optional([
-            ",",
-            Optional([
-                Group(
-                    MenuAttribute,
-                    [UseLiteral("name", "action"), VALUE_HOOKS],
+        Optional(
+            [
+                ",",
+                Optional(
+                    [
+                        Group(
+                            MenuAttribute,
+                            [UseLiteral("name", "action"), VALUE_HOOKS],
+                        ),
+                        Optional(
+                            [
+                                ",",
+                                Group(
+                                    MenuAttribute,
+                                    [UseLiteral("name", "icon"), VALUE_HOOKS],
+                                ),
+                            ]
+                        ),
+                    ]
                 ),
-                Optional([
-                    ",",
-                    Group(
-                        MenuAttribute,
-                        [UseLiteral("name", "icon"), VALUE_HOOKS],
-                    ),
-                ])
-            ])
-        ]),
+            ]
+        ),
         Match(")").expected(),
-    ]
+    ],
 )
 
 menu_contents.children = [
     Match("{"),
-    Until(AnyOf(
-        menu_section,
-        menu_submenu,
-        menu_item_shorthand,
-        menu_item,
-        menu_attribute,
-    ), "}"),
+    Until(
+        AnyOf(
+            menu_section,
+            menu_submenu,
+            menu_item_shorthand,
+            menu_item,
+            menu_attribute,
+        ),
+        "}",
+    ),
 ]
 
 menu: Group = Group(
     Menu,
-    [
-        "menu",
-        UseLiteral("tag", "menu"),
-        Optional(UseIdent("id")),
-        menu_contents
-    ],
+    ["menu", UseLiteral("tag", "menu"), Optional(UseIdent("id")), menu_contents],
 )
 
 from .ui import UI
 
+
 @completer(
     applies_in=[UI],
     matches=new_statement_patterns,
 )
 def menu_completer(ast_node, match_variables):
-    yield Completion(
-        "menu", CompletionItemKind.Snippet,
-        snippet="menu {\n  $0\n}"
-    )
+    yield Completion("menu", CompletionItemKind.Snippet, snippet="menu {\n  $0\n}")
 
 
 @completer(
@@ -165,34 +157,21 @@ def menu_completer(ast_node, match_variables):
 )
 def menu_content_completer(ast_node, match_variables):
     yield Completion(
-        "submenu", CompletionItemKind.Snippet,
-        snippet="submenu {\n  $0\n}"
+        "submenu", CompletionItemKind.Snippet, snippet="submenu {\n  $0\n}"
     )
     yield Completion(
-        "section", CompletionItemKind.Snippet,
-        snippet="section {\n  $0\n}"
+        "section", CompletionItemKind.Snippet, snippet="section {\n  $0\n}"
     )
+    yield Completion("item", CompletionItemKind.Snippet, snippet="item {\n  $0\n}")
     yield Completion(
-        "item", CompletionItemKind.Snippet,
-        snippet="item {\n  $0\n}"
-    )
-    yield Completion(
-        "item (shorthand)", CompletionItemKind.Snippet,
-        snippet='item (_("${1:Label}"), "${2:action-name}", "${3:icon-name}")'
+        "item (shorthand)",
+        CompletionItemKind.Snippet,
+        snippet='item (_("${1:Label}"), "${2:action-name}", "${3:icon-name}")',
     )
 
-    yield Completion(
-        "label", CompletionItemKind.Snippet,
-        snippet='label: $0;'
-    )
-    yield Completion(
-        "action", CompletionItemKind.Snippet,
-        snippet='action: "$0";'
-    )
-    yield Completion(
-        "icon", CompletionItemKind.Snippet,
-        snippet='icon: "$0";'
-    )
+    yield Completion("label", CompletionItemKind.Snippet, snippet="label: $0;")
+    yield Completion("action", CompletionItemKind.Snippet, snippet='action: "$0";')
+    yield Completion("icon", CompletionItemKind.Snippet, snippet='icon: "$0";')
 
 
 @decompiler("menu")
@@ -202,6 +181,7 @@ def decompile_menu(ctx, gir, id=None):
     else:
         ctx.print("menu {")
 
+
 @decompiler("submenu")
 def decompile_submenu(ctx, gir, id=None):
     if id:
@@ -209,6 +189,7 @@ def decompile_submenu(ctx, gir, id=None):
     else:
         ctx.print("submenu {")
 
+
 @decompiler("item")
 def decompile_item(ctx, gir, id=None):
     if id:
@@ -216,6 +197,7 @@ def decompile_item(ctx, gir, id=None):
     else:
         ctx.print("item {")
 
+
 @decompiler("section")
 def decompile_section(ctx, gir, id=None):
     if id:
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index eb56043..80c47af 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -32,7 +32,7 @@ class Widget(AstNode):
         if object is None:
             raise CompileError(
                 f"Could not find object with ID {self.tokens['name']}",
-                did_you_mean=(self.tokens['name'], self.root.objects_by_id.keys()),
+                did_you_mean=(self.tokens["name"], self.root.objects_by_id.keys()),
             )
         elif object.gir_class and not object.gir_class.assignable_to(type):
             raise CompileError(
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index e7eb0f8..347b9e8 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -55,7 +55,4 @@ class Strings(AstNode):
     matches=new_statement_patterns,
 )
 def strings_completer(ast_node, match_variables):
-    yield Completion(
-        "strings", CompletionItemKind.Snippet,
-        snippet="strings [$0]"
-    )
+    yield Completion("strings", CompletionItemKind.Snippet, snippet="strings [$0]")
diff --git a/blueprintcompiler/language/gtk_styles.py b/blueprintcompiler/language/gtk_styles.py
index 644d8a3..1005568 100644
--- a/blueprintcompiler/language/gtk_styles.py
+++ b/blueprintcompiler/language/gtk_styles.py
@@ -49,13 +49,14 @@ class Styles(AstNode):
     matches=new_statement_patterns,
 )
 def style_completer(ast_node, match_variables):
-    yield Completion("styles", CompletionItemKind.Keyword, snippet="styles [\"$0\"]")
+    yield Completion("styles", CompletionItemKind.Keyword, snippet='styles ["$0"]')
 
 
 @decompiler("style")
 def decompile_style(ctx, gir):
     ctx.print(f"styles [")
 
+
 @decompiler("class")
 def decompile_style_class(ctx, gir, name):
     ctx.print(f'"{name}",')
diff --git a/blueprintcompiler/language/gtkbuilder_child.py b/blueprintcompiler/language/gtkbuilder_child.py
index 71efe19..45b2074 100644
--- a/blueprintcompiler/language/gtkbuilder_child.py
+++ b/blueprintcompiler/language/gtkbuilder_child.py
@@ -26,18 +26,21 @@ from .common import *
 
 ALLOWED_PARENTS: T.List[T.Tuple[str, str]] = [
     ("Gtk", "Buildable"),
-    ("Gio", "ListStore")
+    ("Gio", "ListStore"),
 ]
 
+
 class Child(AstNode):
     grammar = [
-        Optional([
-            "[",
-            Optional(["internal-child", UseLiteral("internal_child", True)]),
-            UseIdent("child_type").expected("a child type"),
-            Optional(ResponseId),
-            "]",
-        ]),
+        Optional(
+            [
+                "[",
+                Optional(["internal-child", UseLiteral("internal_child", True)]),
+                UseIdent("child_type").expected("a child type"),
+                Optional(ResponseId),
+                "]",
+            ]
+        ),
         Object,
     ]
 
@@ -53,9 +56,13 @@ class Child(AstNode):
                 if gir_class.assignable_to(parent_type):
                     break
             else:
-                hints=["only Gio.ListStore or Gtk.Buildable implementors can have children"]
+                hints = [
+                    "only Gio.ListStore or Gtk.Buildable implementors can have children"
+                ]
                 if "child" in gir_class.properties:
-                    hints.append("did you mean to assign this object to the 'child' property?")
+                    hints.append(
+                        "did you mean to assign this object to the 'child' property?"
+                    )
                 raise CompileError(
                     f"{gir_class.full_name} doesn't have children",
                     hints=hints,
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 7392782..a215cdf 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -28,10 +28,12 @@ class Template(Object):
     grammar = [
         "template",
         UseIdent("id").expected("template class name"),
-        Optional([
-            Match(":"),
-            to_parse_node(ClassName).expected("parent class"),
-        ]),
+        Optional(
+            [
+                Match(":"),
+                to_parse_node(ClassName).expected("parent class"),
+            ]
+        ),
         ObjectContent,
     ]
 
@@ -54,7 +56,9 @@ class Template(Object):
 
     @validate("id")
     def unique_in_parent(self):
-        self.validate_unique_in_parent(f"Only one template may be defined per file, but this file contains {len(self.parent.children[Template])}",)
+        self.validate_unique_in_parent(
+            f"Only one template may be defined per file, but this file contains {len(self.parent.children[Template])}",
+        )
 
 
 @decompiler("template")
diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index f0fe3df..be6a003 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -24,8 +24,12 @@ from .common import *
 
 class GtkDirective(AstNode):
     grammar = Statement(
-        Match("using").err("File must start with a \"using Gtk\" directive (e.g. `using Gtk 4.0;`)"),
-        Match("Gtk").err("File must start with a \"using Gtk\" directive (e.g. `using Gtk 4.0;`)"),
+        Match("using").err(
+            'File must start with a "using Gtk" directive (e.g. `using Gtk 4.0;`)'
+        ),
+        Match("Gtk").err(
+            'File must start with a "using Gtk" directive (e.g. `using Gtk 4.0;`)'
+        ),
         UseNumberText("version").expected("a version number for GTK"),
     )
 
@@ -35,7 +39,9 @@ class GtkDirective(AstNode):
         if version not in ["4.0"]:
             err = CompileError("Only GTK 4 is supported")
             if version and version.startswith("4"):
-                err.hint("Expected the GIR version, not an exact version number. Use 'using Gtk 4.0;'.")
+                err.hint(
+                    "Expected the GIR version, not an exact version number. Use 'using Gtk 4.0;'."
+                )
             else:
                 err.hint("Expected 'using Gtk 4.0;'")
             raise err
@@ -51,7 +57,6 @@ class GtkDirective(AstNode):
                 hints=e.hints,
             )
 
-
     @property
     def gir_namespace(self):
         # validate the GTK version first to make sure the more specific error
diff --git a/blueprintcompiler/language/response_id.py b/blueprintcompiler/language/response_id.py
index 745c73f..073173a 100644
--- a/blueprintcompiler/language/response_id.py
+++ b/blueprintcompiler/language/response_id.py
@@ -26,21 +26,13 @@ from .common import *
 class ResponseId(AstNode):
     """Response ID of action widget."""
 
-    ALLOWED_PARENTS: T.List[T.Tuple[str, str]] = [
-        ("Gtk", "Dialog"),
-        ("Gtk", "InfoBar")
-    ]
+    ALLOWED_PARENTS: T.List[T.Tuple[str, str]] = [("Gtk", "Dialog"), ("Gtk", "InfoBar")]
 
     grammar = [
         Keyword("response"),
         "=",
-        AnyOf(
-            UseIdent("response_id"),
-            UseNumber("response_id")
-        ),
-        Optional([
-            Keyword("default"), UseLiteral("is_default", True)
-        ])
+        AnyOf(UseIdent("response_id"), UseNumber("response_id")),
+        Optional([Keyword("default"), UseLiteral("is_default", True)]),
     ]
 
     @validate()
@@ -91,18 +83,15 @@ class ResponseId(AstNode):
 
         if isinstance(response, int):
             if response < 0:
-                raise CompileError(
-                    "Numeric response type can't be negative")
+                raise CompileError("Numeric response type can't be negative")
         elif isinstance(response, float):
             raise CompileError(
-                "Response type must be GtkResponseType member or integer,"
-                " not float"
+                "Response type must be GtkResponseType member or integer," " not float"
             )
         else:
             responses = gir.get_type("ResponseType", "Gtk").members.keys()
             if response not in responses:
-                raise CompileError(
-                    f"Response type \"{response}\" doesn't exist")
+                raise CompileError(f'Response type "{response}" doesn\'t exist')
 
     @validate("default")
     def no_multiple_default(self) -> None:
@@ -135,4 +124,3 @@ class ResponseId(AstNode):
 
         _object: Object = self.parent.children[Object][0]
         return _object.tokens["id"]
-
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index 8f39cbf..0987262 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -41,7 +41,9 @@ class TypeName(AstNode):
     @validate("class_name")
     def type_exists(self):
         if not self.tokens["ignore_gir"] and self.gir_ns is not None:
-            self.root.gir.validate_type(self.tokens["class_name"], self.tokens["namespace"])
+            self.root.gir.validate_type(
+                self.tokens["class_name"], self.tokens["namespace"]
+            )
 
     @validate("namespace")
     def gir_ns_exists(self):
@@ -56,7 +58,9 @@ class TypeName(AstNode):
     @property
     def gir_type(self) -> T.Optional[gir.Class]:
         if self.tokens["class_name"] and not self.tokens["ignore_gir"]:
-            return self.root.gir.get_type(self.tokens["class_name"], self.tokens["namespace"])
+            return self.root.gir.get_type(
+                self.tokens["class_name"], self.tokens["namespace"]
+            )
         return None
 
     @property
@@ -82,7 +86,9 @@ class ClassName(TypeName):
     def gir_class_exists(self):
         if self.gir_type is not None and not isinstance(self.gir_type, Class):
             if isinstance(self.gir_type, Interface):
-                raise CompileError(f"{self.gir_type.full_name} is an interface, not a class")
+                raise CompileError(
+                    f"{self.gir_type.full_name} is an interface, not a class"
+                )
             else:
                 raise CompileError(f"{self.gir_type.full_name} is not a class")
 
@@ -93,6 +99,5 @@ class ConcreteClassName(ClassName):
         if isinstance(self.gir_type, Class) and self.gir_type.abstract:
             raise CompileError(
                 f"{self.gir_type.full_name} can't be instantiated because it's abstract",
-                hints=[f"did you mean to use a subclass of {self.gir_type.full_name}?"]
+                hints=[f"did you mean to use a subclass of {self.gir_type.full_name}?"],
             )
-
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index 5a9c4fb..c277c56 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -27,16 +27,19 @@ from .common import *
 
 
 class UI(AstNode):
-    """ The AST node for the entire file """
+    """The AST node for the entire file"""
 
     grammar = [
         GtkDirective,
         ZeroOrMore(Import),
-        Until(AnyOf(
-            Template,
-            menu,
-            Object,
-        ), Eof()),
+        Until(
+            AnyOf(
+                Template,
+                menu,
+                Object,
+            ),
+            Eof(),
+        ),
     ]
 
     @property
@@ -61,11 +64,13 @@ class UI(AstNode):
 
         return gir_ctx
 
-
     @property
     def objects_by_id(self):
-        return { obj.tokens["id"]: obj for obj in self.iterate_children_recursive() if obj.tokens["id"] is not None }
-
+        return {
+            obj.tokens["id"]: obj
+            for obj in self.iterate_children_recursive()
+            if obj.tokens["id"] is not None
+        }
 
     @validate()
     def gir_errors(self):
@@ -74,7 +79,6 @@ class UI(AstNode):
         if len(self._gir_errors):
             raise MultipleErrors(self._gir_errors)
 
-
     @validate()
     def unique_ids(self):
         passed = {}
@@ -84,5 +88,7 @@ class UI(AstNode):
 
             if obj.tokens["id"] in passed:
                 token = obj.group.tokens["id"]
-                raise CompileError(f"Duplicate object ID '{obj.tokens['id']}'", token.start, token.end)
+                raise CompileError(
+                    f"Duplicate object ID '{obj.tokens['id']}'", token.start, token.end
+                )
             passed[obj.tokens["id"]] = obj
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 2a889ec..db28490 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -84,13 +84,21 @@ class QuotedValue(Value):
     @validate()
     def validate_for_type(self):
         type = self.parent.value_type
-        if isinstance(type, gir.IntType) or isinstance(type, gir.UIntType) or isinstance(type, gir.FloatType):
+        if (
+            isinstance(type, gir.IntType)
+            or isinstance(type, gir.UIntType)
+            or isinstance(type, gir.FloatType)
+        ):
             raise CompileError(f"Cannot convert string to number")
 
         elif isinstance(type, gir.StringType):
             pass
 
-        elif isinstance(type, gir.Class) or isinstance(type, gir.Interface) or isinstance(type, gir.Boxed):
+        elif (
+            isinstance(type, gir.Class)
+            or isinstance(type, gir.Interface)
+            or isinstance(type, gir.Boxed)
+        ):
             parseable_types = [
                 "Gdk.Paintable",
                 "Gdk.Texture",
@@ -106,8 +114,12 @@ class QuotedValue(Value):
             if type.full_name not in parseable_types:
                 hints = []
                 if isinstance(type, gir.TypeType):
-                    hints.append(f"use the typeof operator: 'typeof({self.tokens('value')})'")
-                raise CompileError(f"Cannot convert string to {type.full_name}", hints=hints)
+                    hints.append(
+                        f"use the typeof operator: 'typeof({self.tokens('value')})'"
+                    )
+                raise CompileError(
+                    f"Cannot convert string to {type.full_name}", hints=hints
+                )
 
         elif type is not None:
             raise CompileError(f"Cannot convert string to {type.full_name}")
@@ -127,7 +139,9 @@ class NumberValue(Value):
             try:
                 int(self.tokens["value"])
             except:
-                raise CompileError(f"Cannot convert {self.group.tokens['value']} to integer")
+                raise CompileError(
+                    f"Cannot convert {self.group.tokens['value']} to integer"
+                )
 
         elif isinstance(type, gir.UIntType):
             try:
@@ -135,13 +149,17 @@ class NumberValue(Value):
                 if int(self.tokens["value"]) < 0:
                     raise Exception()
             except:
-                raise CompileError(f"Cannot convert {self.group.tokens['value']} to unsigned integer")
+                raise CompileError(
+                    f"Cannot convert {self.group.tokens['value']} to unsigned integer"
+                )
 
         elif isinstance(type, gir.FloatType):
             try:
                 float(self.tokens["value"])
             except:
-                raise CompileError(f"Cannot convert {self.group.tokens['value']} to float")
+                raise CompileError(
+                    f"Cannot convert {self.group.tokens['value']} to float"
+                )
 
         elif type is not None:
             raise CompileError(f"Cannot convert number to {type.full_name}")
@@ -164,7 +182,7 @@ class Flag(AstNode):
         if isinstance(type, gir.Bitfield) and self.tokens["value"] not in type.members:
             raise CompileError(
                 f"{self.tokens['value']} is not a member of {type.full_name}",
-                did_you_mean=(self.tokens['value'], type.members.keys()),
+                did_you_mean=(self.tokens["value"], type.members.keys()),
             )
 
 
@@ -189,14 +207,14 @@ class IdentValue(Value):
             if self.tokens["value"] not in type.members:
                 raise CompileError(
                     f"{self.tokens['value']} is not a member of {type.full_name}",
-                    did_you_mean=(self.tokens['value'], type.members.keys()),
+                    did_you_mean=(self.tokens["value"], type.members.keys()),
                 )
 
         elif isinstance(type, gir.BoolType):
             if self.tokens["value"] not in ["true", "false"]:
                 raise CompileError(
                     f"Expected 'true' or 'false' for boolean value",
-                    did_you_mean=(self.tokens['value'], ["true", "false"]),
+                    did_you_mean=(self.tokens["value"], ["true", "false"]),
                 )
 
         elif type is not None:
@@ -204,14 +222,13 @@ class IdentValue(Value):
             if object is None:
                 raise CompileError(
                     f"Could not find object with ID {self.tokens['value']}",
-                    did_you_mean=(self.tokens['value'], self.root.objects_by_id.keys()),
+                    did_you_mean=(self.tokens["value"], self.root.objects_by_id.keys()),
                 )
             elif object.gir_class and not object.gir_class.assignable_to(type):
                 raise CompileError(
                     f"Cannot assign {object.gir_class.full_name} to {type.full_name}"
                 )
 
-
     @docs()
     def docs(self):
         type = self.parent.value_type
@@ -223,9 +240,7 @@ class IdentValue(Value):
         elif isinstance(type, gir.GirNode):
             return type.doc
 
-
     def get_semantic_tokens(self) -> T.Iterator[SemanticToken]:
         if isinstance(self.parent.value_type, gir.Enumeration):
             token = self.group.tokens["value"]
             yield SemanticToken(token.start, token.end, SemanticTokenType.EnumMember)
-
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 6e43e3b..26a519e 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -35,6 +35,7 @@ def command(json_method):
     def decorator(func):
         func._json_method = json_method
         return func
+
     return decorator
 
 
@@ -50,8 +51,16 @@ class OpenFile:
 
     def apply_changes(self, changes):
         for change in changes:
-            start = utils.pos_to_idx(change["range"]["start"]["line"], change["range"]["start"]["character"], self.text)
-            end = utils.pos_to_idx(change["range"]["end"]["line"], change["range"]["end"]["character"], self.text)
+            start = utils.pos_to_idx(
+                change["range"]["start"]["line"],
+                change["range"]["start"]["character"],
+                self.text,
+            )
+            end = utils.pos_to_idx(
+                change["range"]["end"]["line"],
+                change["range"]["end"]["character"],
+                self.text,
+            )
             self.text = self.text[:start] + change["text"] + self.text[end:]
         self._update()
 
@@ -69,16 +78,17 @@ class OpenFile:
         except CompileError as e:
             self.diagnostics.append(e)
 
-
     def calc_semantic_tokens(self) -> T.List[int]:
         tokens = list(self.ast.get_semantic_tokens())
         token_lists = [
             [
-                *utils.idx_to_pos(token.start, self.text), # line and column
-                token.end - token.start,        # length
+                *utils.idx_to_pos(token.start, self.text),  # line and column
+                token.end - token.start,  # length
                 token.type,
-                0,                              # token modifiers
-            ] for token in tokens]
+                0,  # token modifiers
+            ]
+            for token in tokens
+        ]
 
         # convert line, column numbers to deltas
         for i, token_list in enumerate(token_lists[1:]):
@@ -125,53 +135,60 @@ class LanguageServer:
         except Exception as e:
             printerr(traceback.format_exc())
 
-
     def _send(self, data):
         data["jsonrpc"] = "2.0"
         line = json.dumps(data, separators=(",", ":")) + "\r\n"
         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}")
+        sys.stdout.write(
+            f"Content-Length: {len(line.encode())}\r\nContent-Type: application/vscode-jsonrpc; charset=utf-8\r\n\r\n{line}"
+        )
         sys.stdout.flush()
 
     def _send_response(self, id, result):
-        self._send({
-            "id": id,
-            "result": result,
-        })
+        self._send(
+            {
+                "id": id,
+                "result": result,
+            }
+        )
 
     def _send_notification(self, method, params):
-        self._send({
-            "method": method,
-            "params": params,
-        })
-
+        self._send(
+            {
+                "method": method,
+                "params": params,
+            }
+        )
 
     @command("initialize")
     def initialize(self, id, params):
         from . import main
 
         self.client_capabilities = params.get("capabilities")
-        self._send_response(id, {
-            "capabilities": {
-                "textDocumentSync": {
-                    "openClose": True,
-                    "change": TextDocumentSyncKind.Incremental,
-                },
-                "semanticTokensProvider": {
-                    "legend": {
-                        "tokenTypes": ["enumMember"],
+        self._send_response(
+            id,
+            {
+                "capabilities": {
+                    "textDocumentSync": {
+                        "openClose": True,
+                        "change": TextDocumentSyncKind.Incremental,
                     },
-                    "full": True,
+                    "semanticTokensProvider": {
+                        "legend": {
+                            "tokenTypes": ["enumMember"],
+                        },
+                        "full": True,
+                    },
+                    "completionProvider": {},
+                    "codeActionProvider": {},
+                    "hoverProvider": True,
+                },
+                "serverInfo": {
+                    "name": "Blueprint",
+                    "version": main.VERSION,
                 },
-                "completionProvider": {},
-                "codeActionProvider": {},
-                "hoverProvider": True,
             },
-            "serverInfo": {
-                "name": "Blueprint",
-                "version": main.VERSION,
-            },
-        })
+        )
 
     @command("textDocument/didOpen")
     def didOpen(self, id, params):
@@ -198,14 +215,23 @@ class LanguageServer:
     @command("textDocument/hover")
     def hover(self, id, params):
         open_file = self._open_files[params["textDocument"]["uri"]]
-        docs = open_file.ast and open_file.ast.get_docs(utils.pos_to_idx(params["position"]["line"], params["position"]["character"], open_file.text))
+        docs = open_file.ast and open_file.ast.get_docs(
+            utils.pos_to_idx(
+                params["position"]["line"],
+                params["position"]["character"],
+                open_file.text,
+            )
+        )
         if docs:
-            self._send_response(id, {
-                "contents": {
-                    "kind": "markdown",
-                    "value": docs,
-                }
-            })
+            self._send_response(
+                id,
+                {
+                    "contents": {
+                        "kind": "markdown",
+                        "value": docs,
+                    }
+                },
+            )
         else:
             self._send_response(id, None)
 
@@ -217,40 +243,59 @@ class LanguageServer:
             self._send_response(id, [])
             return
 
-        idx = utils.pos_to_idx(params["position"]["line"], params["position"]["character"], open_file.text)
+        idx = utils.pos_to_idx(
+            params["position"]["line"], params["position"]["character"], open_file.text
+        )
         completions = complete(open_file.ast, open_file.tokens, idx)
-        self._send_response(id, [completion.to_json(True) for completion in completions])
-
+        self._send_response(
+            id, [completion.to_json(True) for completion in completions]
+        )
 
     @command("textDocument/semanticTokens/full")
     def semantic_tokens(self, id, params):
         open_file = self._open_files[params["textDocument"]["uri"]]
 
-        self._send_response(id, {
-            "data": open_file.calc_semantic_tokens(),
-        })
-
+        self._send_response(
+            id,
+            {
+                "data": open_file.calc_semantic_tokens(),
+            },
+        )
 
     @command("textDocument/codeAction")
     def code_actions(self, id, params):
         open_file = self._open_files[params["textDocument"]["uri"]]
 
-        range_start = utils.pos_to_idx(params["range"]["start"]["line"], params["range"]["start"]["character"], open_file.text)
-        range_end = utils.pos_to_idx(params["range"]["end"]["line"], params["range"]["end"]["character"], open_file.text)
+        range_start = utils.pos_to_idx(
+            params["range"]["start"]["line"],
+            params["range"]["start"]["character"],
+            open_file.text,
+        )
+        range_end = utils.pos_to_idx(
+            params["range"]["end"]["line"],
+            params["range"]["end"]["character"],
+            open_file.text,
+        )
 
         actions = [
             {
                 "title": action.title,
                 "kind": "quickfix",
-                "diagnostics": [self._create_diagnostic(open_file.text, open_file.uri, diagnostic)],
+                "diagnostics": [
+                    self._create_diagnostic(open_file.text, open_file.uri, diagnostic)
+                ],
                 "edit": {
                     "changes": {
-                        open_file.uri: [{
-                            "range": utils.idxs_to_range(diagnostic.start, diagnostic.end, open_file.text),
-                            "newText": action.replace_with
-                        }]
+                        open_file.uri: [
+                            {
+                                "range": utils.idxs_to_range(
+                                    diagnostic.start, diagnostic.end, open_file.text
+                                ),
+                                "newText": action.replace_with,
+                            }
+                        ]
                     }
-                }
+                },
             }
             for diagnostic in open_file.diagnostics
             if not (diagnostic.end < range_start or diagnostic.start > range_end)
@@ -259,23 +304,30 @@ class LanguageServer:
 
         self._send_response(id, actions)
 
-
     def _send_file_updates(self, open_file: OpenFile):
-        self._send_notification("textDocument/publishDiagnostics", {
-            "uri": open_file.uri,
-            "diagnostics": [self._create_diagnostic(open_file.text, open_file.uri, err) for err in open_file.diagnostics],
-        })
+        self._send_notification(
+            "textDocument/publishDiagnostics",
+            {
+                "uri": open_file.uri,
+                "diagnostics": [
+                    self._create_diagnostic(open_file.text, open_file.uri, err)
+                    for err in open_file.diagnostics
+                ],
+            },
+        )
 
     def _create_diagnostic(self, text, uri, err):
         message = err.message
 
         for hint in err.hints:
-          message += '\nhint: ' + hint
+            message += "\nhint: " + hint
 
         result = {
             "range": utils.idxs_to_range(err.start, err.end, text),
             "message": message,
-            "severity": DiagnosticSeverity.Warning if isinstance(err, CompileWarning) else DiagnosticSeverity.Error,
+            "severity": DiagnosticSeverity.Warning
+            if isinstance(err, CompileWarning)
+            else DiagnosticSeverity.Error,
         }
 
         if len(err.references) > 0:
@@ -285,7 +337,7 @@ class LanguageServer:
                         "uri": uri,
                         "range": utils.idxs_to_range(ref.start, ref.end, text),
                     },
-                    "message": ref.message
+                    "message": ref.message,
                 }
                 for ref in err.references
             ]
@@ -297,4 +349,3 @@ for name in dir(LanguageServer):
     item = getattr(LanguageServer, name)
     if callable(item) and hasattr(item, "_json_method"):
         LanguageServer.commands[item._json_method] = item
-
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 5664ab6..5e4ef89 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -31,13 +31,16 @@ class TextDocumentSyncKind(enum.IntEnum):
     Full = 1
     Incremental = 2
 
+
 class CompletionItemTag(enum.IntEnum):
     Deprecated = 1
 
+
 class InsertTextFormat(enum.IntEnum):
     PlainText = 1
     Snippet = 2
 
+
 class CompletionItemKind(enum.IntEnum):
     Text = 1
     Method = 2
@@ -91,12 +94,14 @@ class Completion:
             "documentation": {
                 "kind": "markdown",
                 "value": self.docs,
-            } if self.docs else None,
+            }
+            if self.docs
+            else None,
             "deprecated": self.deprecated,
             "insertText": insert_text,
             "insertTextFormat": insert_text_format,
         }
-        return { k: v for k, v in result.items() if v is not None }
+        return {k: v for k, v in result.items() if v is not None}
 
 
 class SemanticTokenType(enum.IntEnum):
@@ -110,7 +115,6 @@ class DiagnosticSeverity(enum.IntEnum):
     Hint = 4
 
 
-
 @dataclass
 class SemanticToken:
     start: int
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 124654d..4e4d378 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -30,24 +30,41 @@ from .outputs import XmlOutput
 VERSION = "uninstalled"
 LIBDIR = None
 
+
 class BlueprintApp:
     def main(self):
         self.parser = argparse.ArgumentParser()
         self.subparsers = self.parser.add_subparsers(metavar="command")
         self.parser.set_defaults(func=self.cmd_help)
 
-        compile = self.add_subcommand("compile", "Compile blueprint files", self.cmd_compile)
+        compile = self.add_subcommand(
+            "compile", "Compile blueprint files", self.cmd_compile
+        )
         compile.add_argument("--output", dest="output", default="-")
-        compile.add_argument("input", metavar="filename", default=sys.stdin, type=argparse.FileType('r'))
+        compile.add_argument(
+            "input", metavar="filename", default=sys.stdin, type=argparse.FileType("r")
+        )
 
-        batch_compile = self.add_subcommand("batch-compile", "Compile many blueprint files at once", self.cmd_batch_compile)
+        batch_compile = self.add_subcommand(
+            "batch-compile",
+            "Compile many blueprint files at once",
+            self.cmd_batch_compile,
+        )
         batch_compile.add_argument("output_dir", metavar="output-dir")
         batch_compile.add_argument("input_dir", metavar="input-dir")
-        batch_compile.add_argument("inputs", nargs="+", metavar="filenames", default=sys.stdin, type=argparse.FileType('r'))
+        batch_compile.add_argument(
+            "inputs",
+            nargs="+",
+            metavar="filenames",
+            default=sys.stdin,
+            type=argparse.FileType("r"),
+        )
 
         port = self.add_subcommand("port", "Interactive porting tool", self.cmd_port)
 
-        lsp = self.add_subcommand("lsp", "Run the language server (for internal use by IDEs)", self.cmd_lsp)
+        lsp = self.add_subcommand(
+            "lsp", "Run the language server (for internal use by IDEs)", self.cmd_lsp
+        )
 
         self.add_subcommand("help", "Show this message", self.cmd_help)
 
@@ -65,17 +82,14 @@ class BlueprintApp:
         except:
             report_bug()
 
-
     def add_subcommand(self, name, help, func):
         parser = self.subparsers.add_parser(name, help=help)
         parser.set_defaults(func=func)
         return parser
 
-
     def cmd_help(self, opts):
         self.parser.print_help()
 
-
     def cmd_compile(self, opts):
         data = opts.input.read()
         try:
@@ -93,14 +107,15 @@ class BlueprintApp:
             e.pretty_print(opts.input.name, data)
             sys.exit(1)
 
-
     def cmd_batch_compile(self, opts):
         for file in opts.inputs:
             data = file.read()
 
             try:
                 if not os.path.commonpath([file.name, opts.input_dir]):
-                    print(f"{Colors.RED}{Colors.BOLD}error: input file '{file.name}' is not in input directory '{opts.input_dir}'{Colors.CLEAR}")
+                    print(
+                        f"{Colors.RED}{Colors.BOLD}error: input file '{file.name}' is not in input directory '{opts.input_dir}'{Colors.CLEAR}"
+                    )
                     sys.exit(1)
 
                 xml, warnings = self._compile(data)
@@ -111,9 +126,8 @@ class BlueprintApp:
                 path = os.path.join(
                     opts.output_dir,
                     os.path.relpath(
-                        os.path.splitext(file.name)[0] + ".ui",
-                        opts.input_dir
-                    )
+                        os.path.splitext(file.name)[0] + ".ui", opts.input_dir
+                    ),
                 )
                 os.makedirs(os.path.dirname(path), exist_ok=True)
                 with open(path, "w") as file:
@@ -122,16 +136,13 @@ class BlueprintApp:
                 e.pretty_print(file.name, data)
                 sys.exit(1)
 
-
     def cmd_lsp(self, opts):
         langserv = LanguageServer()
         langserv.run()
 
-
     def cmd_port(self, opts):
         interactive_port.run(opts)
 
-
     def _compile(self, data: str) -> T.Tuple[str, T.List[PrintableError]]:
         tokens = tokenizer.tokenize(data)
         ast, errors, warnings = parser.parse(tokens)
diff --git a/blueprintcompiler/outputs/__init__.py b/blueprintcompiler/outputs/__init__.py
index e3054a3..6cdb07b 100644
--- a/blueprintcompiler/outputs/__init__.py
+++ b/blueprintcompiler/outputs/__init__.py
@@ -1,7 +1,9 @@
 from ..language import UI
 
+
 class OutputFormat:
     def emit(self, ui: UI) -> str:
         raise NotImplementedError()
 
+
 from .xml import XmlOutput
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index 0e2644b..6634994 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -24,7 +24,13 @@ import typing as T
 from collections import defaultdict
 from enum import Enum
 
-from .errors import assert_true, CompilerBugError, CompileError, CompileWarning, UnexpectedTokenError
+from .errors import (
+    assert_true,
+    CompilerBugError,
+    CompileError,
+    CompileWarning,
+    UnexpectedTokenError,
+)
 from .tokenizer import Token, TokenType
 
 
@@ -32,15 +38,15 @@ SKIP_TOKENS = [TokenType.COMMENT, TokenType.WHITESPACE]
 
 
 class ParseResult(Enum):
-    """ Represents the result of parsing. The extra EMPTY result is necessary
+    """Represents the result of parsing. The extra EMPTY result is necessary
     to avoid freezing the parser: imagine a ZeroOrMore node containing a node
     that can match empty. It will repeatedly match empty and never advance
     the parser. So, ZeroOrMore stops when a failed *or empty* match is
-    made. """
+    made."""
 
     SUCCESS = 0
     FAILURE = 1
-    EMPTY   = 2
+    EMPTY = 2
 
     def matched(self):
         return self == ParseResult.SUCCESS
@@ -53,10 +59,10 @@ class ParseResult(Enum):
 
 
 class ParseGroup:
-    """ A matching group. Match groups have an AST type, children grouped by
+    """A matching group. Match groups have an AST type, children grouped by
     type, and key=value pairs. At the end of parsing, the match groups will
     be converted to AST nodes by passing the children and key=value pairs to
-    the AST node constructor. """
+    the AST node constructor."""
 
     def __init__(self, ast_type, start: int):
         self.ast_type = ast_type
@@ -77,23 +83,27 @@ class ParseGroup:
         self.tokens[key] = token
 
     def to_ast(self):
-        """ Creates an AST node from the match group. """
+        """Creates an AST node from the match group."""
         children = [child.to_ast() for child in self.children]
 
         try:
             return self.ast_type(self, children, self.keys, incomplete=self.incomplete)
         except TypeError as e:
-            raise CompilerBugError(f"Failed to construct ast.{self.ast_type.__name__} from ParseGroup. See the previous stacktrace.")
+            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])
+        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. """
+    """Contains the state of the parser."""
 
     def __init__(self, tokens, index=0):
         self.tokens = list(tokens)
@@ -110,12 +120,11 @@ class ParseContext:
         self.errors = []
         self.warnings = []
 
-
     def create_child(self):
-        """ Creates a new ParseContext at this context's position. The new
+        """Creates a new ParseContext at this context's position. The new
         context will be used to parse one node. If parsing is successful, the
         new context will be applied to "self". If parsing fails, the new
-        context will be discarded. """
+        context will be discarded."""
         ctx = ParseContext(self.tokens, self.index)
         ctx.errors = self.errors
         ctx.warnings = self.warnings
@@ -123,7 +132,7 @@ class ParseContext:
         return ctx
 
     def apply_child(self, other):
-        """ Applies a child context to this context. """
+        """Applies a child context to this context."""
 
         if other.group is not None:
             # If the other context had a match group, collect all the matched
@@ -150,43 +159,44 @@ class ParseContext:
         elif other.last_group:
             self.last_group = other.last_group
 
-
     def start_group(self, ast_type):
-        """ Sets this context to have its own match group. """
+        """Sets this context to have its own match group."""
         assert_true(self.group is None)
         self.group = ParseGroup(ast_type, self.tokens[self.index].start)
 
     def set_group_val(self, key, value, token):
-        """ Sets a matched key=value pair on the current match group. """
+        """Sets a matched key=value pair on the current match group."""
         assert_true(key not in self.group_keys)
         self.group_keys[key] = (value, token)
 
     def set_group_incomplete(self):
-        """ Marks the current match group as incomplete (it could not be fully
-        parsed, but the parser recovered). """
+        """Marks the current match group as incomplete (it could not be fully
+        parsed, but the parser recovered)."""
         self.group_incomplete = True
 
-
     def skip(self):
-        """ Skips whitespace and comments. """
-        while self.index < len(self.tokens) and self.tokens[self.index].type in SKIP_TOKENS:
+        """Skips whitespace and comments."""
+        while (
+            self.index < len(self.tokens)
+            and self.tokens[self.index].type in SKIP_TOKENS
+        ):
             self.index += 1
 
     def next_token(self) -> Token:
-        """ Advances the token iterator and returns the next token. """
+        """Advances the token iterator and returns the next token."""
         self.skip()
         token = self.tokens[self.index]
         self.index += 1
         return token
 
     def peek_token(self) -> Token:
-        """ Returns the next token without advancing the iterator. """
+        """Returns the next token without advancing the iterator."""
         self.skip()
         token = self.tokens[self.index]
         return token
 
     def skip_unexpected_token(self):
-        """ Skips a token and logs an "unexpected token" error. """
+        """Skips a token and logs an "unexpected token" error."""
 
         self.skip()
         start = self.tokens[self.index].start
@@ -194,9 +204,11 @@ class ParseContext:
         self.skip()
         end = self.tokens[self.index - 1].end
 
-        if (len(self.errors)
-                and isinstance((err := self.errors[-1]), UnexpectedTokenError)
-                and err.end == start):
+        if (
+            len(self.errors)
+            and isinstance((err := self.errors[-1]), UnexpectedTokenError)
+            and err.end == start
+        ):
             err.end = end
         else:
             self.errors.append(UnexpectedTokenError(start, end))
@@ -206,10 +218,10 @@ class ParseContext:
 
 
 class ParseNode:
-    """ Base class for the nodes in the parser tree. """
+    """Base class for the nodes in the parser tree."""
 
     def parse(self, ctx: ParseContext) -> ParseResult:
-        """ Attempts to match the ParseNode at the context's current location. """
+        """Attempts to match the ParseNode at the context's current location."""
         start_idx = ctx.index
         inner_ctx = ctx.create_child()
 
@@ -226,22 +238,22 @@ class ParseNode:
         raise NotImplementedError()
 
     def err(self, message):
-        """ Causes this ParseNode to raise an exception if it fails to parse.
+        """Causes this ParseNode to raise an exception if it fails to parse.
         This prevents the parser from backtracking, so you should understand
-        what it does and how the parser works before using it. """
+        what it does and how the parser works before using it."""
         return Err(self, message)
 
     def expected(self, expect):
-        """ Convenience method for err(). """
+        """Convenience method for err()."""
         return self.err("Expected " + expect)
 
     def warn(self, message):
-        """ Causes this ParseNode to emit a warning if it parses successfully. """
+        """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. """
+    """ParseNode that emits a compile error if it fails to parse."""
 
     def __init__(self, child, message):
         self.child = to_parse_node(child)
@@ -260,7 +272,7 @@ class Err(ParseNode):
 
 
 class Warning(ParseNode):
-    """ ParseNode that emits a compile warning if it parses successfully. """
+    """ParseNode that emits a compile warning if it parses successfully."""
 
     def __init__(self, child, message):
         self.child = to_parse_node(child)
@@ -272,12 +284,14 @@ class Warning(ParseNode):
         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))
+            ctx.warnings.append(
+                CompileWarning(self.message, start_token.start, end_token.end)
+            )
         return True
 
 
 class Fail(ParseNode):
-    """ ParseNode that emits a compile error if it parses successfully. """
+    """ParseNode that emits a compile error if it parses successfully."""
 
     def __init__(self, child, message):
         self.child = to_parse_node(child)
@@ -296,7 +310,8 @@ class Fail(ParseNode):
 
 
 class Group(ParseNode):
-    """ ParseNode that creates a match group. """
+    """ParseNode that creates a match group."""
+
     def __init__(self, ast_type, child):
         self.ast_type = ast_type
         self.child = to_parse_node(child)
@@ -308,7 +323,8 @@ class Group(ParseNode):
 
 
 class Sequence(ParseNode):
-    """ ParseNode that attempts to match all of its children in sequence. """
+    """ParseNode that attempts to match all of its children in sequence."""
+
     def __init__(self, *children):
         self.children = [to_parse_node(child) for child in children]
 
@@ -320,8 +336,9 @@ class Sequence(ParseNode):
 
 
 class Statement(ParseNode):
-    """ ParseNode that attempts to match all of its children in sequence. If any
-    child raises an error, the error will be logged but parsing will continue. """
+    """ParseNode that attempts to match all of its children in sequence. If any
+    child raises an error, the error will be logged but parsing will continue."""
+
     def __init__(self, *children):
         self.children = [to_parse_node(child) for child in children]
 
@@ -344,14 +361,16 @@ class Statement(ParseNode):
 
 
 class AnyOf(ParseNode):
-    """ ParseNode that attempts to match exactly one of its children. Child
-    nodes are attempted in order. """
+    """ParseNode that attempts to match exactly one of its children. Child
+    nodes are attempted in order."""
+
     def __init__(self, *children):
         self.children = children
 
     @property
     def children(self):
         return self._children
+
     @children.setter
     def children(self, children):
         self._children = [to_parse_node(child) for child in children]
@@ -364,9 +383,10 @@ class AnyOf(ParseNode):
 
 
 class Until(ParseNode):
-    """ ParseNode that repeats its child until a delimiting token is found. If
+    """ParseNode that repeats its child until a delimiting token is found. If
     the child does not match, one token is skipped and the match is attempted
-    again. """
+    again."""
+
     def __init__(self, child, delimiter):
         self.child = to_parse_node(child)
         self.delimiter = to_parse_node(delimiter)
@@ -387,13 +407,13 @@ class Until(ParseNode):
 
 
 class ZeroOrMore(ParseNode):
-    """ ParseNode that matches its child any number of times (including zero
+    """ParseNode that matches its child any number of times (including zero
     times). It cannot fail to parse. If its child raises an exception, one token
-    will be skipped and parsing will continue. """
+    will be skipped and parsing will continue."""
+
     def __init__(self, child):
         self.child = to_parse_node(child)
 
-
     def _parse(self, ctx):
         while True:
             try:
@@ -405,8 +425,9 @@ class ZeroOrMore(ParseNode):
 
 
 class Delimited(ParseNode):
-    """ ParseNode that matches its first child any number of times (including zero
-    times) with its second child in between and optionally at the end. """
+    """ParseNode that matches its first child any number of times (including zero
+    times) with its second child in between and optionally at the end."""
+
     def __init__(self, child, delimiter):
         self.child = to_parse_node(child)
         self.delimiter = to_parse_node(delimiter)
@@ -418,8 +439,9 @@ class Delimited(ParseNode):
 
 
 class Optional(ParseNode):
-    """ ParseNode that matches its child zero or one times. It cannot fail to
-    parse. """
+    """ParseNode that matches its child zero or one times. It cannot fail to
+    parse."""
+
     def __init__(self, child):
         self.child = to_parse_node(child)
 
@@ -429,14 +451,16 @@ class Optional(ParseNode):
 
 
 class Eof(ParseNode):
-    """ ParseNode that matches an EOF token. """
+    """ParseNode that matches an EOF token."""
+
     def _parse(self, ctx: ParseContext) -> bool:
         token = ctx.next_token()
         return token.type == TokenType.EOF
 
 
 class Match(ParseNode):
-    """ ParseNode that matches the given literal token. """
+    """ParseNode that matches the given literal token."""
+
     def __init__(self, op):
         self.op = op
 
@@ -445,7 +469,7 @@ class Match(ParseNode):
         return str(token) == self.op
 
     def expected(self, expect: T.Optional[str] = None):
-        """ Convenience method for err(). """
+        """Convenience method for err()."""
         if expect is None:
             return self.err(f"Expected '{self.op}'")
         else:
@@ -453,8 +477,9 @@ class Match(ParseNode):
 
 
 class UseIdent(ParseNode):
-    """ ParseNode that matches any identifier and sets it in a key=value pair on
-    the containing match group. """
+    """ParseNode that matches any identifier and sets it in a key=value pair on
+    the containing match group."""
+
     def __init__(self, key):
         self.key = key
 
@@ -468,8 +493,9 @@ class UseIdent(ParseNode):
 
 
 class UseNumber(ParseNode):
-    """ ParseNode that matches a number and sets it in a key=value pair on
-    the containing match group. """
+    """ParseNode that matches a number and sets it in a key=value pair on
+    the containing match group."""
+
     def __init__(self, key):
         self.key = key
 
@@ -486,8 +512,9 @@ class UseNumber(ParseNode):
 
 
 class UseNumberText(ParseNode):
-    """ ParseNode that matches a number, but sets its *original text* it in a
-    key=value pair on the containing match group. """
+    """ParseNode that matches a number, but sets its *original text* it in a
+    key=value pair on the containing match group."""
+
     def __init__(self, key):
         self.key = key
 
@@ -501,8 +528,9 @@ class UseNumberText(ParseNode):
 
 
 class UseQuoted(ParseNode):
-    """ ParseNode that matches a quoted string and sets it in a key=value pair
-    on the containing match group. """
+    """ParseNode that matches a quoted string and sets it in a key=value pair
+    on the containing match group."""
+
     def __init__(self, key):
         self.key = key
 
@@ -511,19 +539,22 @@ class UseQuoted(ParseNode):
         if token.type != TokenType.QUOTED:
             return False
 
-        string = (str(token)[1:-1]
+        string = (
+            str(token)[1:-1]
             .replace("\\n", "\n")
-            .replace("\\\"", "\"")
+            .replace('\\"', '"')
             .replace("\\\\", "\\")
-            .replace("\\'", "\'"))
+            .replace("\\'", "'")
+        )
         ctx.set_group_val(self.key, string, token)
         return True
 
 
 class UseLiteral(ParseNode):
-    """ ParseNode that doesn't match anything, but rather sets a static key=value
+    """ParseNode that doesn't match anything, but rather sets a static key=value
     pair on the containing group. Useful for, e.g., property and signal flags:
-    `Sequence(Keyword("swapped"), UseLiteral("swapped", True))` """
+    `Sequence(Keyword("swapped"), UseLiteral("swapped", True))`"""
+
     def __init__(self, key, literal):
         self.key = key
         self.literal = literal
@@ -534,8 +565,9 @@ class UseLiteral(ParseNode):
 
 
 class Keyword(ParseNode):
-    """ Matches the given identifier and sets it as a named token, with the name
-    being the identifier itself. """
+    """Matches the given identifier and sets it as a named token, with the name
+    being the identifier itself."""
+
     def __init__(self, kw):
         self.kw = kw
         self.set_token = True
@@ -565,12 +597,13 @@ class Infix(ParseNode):
 
     def __lt__(self, other):
         return self.binding_power < other.binding_power
+
     def __eq__(self, other):
         return self.binding_power == other.binding_power
 
 
 class Pratt(ParseNode):
-    """ Basic Pratt parser implementation. """
+    """Basic Pratt parser implementation."""
 
     def __init__(self, *children):
         self.children = children
@@ -578,11 +611,14 @@ class Pratt(ParseNode):
     @property
     def children(self):
         return self._children
+
     @children.setter
     def children(self, children):
         self._children = children
         self.prefixes = [child for child in children if isinstance(child, Prefix)]
-        self.infixes = sorted([child for child in children if isinstance(child, Infix)], reverse=True)
+        self.infixes = sorted(
+            [child for child in children if isinstance(child, Infix)], reverse=True
+        )
 
     def _parse(self, ctx: ParseContext) -> bool:
         for prefix in self.prefixes:
diff --git a/blueprintcompiler/parser.py b/blueprintcompiler/parser.py
index 739a165..12c893a 100644
--- a/blueprintcompiler/parser.py
+++ b/blueprintcompiler/parser.py
@@ -25,7 +25,7 @@ from .language import OBJECT_CONTENT_HOOKS, VALUE_HOOKS, Template, UI
 
 
 def parse(tokens) -> T.Tuple[UI, T.Optional[MultipleErrors], T.List[PrintableError]]:
-    """ Parses a list of tokens into an abstract syntax tree. """
+    """Parses a list of tokens into an abstract syntax tree."""
 
     ctx = ParseContext(tokens)
     AnyOf(UI).parse(ctx)
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 2e7fa1b..4991967 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -26,28 +26,28 @@ from .errors import CompileError
 
 
 class TokenType(Enum):
-    EOF             = 0
-    IDENT           = 1
-    QUOTED          = 2
-    NUMBER          = 3
-    OP              = 4
-    WHITESPACE      = 5
-    COMMENT         = 6
-    PUNCTUATION     = 7
+    EOF = 0
+    IDENT = 1
+    QUOTED = 2
+    NUMBER = 3
+    OP = 4
+    WHITESPACE = 5
+    COMMENT = 6
+    PUNCTUATION = 7
 
 
 _tokens = [
-    (TokenType.IDENT,           r"[A-Za-z_][\d\w\-_]*"),
-    (TokenType.QUOTED,          r'"(\\"|[^"\n])*"'),
-    (TokenType.QUOTED,          r"'(\\'|[^'\n])*'"),
-    (TokenType.NUMBER,          r"0x[A-Za-z0-9_]+"),
-    (TokenType.NUMBER,          r"[-+]?[\d_]+(\.[\d_]+)?"),
-    (TokenType.NUMBER,          r"[-+]?\.[\d_]+"),
-    (TokenType.WHITESPACE,      r"\s+"),
-    (TokenType.COMMENT,         r"\/\*[\s\S]*?\*\/"),
-    (TokenType.COMMENT,         r"\/\/[^\n]*"),
-    (TokenType.OP,              r"<<|>>|=>|::|<|>|:=|\.|\|\||\||\+|\-|\*|=|:|/"),
-    (TokenType.PUNCTUATION,     r"\(|\)|\{|\}|;|\[|\]|\,"),
+    (TokenType.IDENT, r"[A-Za-z_][\d\w\-_]*"),
+    (TokenType.QUOTED, r'"(\\"|[^"\n])*"'),
+    (TokenType.QUOTED, r"'(\\'|[^'\n])*'"),
+    (TokenType.NUMBER, r"0x[A-Za-z0-9_]+"),
+    (TokenType.NUMBER, r"[-+]?[\d_]+(\.[\d_]+)?"),
+    (TokenType.NUMBER, r"[-+]?\.[\d_]+"),
+    (TokenType.WHITESPACE, r"\s+"),
+    (TokenType.COMMENT, r"\/\*[\s\S]*?\*\/"),
+    (TokenType.COMMENT, r"\/\/[^\n]*"),
+    (TokenType.OP, r"<<|>>|=>|::|<|>|:=|\.|\|\||\||\+|\-|\*|=|:|/"),
+    (TokenType.PUNCTUATION, r"\(|\)|\{|\}|;|\[|\]|\,"),
 ]
 _TOKENS = [(type, re.compile(regex)) for (type, regex) in _tokens]
 
@@ -60,7 +60,7 @@ class Token:
         self.string = string
 
     def __str__(self):
-        return self.string[self.start:self.end]
+        return self.string[self.start : self.end]
 
     def get_number(self):
         if self.type != TokenType.NUMBER:
@@ -73,7 +73,9 @@ class Token:
             else:
                 return float(string.replace("_", ""))
         except:
-            raise CompileError(f"{str(self)} is not a valid number literal", self.start, self.end)
+            raise CompileError(
+                f"{str(self)} is not a valid number literal", self.start, self.end
+            )
 
 
 def _tokenize(ui_ml: str):
@@ -90,7 +92,9 @@ def _tokenize(ui_ml: str):
                 break
 
         if not matched:
-            raise CompileError("Could not determine what kind of syntax is meant here", i, i)
+            raise CompileError(
+                "Could not determine what kind of syntax is meant here", i, i
+            )
 
     yield Token(TokenType.EOF, i, i, ui_ml)
 
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index 0946320..88e7b57 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -241,7 +241,9 @@ class Typelib:
         return self._typelib_file[loc:end].decode("utf-8")
 
     def _int(self, size, signed):
-        return int.from_bytes(self._typelib_file[self._offset:self._offset + size], sys.byteorder)
+        return int.from_bytes(
+            self._typelib_file[self._offset : self._offset + size], sys.byteorder
+        )
 
 
 class TypelibHeader(Typelib):
diff --git a/blueprintcompiler/utils.py b/blueprintcompiler/utils.py
index 2d5451d..1c69fd9 100644
--- a/blueprintcompiler/utils.py
+++ b/blueprintcompiler/utils.py
@@ -21,15 +21,15 @@ import typing as T
 
 
 class Colors:
-    RED = '\033[91m'
-    GREEN = '\033[92m'
-    YELLOW = '\033[33m'
-    FAINT = '\033[2m'
-    BOLD = '\033[1m'
-    BLUE = '\033[34m'
-    UNDERLINE = '\033[4m'
-    NO_UNDERLINE = '\033[24m'
-    CLEAR = '\033[0m'
+    RED = "\033[91m"
+    GREEN = "\033[92m"
+    YELLOW = "\033[33m"
+    FAINT = "\033[2m"
+    BOLD = "\033[1m"
+    BLUE = "\033[34m"
+    UNDERLINE = "\033[4m"
+    NO_UNDERLINE = "\033[24m"
+    CLEAR = "\033[0m"
 
 
 def did_you_mean(word: str, options: T.List[str]) -> T.Optional[str]:
@@ -56,12 +56,16 @@ def did_you_mean(word: str, options: T.List[str]) -> T.Optional[str]:
                         cost = 1
                     else:
                         cost = 2
-                distances[i][j] = min(distances[i-1][j] + 2, distances[i][j-1] + 2, distances[i-1][j-1] + cost)
+                distances[i][j] = min(
+                    distances[i - 1][j] + 2,
+                    distances[i][j - 1] + 2,
+                    distances[i - 1][j - 1] + cost,
+                )
 
-        return distances[m-1][n-1]
+        return distances[m - 1][n - 1]
 
     distances = [(option, levenshtein(word, option)) for option in options]
-    closest = min(distances, key=lambda item:item[1])
+    closest = min(distances, key=lambda item: item[1])
     if closest[1] <= 5:
         return closest[0]
     return None
@@ -75,10 +79,12 @@ def idx_to_pos(idx: int, text: str) -> T.Tuple[int, int]:
     col_num = len(sp[-1])
     return (line_num - 1, col_num)
 
+
 def pos_to_idx(line: int, col: int, text: str) -> int:
     lines = text.splitlines(keepends=True)
     return sum([len(line) for line in lines[:line]]) + col
 
+
 def idxs_to_range(start: int, end: int, text: str):
     start_l, start_c = idx_to_pos(start, text)
     end_l, end_c = idx_to_pos(end, text)
diff --git a/blueprintcompiler/xml_reader.py b/blueprintcompiler/xml_reader.py
index 24ae5ff..c0552f5 100644
--- a/blueprintcompiler/xml_reader.py
+++ b/blueprintcompiler/xml_reader.py
@@ -25,11 +25,24 @@ from xml import sax
 
 
 # To speed up parsing, we ignore all tags except these
-PARSE_GIR = set([
-    "repository", "namespace", "class", "interface", "property", "glib:signal",
-    "include", "implements", "type", "parameter", "parameters", "enumeration",
-    "member", "bitfield",
-])
+PARSE_GIR = set(
+    [
+        "repository",
+        "namespace",
+        "class",
+        "interface",
+        "property",
+        "glib:signal",
+        "include",
+        "implements",
+        "type",
+        "parameter",
+        "parameters",
+        "enumeration",
+        "member",
+        "bitfield",
+    ]
+)
 
 
 class Element:
@@ -41,14 +54,10 @@ class Element:
 
     @cached_property
     def cdata(self):
-        return ''.join(self.cdata_chunks)
+        return "".join(self.cdata_chunks)
 
     def get_elements(self, name) -> T.List["Element"]:
-        return [
-            child
-            for child in self.children
-            if child.tag == name
-        ]
+        return [child for child in self.children if child.tag == name]
 
     def __getitem__(self, key):
         return self.attrs.get(key)
diff --git a/tests/fuzz.py b/tests/fuzz.py
index 1ebd02d..0f6a1a7 100644
--- a/tests/fuzz.py
+++ b/tests/fuzz.py
@@ -7,10 +7,16 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
 from blueprintcompiler import tokenizer, parser, decompiler, gir
 from blueprintcompiler.completions import complete
-from blueprintcompiler.errors import PrintableError, MultipleErrors, CompileError, CompilerBugError
+from blueprintcompiler.errors import (
+    PrintableError,
+    MultipleErrors,
+    CompileError,
+    CompilerBugError,
+)
 from blueprintcompiler.tokenizer import Token, TokenType, tokenize
 from blueprintcompiler import utils
 
+
 @PythonFuzz
 def fuzz(buf):
     try:
@@ -29,6 +35,7 @@ def fuzz(buf):
     except UnicodeDecodeError:
         pass
 
+
 if __name__ == "__main__":
     # Make sure Gtk 4.0 is accessible, otherwise every test will fail on that
     # and nothing interesting will be tested
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 5f0d9e5..e63c36c 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-import difflib # I love Python
+import difflib  # I love Python
 from pathlib import Path
 import traceback
 import unittest
@@ -59,23 +59,26 @@ class TestSamples(unittest.TestCase):
 
             xml = XmlOutput()
             actual = xml.emit(ast)
-            if actual.strip() != expected.strip(): # pragma: no cover
+            if actual.strip() != expected.strip():  # pragma: no cover
                 diff = difflib.unified_diff(expected.splitlines(), actual.splitlines())
                 print("\n".join(diff))
                 raise AssertionError()
 
             self.assert_docs_dont_crash(blueprint, ast)
             self.assert_completions_dont_crash(blueprint, ast, tokens)
-        except PrintableError as e: # pragma: no cover
+        except PrintableError as e:  # pragma: no cover
             e.pretty_print(name + ".blp", blueprint)
             raise AssertionError()
 
-
     def assert_sample_error(self, name):
         try:
-            with open((Path(__file__).parent / f"sample_errors/{name}.blp").resolve()) as f:
+            with open(
+                (Path(__file__).parent / f"sample_errors/{name}.blp").resolve()
+            ) as f:
                 blueprint = f.read()
-            with open((Path(__file__).parent / f"sample_errors/{name}.err").resolve()) as f:
+            with open(
+                (Path(__file__).parent / f"sample_errors/{name}.err").resolve()
+            ) as f:
                 expected = f.read()
 
             tokens = tokenizer.tokenize(blueprint)
@@ -91,6 +94,7 @@ class TestSamples(unittest.TestCase):
             if len(warnings):
                 raise MultipleErrors(warnings)
         except PrintableError as e:
+
             def error_str(error):
                 line, col = utils.idx_to_pos(error.start + 1, blueprint)
                 len = error.end - error.start
@@ -100,17 +104,16 @@ class TestSamples(unittest.TestCase):
                 actual = error_str(e)
             elif isinstance(e, MultipleErrors):
                 actual = "\n".join([error_str(error) for error in e.errors])
-            else: # pragma: no cover
+            else:  # pragma: no cover
                 raise AssertionError()
 
-            if actual.strip() != expected.strip(): # pragma: no cover
+            if actual.strip() != expected.strip():  # pragma: no cover
                 diff = difflib.unified_diff(expected.splitlines(), actual.splitlines())
                 print("\n".join(diff))
                 raise AssertionError()
-        else: # pragma: no cover
+        else:  # pragma: no cover
             raise AssertionError("Expected a compiler error, but none was emitted")
 
-
     def assert_decompile(self, name):
         try:
             with open((Path(__file__).parent / f"samples/{name}.blp").resolve()) as f:
@@ -121,15 +124,14 @@ class TestSamples(unittest.TestCase):
 
             actual = decompiler.decompile(ui_path)
 
-            if actual.strip() != expected.strip(): # pragma: no cover
+            if actual.strip() != expected.strip():  # pragma: no cover
                 diff = difflib.unified_diff(expected.splitlines(), actual.splitlines())
                 print("\n".join(diff))
                 raise AssertionError()
-        except PrintableError as e: # pragma: no cover
+        except PrintableError as e:  # pragma: no cover
             e.pretty_print(name + ".blp", blueprint)
             raise AssertionError()
 
-
     def test_samples(self):
         self.assert_sample("accessibility")
         self.assert_sample("action_widgets")
@@ -161,7 +163,6 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("unchecked_class")
         self.assert_sample("using")
 
-
     def test_sample_errors(self):
         self.assert_sample_error("a11y_in_non_widget")
         self.assert_sample_error("a11y_prop_dne")
@@ -209,7 +210,6 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("using_invalid_namespace")
         self.assert_sample_error("widgets_in_non_size_group")
 
-
     def test_decompiler(self):
         self.assert_decompile("accessibility_dec")
         self.assert_decompile("binding")
diff --git a/tests/test_tokenizer.py b/tests/test_tokenizer.py
index 1c87e50..2bca595 100644
--- a/tests/test_tokenizer.py
+++ b/tests/test_tokenizer.py
@@ -32,47 +32,57 @@ class TestTokenizer(unittest.TestCase):
             for token, (type, token_str) in zip(tokens, expect):
                 self.assertEqual(token.type, type)
                 self.assertEqual(str(token), token_str)
-        except PrintableError as e: # pragma: no cover
+        except PrintableError as e:  # pragma: no cover
             e.pretty_print("<test input>", string)
             raise e
 
-
     def test_basic(self):
-        self.assert_tokenize("ident(){}; \n <<+>>*/=", [
-            (TokenType.IDENT, "ident"),
-            (TokenType.PUNCTUATION, "("),
-            (TokenType.PUNCTUATION, ")"),
-            (TokenType.PUNCTUATION, "{"),
-            (TokenType.PUNCTUATION, "}"),
-            (TokenType.PUNCTUATION, ";"),
-            (TokenType.WHITESPACE, " \n "),
-            (TokenType.OP, "<<"),
-            (TokenType.OP, "+"),
-            (TokenType.OP, ">>"),
-            (TokenType.OP, "*"),
-            (TokenType.OP, "/"),
-            (TokenType.OP, "="),
-            (TokenType.EOF, ""),
-        ])
+        self.assert_tokenize(
+            "ident(){}; \n <<+>>*/=",
+            [
+                (TokenType.IDENT, "ident"),
+                (TokenType.PUNCTUATION, "("),
+                (TokenType.PUNCTUATION, ")"),
+                (TokenType.PUNCTUATION, "{"),
+                (TokenType.PUNCTUATION, "}"),
+                (TokenType.PUNCTUATION, ";"),
+                (TokenType.WHITESPACE, " \n "),
+                (TokenType.OP, "<<"),
+                (TokenType.OP, "+"),
+                (TokenType.OP, ">>"),
+                (TokenType.OP, "*"),
+                (TokenType.OP, "/"),
+                (TokenType.OP, "="),
+                (TokenType.EOF, ""),
+            ],
+        )
 
     def test_quotes(self):
-        self.assert_tokenize(r'"this is a \n string""this is \\another \"string\""', [
-            (TokenType.QUOTED, r'"this is a \n string"'),
-            (TokenType.QUOTED, r'"this is \\another \"string\""'),
-            (TokenType.EOF, ""),
-        ])
+        self.assert_tokenize(
+            r'"this is a \n string""this is \\another \"string\""',
+            [
+                (TokenType.QUOTED, r'"this is a \n string"'),
+                (TokenType.QUOTED, r'"this is \\another \"string\""'),
+                (TokenType.EOF, ""),
+            ],
+        )
 
     def test_comments(self):
-        self.assert_tokenize('/* \n \\n COMMENT /* */', [
-            (TokenType.COMMENT, '/* \n \\n COMMENT /* */'),
-            (TokenType.EOF, ""),
-        ])
-        self.assert_tokenize('line // comment\nline', [
-            (TokenType.IDENT, 'line'),
-            (TokenType.WHITESPACE, ' '),
-            (TokenType.COMMENT, '// comment'),
-            (TokenType.WHITESPACE, '\n'),
-            (TokenType.IDENT, 'line'),
-            (TokenType.EOF, ""),
-        ])
-
+        self.assert_tokenize(
+            "/* \n \\n COMMENT /* */",
+            [
+                (TokenType.COMMENT, "/* \n \\n COMMENT /* */"),
+                (TokenType.EOF, ""),
+            ],
+        )
+        self.assert_tokenize(
+            "line // comment\nline",
+            [
+                (TokenType.IDENT, "line"),
+                (TokenType.WHITESPACE, " "),
+                (TokenType.COMMENT, "// comment"),
+                (TokenType.WHITESPACE, "\n"),
+                (TokenType.IDENT, "line"),
+                (TokenType.EOF, ""),
+            ],
+        )

From 83a7503e3a06d70a5babf5b65000b6fedae974e2 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 19 Dec 2022 12:03:50 -0600
Subject: [PATCH 053/290] ci: Check formatting

---
 .gitlab-ci.yml       | 1 +
 build-aux/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 598481b..90a9f8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ build:
   image: registry.gitlab.gnome.org/jwestman/blueprint-compiler
   stage: build
   script:
+    - black --check --diff blueprintcompiler tests
     - mypy --python-version=3.9 blueprintcompiler
     - coverage run -m unittest
     - coverage report
diff --git a/build-aux/Dockerfile b/build-aux/Dockerfile
index 4b9e0af..27c5a44 100644
--- a/build-aux/Dockerfile
+++ b/build-aux/Dockerfile
@@ -2,7 +2,7 @@ FROM fedora:latest
 
 RUN dnf install -y meson python3-pip gtk4-devel gobject-introspection-devel \
 	libadwaita-devel python3-devel python3-gobject git
-RUN pip3 install furo mypy sphinx coverage
+RUN pip3 install furo mypy sphinx coverage black
 
 # The version on PyPI is very old and doesn't install. Use the upstream package registry instead.
 RUN pip install pythonfuzz --extra-index-url https://gitlab.com/api/v4/projects/19904939/packages/pypi/simple
\ No newline at end of file

From 219891584c057f0e575390bd188794af40687f86 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 19 Dec 2022 12:22:37 -0600
Subject: [PATCH 054/290] ci: Fix Dockerfile

---
 build-aux/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-aux/Dockerfile b/build-aux/Dockerfile
index 27c5a44..e2c1081 100644
--- a/build-aux/Dockerfile
+++ b/build-aux/Dockerfile
@@ -1,7 +1,7 @@
 FROM fedora:latest
 
 RUN dnf install -y meson python3-pip gtk4-devel gobject-introspection-devel \
-	libadwaita-devel python3-devel python3-gobject git
+	libadwaita-devel python3-devel python3-gobject git diffutils
 RUN pip3 install furo mypy sphinx coverage black
 
 # The version on PyPI is very old and doesn't install. Use the upstream package registry instead.

From 8758bac40a14703eb5748249c577eb9f3541269f Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 19 Dec 2022 13:53:52 -0600
Subject: [PATCH 055/290] tests: Test XML outputs

Load the outputs of the tests in Gtk.Builder and make sure they work.
Some of them don't and need to be fixed. Others will require a bit more
work to set up callbacks, templates, etc.
---
 tests/samples/action_widgets.blp |  2 +-
 tests/samples/action_widgets.ui  |  4 +--
 tests/samples/numbers.blp        |  3 ++-
 tests/samples/numbers.ui         |  2 +-
 tests/samples/object_prop.blp    |  6 ++---
 tests/samples/object_prop.ui     | 10 ++++----
 tests/test_samples.py            | 43 ++++++++++++++++++++++++--------
 7 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/tests/samples/action_widgets.blp b/tests/samples/action_widgets.blp
index 34293a0..2d4d6ae 100644
--- a/tests/samples/action_widgets.blp
+++ b/tests/samples/action_widgets.blp
@@ -1,6 +1,6 @@
 using Gtk 4.0;
 
-template MyDialog : Dialog {
+Dialog {
     [action response=cancel]
     Button cancel_button {
         label: _("Cancel");
diff --git a/tests/samples/action_widgets.ui b/tests/samples/action_widgets.ui
index 8c41bb2..91b6e64 100644
--- a/tests/samples/action_widgets.ui
+++ b/tests/samples/action_widgets.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="MyDialog" parent="GtkDialog">
+  <object class="GtkDialog">
     <child type="action">
       <object class="GtkButton" id="cancel_button">
         <property name="label" translatable="true">Cancel</property>
@@ -22,7 +22,7 @@
       <action-widget response="9">custom_response_button</action-widget>
       <action-widget response="ok" default="True">ok_button</action-widget>
     </action-widgets>
-  </template>
+  </object>
   <object class="GtkInfoBar">
     <child type="action">
       <object class="GtkButton" id="ok_info_button">
diff --git a/tests/samples/numbers.blp b/tests/samples/numbers.blp
index 6364dd2..9ac25dd 100644
--- a/tests/samples/numbers.blp
+++ b/tests/samples/numbers.blp
@@ -2,6 +2,7 @@ using Gtk 4.0;
 
 Gtk.Label {
   xalign: .5;
-  margin-end: 1_000_000;
+  height-request: 1_000_000;
   margin-top: 0x30;
+
 }
diff --git a/tests/samples/numbers.ui b/tests/samples/numbers.ui
index bb70bd8..03dee06 100644
--- a/tests/samples/numbers.ui
+++ b/tests/samples/numbers.ui
@@ -3,7 +3,7 @@
   <requires lib="gtk" version="4.0"/>
   <object class="GtkLabel">
     <property name="xalign">0.5</property>
-    <property name="margin-end">1000000</property>
+    <property name="height-request">1000000</property>
     <property name="margin-top">48</property>
   </object>
 </interface>
diff --git a/tests/samples/object_prop.blp b/tests/samples/object_prop.blp
index eaccfd9..b7270ac 100644
--- a/tests/samples/object_prop.blp
+++ b/tests/samples/object_prop.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 
-template TestTemplate : Label {
-  test-property: Button {
-    label: "Hello, world!";
+Range {
+  adjustment: Adjustment {
+    lower: 10;
   };
 }
diff --git a/tests/samples/object_prop.ui b/tests/samples/object_prop.ui
index 46a62d9..5224073 100644
--- a/tests/samples/object_prop.ui
+++ b/tests/samples/object_prop.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="TestTemplate" parent="GtkLabel">
-    <property name="test-property">
-      <object class="GtkButton">
-        <property name="label">Hello, world!</property>
+  <object class="GtkRange">
+    <property name="adjustment">
+      <object class="GtkAdjustment">
+        <property name="lower">10</property>
       </object>
     </property>
-  </template>
+  </object>
 </interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index e63c36c..c745226 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -20,9 +20,13 @@
 
 import difflib  # I love Python
 from pathlib import Path
-import traceback
 import unittest
 
+import gi
+
+gi.require_version("Gtk", "4.0")
+from gi.repository import Gtk
+
 from blueprintcompiler import tokenizer, parser, decompiler
 from blueprintcompiler.completions import complete
 from blueprintcompiler.errors import PrintableError, MultipleErrors, CompileError
@@ -40,7 +44,8 @@ class TestSamples(unittest.TestCase):
         for i in range(len(text)):
             list(complete(ast, tokens, i))
 
-    def assert_sample(self, name):
+    def assert_sample(self, name, skip_run=False):
+        print(f'assert_sample("{name}", skip_run={skip_run})')
         try:
             with open((Path(__file__).parent / f"samples/{name}.blp").resolve()) as f:
                 blueprint = f.read()
@@ -70,7 +75,12 @@ class TestSamples(unittest.TestCase):
             e.pretty_print(name + ".blp", blueprint)
             raise AssertionError()
 
+        # Make sure the sample runs
+        if not skip_run:
+            Gtk.Builder.new_from_string(actual, -1)
+
     def assert_sample_error(self, name):
+        print(f'assert_sample_error("{name}")')
         try:
             with open(
                 (Path(__file__).parent / f"sample_errors/{name}.blp").resolve()
@@ -115,6 +125,7 @@ class TestSamples(unittest.TestCase):
             raise AssertionError("Expected a compiler error, but none was emitted")
 
     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()
@@ -140,27 +151,37 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("combo_box_text")
         self.assert_sample("comments")
         self.assert_sample("enum")
-        self.assert_sample("expr_lookup")
+        self.assert_sample("expr_lookup", skip_run=True)  # TODO: Fix
         self.assert_sample("file_filter")
-        self.assert_sample("flags")
+        self.assert_sample("flags", skip_run=True)  # TODO: Fix
         self.assert_sample("id_prop")
         self.assert_sample("layout")
-        self.assert_sample("menu")
+        self.assert_sample("menu", skip_run=True)  # TODO: Fix
         self.assert_sample("numbers")
         self.assert_sample("object_prop")
-        self.assert_sample("parseable")
+        self.assert_sample(
+            "parseable", skip_run=True
+        )  # The image resource doesn't exist
         self.assert_sample("property")
-        self.assert_sample("signal")
+        self.assert_sample("signal", skip_run=True)  # The callback doesn't exist
         self.assert_sample("size_group")
         self.assert_sample("string_list")
         self.assert_sample("strings")
         self.assert_sample("style")
-        self.assert_sample("template")
-        self.assert_sample("template_no_parent")
+        self.assert_sample(
+            "template", skip_run=True
+        )  # The template class doesn't exist
+        self.assert_sample(
+            "template_no_parent", skip_run=True
+        )  # The template class doesn't exist
         self.assert_sample("translated")
-        self.assert_sample("typeof")
+        self.assert_sample(
+            "typeof", skip_run=True
+        )  # The custom object type doesn't exist
         self.assert_sample("uint")
-        self.assert_sample("unchecked_class")
+        self.assert_sample(
+            "unchecked_class", skip_run=True
+        )  # The custom object type doesn't exist
         self.assert_sample("using")
 
     def test_sample_errors(self):

From 8a1dba662a6982038dc1ec1ca66fb8163f362532 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 19 Dec 2022 13:58:40 -0600
Subject: [PATCH 056/290] ci: Run tests with G_DEBUG=fatal-warnings

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90a9f8d..380f288 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ build:
   script:
     - black --check --diff blueprintcompiler tests
     - mypy --python-version=3.9 blueprintcompiler
-    - coverage run -m unittest
+    - G_DEBUG=fatal-warnings coverage run -m unittest
     - coverage report
     - coverage html
     - coverage xml

From 51d8969ced0bcee74b9d204d500d4b8b87faa7ee Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 19 Dec 2022 14:36:32 -0600
Subject: [PATCH 057/290] Fix menus

- Menus require an ID
- The top level menu block can't have attributes
---
 blueprintcompiler/language/gtk_menu.py        | 27 ++++++++++++++++++-
 tests/sample_errors/menu_no_id.blp            |  3 +++
 tests/sample_errors/menu_no_id.err            |  1 +
 .../sample_errors/menu_toplevel_attribute.blp |  5 ++++
 .../sample_errors/menu_toplevel_attribute.err |  2 ++
 tests/samples/menu.blp                        |  5 +---
 tests/samples/menu.ui                         |  4 +--
 tests/samples/menu_dec.blp                    |  5 +---
 tests/test_samples.py                         |  4 ++-
 9 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 tests/sample_errors/menu_no_id.blp
 create mode 100644 tests/sample_errors/menu_no_id.err
 create mode 100644 tests/sample_errors/menu_toplevel_attribute.blp
 create mode 100644 tests/sample_errors/menu_toplevel_attribute.err

diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 3d3e6ee..73aa039 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -39,6 +39,11 @@ class Menu(AstNode):
     def tag(self) -> str:
         return self.tokens["tag"]
 
+    @validate("menu")
+    def has_id(self):
+        if self.tokens["tag"] == "menu" and self.tokens["id"] is None:
+            raise CompileError("Menu requires an ID")
+
 
 class MenuAttribute(BaseAttribute):
     tag_name = "attribute"
@@ -137,7 +142,27 @@ menu_contents.children = [
 
 menu: Group = Group(
     Menu,
-    ["menu", UseLiteral("tag", "menu"), Optional(UseIdent("id")), menu_contents],
+    [
+        Keyword("menu"),
+        UseLiteral("tag", "menu"),
+        Optional(UseIdent("id")),
+        [
+            Match("{"),
+            Until(
+                AnyOf(
+                    menu_section,
+                    menu_submenu,
+                    menu_item_shorthand,
+                    menu_item,
+                    Fail(
+                        menu_attribute,
+                        "Attributes are not permitted at the top level of a menu",
+                    ),
+                ),
+                "}",
+            ),
+        ],
+    ],
 )
 
 from .ui import UI
diff --git a/tests/sample_errors/menu_no_id.blp b/tests/sample_errors/menu_no_id.blp
new file mode 100644
index 0000000..5f6396e
--- /dev/null
+++ b/tests/sample_errors/menu_no_id.blp
@@ -0,0 +1,3 @@
+using Gtk 4.0;
+
+menu {}
\ No newline at end of file
diff --git a/tests/sample_errors/menu_no_id.err b/tests/sample_errors/menu_no_id.err
new file mode 100644
index 0000000..e97f033
--- /dev/null
+++ b/tests/sample_errors/menu_no_id.err
@@ -0,0 +1 @@
+3,1,4,Menu requires an ID
\ No newline at end of file
diff --git a/tests/sample_errors/menu_toplevel_attribute.blp b/tests/sample_errors/menu_toplevel_attribute.blp
new file mode 100644
index 0000000..21ceeff
--- /dev/null
+++ b/tests/sample_errors/menu_toplevel_attribute.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+menu {
+    not-allowed: true;
+}
\ No newline at end of file
diff --git a/tests/sample_errors/menu_toplevel_attribute.err b/tests/sample_errors/menu_toplevel_attribute.err
new file mode 100644
index 0000000..45713cf
--- /dev/null
+++ b/tests/sample_errors/menu_toplevel_attribute.err
@@ -0,0 +1,2 @@
+4,5,19,Attributes are not permitted at the top level of a menu
+4,16,8,Unexpected tokens
\ No newline at end of file
diff --git a/tests/samples/menu.blp b/tests/samples/menu.blp
index f15dbdb..4c52bab 100644
--- a/tests/samples/menu.blp
+++ b/tests/samples/menu.blp
@@ -1,9 +1,6 @@
 using Gtk 4.0;
 
-menu {
-  label: _("menu label");
-  test-custom-attribute: 3.1415;
-
+menu my-menu {
   submenu {
     section {
       label: "test section";
diff --git a/tests/samples/menu.ui b/tests/samples/menu.ui
index a84fa57..3ba1fed 100644
--- a/tests/samples/menu.ui
+++ b/tests/samples/menu.ui
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <menu>
-    <attribute name="label" translatable="true">menu label</attribute>
-    <attribute name="test-custom-attribute">3.1415</attribute>
+  <menu id="my-menu">
     <submenu>
       <section>
         <attribute name="label">test section</attribute>
diff --git a/tests/samples/menu_dec.blp b/tests/samples/menu_dec.blp
index bc4ddf1..64a6021 100644
--- a/tests/samples/menu_dec.blp
+++ b/tests/samples/menu_dec.blp
@@ -1,9 +1,6 @@
 using Gtk 4.0;
 
-menu {
-  label: _("menu label");
-  test-custom-attribute: "3.1415";
-
+menu my-menu {
   submenu {
     section {
       label: "test section";
diff --git a/tests/test_samples.py b/tests/test_samples.py
index c745226..279ceb6 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -156,7 +156,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("flags", skip_run=True)  # TODO: Fix
         self.assert_sample("id_prop")
         self.assert_sample("layout")
-        self.assert_sample("menu", skip_run=True)  # TODO: Fix
+        self.assert_sample("menu")
         self.assert_sample("numbers")
         self.assert_sample("object_prop")
         self.assert_sample(
@@ -213,6 +213,8 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("inline_menu")
         self.assert_sample_error("invalid_bool")
         self.assert_sample_error("layout_in_non_widget")
+        self.assert_sample_error("menu_no_id")
+        self.assert_sample_error("menu_toplevel_attribute")
         self.assert_sample_error("no_import_version")
         self.assert_sample_error("ns_not_imported")
         self.assert_sample_error("not_a_class")

From 6c67e1fc5afcc3f4fb10e00234526121edcb12a7 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 19 Dec 2022 15:07:31 -0600
Subject: [PATCH 058/290] xml: Fix flags and enums

GtkBuilder XML uses enum nicknames, full names, or integer values, but
we accept GIR names, so passing those through doesn't work if the name
has an underscore (which traditionally turns into a dash in the
nickname). Avoid the problem by always writing the integer value of the
enum member.
---
 .gitlab-ci.yml                            |  2 +-
 blueprintcompiler/decompiler.py           |  6 +++++-
 blueprintcompiler/gir.py                  |  6 +++---
 blueprintcompiler/language/values.py      | 14 ++++++++++++++
 blueprintcompiler/outputs/xml/__init__.py |  6 ++++--
 tests/samples/accessibility.ui            |  2 +-
 tests/samples/enum.ui                     |  2 +-
 tests/samples/flags.ui                    |  4 ++--
 tests/samples/property.ui                 |  2 +-
 tests/samples/size_group.ui               |  2 +-
 tests/test_samples.py                     |  2 +-
 11 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 380f288..f7d8a39 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 e1a2b04ce13838794eec9678deff95802fa278d1
+    - git checkout 58fda9381dac4a9c42c18a4b06149ed59ee702dc
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'
diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 145e4be..565d420 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -127,7 +127,11 @@ class DecompileCtx:
     def print_attribute(self, name, value, type):
         def get_enum_name(value):
             for member in type.members.values():
-                if member.nick == value or member.c_ident == value:
+                if (
+                    member.nick == value
+                    or member.c_ident == value
+                    or str(member.value) == value
+                ):
                     return member.name
             return value.replace("-", "_")
 
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index a1bb419..12c9772 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -462,11 +462,11 @@ class EnumMember(GirNode):
         super().__init__(ns, tl)
 
     @property
-    def value(self):
+    def value(self) -> int:
         return self.tl.VALUE_VALUE
 
     @cached_property
-    def name(self):
+    def name(self) -> str:
         return self.tl.VALUE_NAME
 
     @cached_property
@@ -487,7 +487,7 @@ class Enumeration(GirNode, GirType):
         super().__init__(ns, tl)
 
     @cached_property
-    def members(self):
+    def members(self) -> T.Dict[str, EnumMember]:
         members = {}
         n_values = self.tl.ENUM_N_VALUES
         values = self.tl.ENUM_VALUES
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index db28490..4a71247 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -168,6 +168,20 @@ class NumberValue(Value):
 class Flag(AstNode):
     grammar = UseIdent("value")
 
+    @property
+    def name(self) -> str:
+        return self.tokens["value"]
+
+    @property
+    def value(self) -> T.Optional[int]:
+        type = self.parent.parent.value_type
+        if not isinstance(type, Enumeration):
+            return None
+        elif member := type.members.get(self.tokens["value"]):
+            return member.value
+        else:
+            return None
+
     @docs()
     def docs(self):
         type = self.parent.parent.value_type
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index e7e33d9..79f24f3 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -159,14 +159,16 @@ class XmlOutput(OutputFormat):
         if isinstance(value, IdentValue):
             if isinstance(value.parent.value_type, gir.Enumeration):
                 xml.put_text(
-                    value.parent.value_type.members[value.tokens["value"]].nick
+                    str(value.parent.value_type.members[value.tokens["value"]].value)
                 )
             else:
                 xml.put_text(value.tokens["value"])
         elif isinstance(value, QuotedValue) or isinstance(value, NumberValue):
             xml.put_text(value.value)
         elif isinstance(value, FlagsValue):
-            xml.put_text("|".join([flag.tokens["value"] for flag in value.children]))
+            xml.put_text(
+                "|".join([str(flag.value or flag.name) for flag in value.children])
+            )
         elif isinstance(value, TranslatedStringValue):
             raise CompilerBugError("translated values must be handled in the parent")
         elif isinstance(value, TypeValue):
diff --git a/tests/samples/accessibility.ui b/tests/samples/accessibility.ui
index 50e98c8..321f20f 100644
--- a/tests/samples/accessibility.ui
+++ b/tests/samples/accessibility.ui
@@ -5,7 +5,7 @@
     <accessibility>
       <property name="label" translatable="true">Hello, world!</property>
       <relation name="labelled-by">my_label</relation>
-      <state name="checked">true</state>
+      <state name="checked">1</state>
     </accessibility>
   </object>
   <object class="GtkLabel" id="my_label"></object>
diff --git a/tests/samples/enum.ui b/tests/samples/enum.ui
index acad161..d2cda1e 100644
--- a/tests/samples/enum.ui
+++ b/tests/samples/enum.ui
@@ -2,6 +2,6 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GtkScrolledWindow">
-    <property name="window-placement">top-left</property>
+    <property name="window-placement">0</property>
   </object>
 </interface>
diff --git a/tests/samples/flags.ui b/tests/samples/flags.ui
index d2bac55..56fbf31 100644
--- a/tests/samples/flags.ui
+++ b/tests/samples/flags.ui
@@ -2,9 +2,9 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GApplication">
-    <property name="flags">is_service|handles_open</property>
+    <property name="flags">1|4</property>
   </object>
   <object class="GtkEventControllerScroll">
-    <property name="flags">vertical</property>
+    <property name="flags">1</property>
   </object>
 </interface>
diff --git a/tests/samples/property.ui b/tests/samples/property.ui
index a2d5a1b..ba8089d 100644
--- a/tests/samples/property.ui
+++ b/tests/samples/property.ui
@@ -2,6 +2,6 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GtkBox">
-    <property name="orientation">vertical</property>
+    <property name="orientation">1</property>
   </object>
 </interface>
diff --git a/tests/samples/size_group.ui b/tests/samples/size_group.ui
index 6d92edd..218b023 100644
--- a/tests/samples/size_group.ui
+++ b/tests/samples/size_group.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
+    <property name="mode">1</property>
     <widgets>
       <widget name="label"/>
       <widget name="button"/>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 279ceb6..f038b60 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -153,7 +153,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("enum")
         self.assert_sample("expr_lookup", skip_run=True)  # TODO: Fix
         self.assert_sample("file_filter")
-        self.assert_sample("flags", skip_run=True)  # TODO: Fix
+        self.assert_sample("flags")
         self.assert_sample("id_prop")
         self.assert_sample("layout")
         self.assert_sample("menu")

From 039d88ab45001cf799c421e58d4669a0596c4d29 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 19 Dec 2022 15:21:12 -0600
Subject: [PATCH 059/290] Fix CI

---
 .gitlab-ci.yml       | 3 +--
 build-aux/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7d8a39..b924a7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,13 +8,12 @@ build:
   script:
     - black --check --diff blueprintcompiler tests
     - mypy --python-version=3.9 blueprintcompiler
-    - G_DEBUG=fatal-warnings coverage run -m unittest
+    - G_DEBUG=fatal-warnings xvfb-run coverage run -m unittest
     - coverage report
     - coverage html
     - coverage xml
     - meson _build -Ddocs=true --prefix=/usr
     - ninja -C _build
-    - ninja -C _build test
     - ninja -C _build install
     - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
diff --git a/build-aux/Dockerfile b/build-aux/Dockerfile
index e2c1081..c7841d9 100644
--- a/build-aux/Dockerfile
+++ b/build-aux/Dockerfile
@@ -1,7 +1,7 @@
 FROM fedora:latest
 
 RUN dnf install -y meson python3-pip gtk4-devel gobject-introspection-devel \
-	libadwaita-devel python3-devel python3-gobject git diffutils
+	libadwaita-devel python3-devel python3-gobject git diffutils xorg-x11-server-Xvfb
 RUN pip3 install furo mypy sphinx coverage black
 
 # The version on PyPI is very old and doesn't install. Use the upstream package registry instead.

From f7aa7d0be200cc6778ce3fa92eb6eadfa3629de6 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sun, 4 Dec 2022 15:10:52 +0100
Subject: [PATCH 060/290] lsp: Support change events with no range

range is optional

https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
---
 blueprintcompiler/lsp.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 26a519e..f579ab4 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -51,6 +51,9 @@ class OpenFile:
 
     def apply_changes(self, changes):
         for change in changes:
+            if "range" not in change:
+                self.text = change["text"]
+                continue
             start = utils.pos_to_idx(
                 change["range"]["start"]["line"],
                 change["range"]["start"]["character"],

From 2033bd9e1653b2aa89ea7eda03241dd27c823d3b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 23 Dec 2022 20:13:14 -0600
Subject: [PATCH 061/290] types: Add UncheckedType

This allows us to remember information about an external type, such as
its name, while still marking it as unchecked.
---
 blueprintcompiler/completions.py              |  4 +--
 blueprintcompiler/gir.py                      | 31 ++++++++++++++++++-
 blueprintcompiler/language/common.py          | 10 +++++-
 .../language/gobject_property.py              |  4 +--
 blueprintcompiler/language/gobject_signal.py  |  4 +--
 .../language/gtkbuilder_template.py           |  2 ++
 blueprintcompiler/language/types.py           | 11 +++++--
 7 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index 085baee..9940055 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -120,7 +120,7 @@ def gtk_object_completer(ast_node, match_variables):
     matches=new_statement_patterns,
 )
 def property_completer(ast_node, match_variables):
-    if ast_node.gir_class:
+    if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.UncheckedType):
         for prop in ast_node.gir_class.properties:
             yield Completion(prop, CompletionItemKind.Property, snippet=f"{prop}: $0;")
 
@@ -144,7 +144,7 @@ def prop_value_completer(ast_node, match_variables):
     matches=new_statement_patterns,
 )
 def signal_completer(ast_node, match_variables):
-    if ast_node.gir_class:
+    if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.UncheckedType):
         for signal in ast_node.gir_class.signals:
             if not isinstance(ast_node.parent, language.Object):
                 name = "on"
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 12c9772..ab8af75 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -93,13 +93,36 @@ class GirType:
     def doc(self):
         return None
 
-    def assignable_to(self, other) -> bool:
+    def assignable_to(self, other: "GirType") -> bool:
         raise NotImplementedError()
 
     @property
     def full_name(self) -> str:
+        """The GIR name of the type to use in diagnostics"""
         raise NotImplementedError()
 
+    @property
+    def glib_type_name(self) -> str:
+        """The name of the type in the GObject type system, suitable to pass to `g_type_from_name()`."""
+        raise NotImplementedError()
+
+
+class UncheckedType(GirType):
+    def __init__(self, name) -> None:
+        super().__init__()
+        self._name = name
+
+    def assignable_to(self, other: GirType) -> bool:
+        return True
+
+    @property
+    def full_name(self) -> str:
+        return self._name
+
+    @property
+    def glib_type_name(self) -> str:
+        return self._name
+
 
 class BasicType(GirType):
     name: str = "unknown type"
@@ -111,6 +134,7 @@ class BasicType(GirType):
 
 class BoolType(BasicType):
     name = "bool"
+    glib_type_name: str = "gboolean"
 
     def assignable_to(self, other) -> bool:
         return isinstance(other, BoolType)
@@ -118,6 +142,7 @@ class BoolType(BasicType):
 
 class IntType(BasicType):
     name = "int"
+    glib_type_name: str = "gint"
 
     def assignable_to(self, other) -> bool:
         return (
@@ -129,6 +154,7 @@ class IntType(BasicType):
 
 class UIntType(BasicType):
     name = "uint"
+    glib_type_name: str = "guint"
 
     def assignable_to(self, other) -> bool:
         return (
@@ -140,6 +166,7 @@ class UIntType(BasicType):
 
 class FloatType(BasicType):
     name = "float"
+    glib_type_name: str = "gfloat"
 
     def assignable_to(self, other) -> bool:
         return isinstance(other, FloatType)
@@ -147,6 +174,7 @@ class FloatType(BasicType):
 
 class StringType(BasicType):
     name = "string"
+    glib_type_name: str = "gchararray"
 
     def assignable_to(self, other) -> bool:
         return isinstance(other, StringType)
@@ -154,6 +182,7 @@ class StringType(BasicType):
 
 class TypeType(BasicType):
     name = "GType"
+    glib_type_name: str = "GType"
 
     def assignable_to(self, other) -> bool:
         return isinstance(other, TypeType)
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index f6a8f8e..ec15c7a 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -24,7 +24,15 @@ from ..errors import CompileError, MultipleErrors
 from ..completions_utils import *
 from .. import decompiler as decompile
 from ..decompiler import DecompileCtx, decompiler
-from ..gir import StringType, BoolType, IntType, FloatType, GirType, Enumeration
+from ..gir import (
+    StringType,
+    BoolType,
+    IntType,
+    FloatType,
+    GirType,
+    Enumeration,
+    UncheckedType,
+)
 from ..lsp_utils import Completion, CompletionItemKind, SemanticToken, SemanticTokenType
 from ..parse_tree import *
 
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 2c1e2ae..c6db999 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -69,7 +69,7 @@ class Property(AstNode):
 
     @property
     def gir_property(self):
-        if self.gir_class is not None:
+        if self.gir_class is not None and not isinstance(self.gir_class, UncheckedType):
             return self.gir_class.properties.get(self.tokens["name"])
 
     @property
@@ -79,7 +79,7 @@ class Property(AstNode):
 
     @validate("name")
     def property_exists(self):
-        if self.gir_class is None:
+        if self.gir_class is None or isinstance(self.gir_class, UncheckedType):
             # Objects that we have no gir data on should not be validated
             # This happens for classes defined by the app itself
             return
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index d50792e..11a69e0 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -71,7 +71,7 @@ class Signal(AstNode):
 
     @property
     def gir_signal(self):
-        if self.gir_class is not None:
+        if self.gir_class is not None and not isinstance(self.gir_class, UncheckedType):
             return self.gir_class.signals.get(self.tokens["name"])
 
     @property
@@ -80,7 +80,7 @@ class Signal(AstNode):
 
     @validate("name")
     def signal_exists(self):
-        if self.gir_class is None:
+        if self.gir_class is None or isinstance(self.gir_class, UncheckedType):
             # Objects that we have no gir data on should not be validated
             # This happens for classes defined by the app itself
             return
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index a215cdf..40ac7f7 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -53,6 +53,8 @@ class Template(Object):
         # Templates might not have a parent class defined
         if class_name := self.class_name:
             return class_name.gir_type
+        else:
+            return gir.UncheckedType(self.id)
 
     @validate("id")
     def unique_in_parent(self):
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index 0987262..3b454bc 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -56,12 +56,13 @@ class TypeName(AstNode):
             return self.root.gir.namespaces.get(self.tokens["namespace"] or "Gtk")
 
     @property
-    def gir_type(self) -> T.Optional[gir.Class]:
+    def gir_type(self) -> gir.GirType:
         if self.tokens["class_name"] and not self.tokens["ignore_gir"]:
             return self.root.gir.get_type(
                 self.tokens["class_name"], self.tokens["namespace"]
             )
-        return None
+
+        return gir.UncheckedType(self.tokens["class_name"])
 
     @property
     def glib_type_name(self) -> str:
@@ -84,7 +85,11 @@ class TypeName(AstNode):
 class ClassName(TypeName):
     @validate("namespace", "class_name")
     def gir_class_exists(self):
-        if self.gir_type is not None and not isinstance(self.gir_type, Class):
+        if (
+            self.gir_type
+            and not isinstance(self.gir_type, UncheckedType)
+            and not isinstance(self.gir_type, Class)
+        ):
             if isinstance(self.gir_type, Interface):
                 raise CompileError(
                     f"{self.gir_type.full_name} is an interface, not a class"

From 5cf9b63547deb7f58d72395cf357df01b1e81801 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 23 Dec 2022 23:24:29 -0600
Subject: [PATCH 062/290] language: Add cast expressions

---
 blueprintcompiler/language/__init__.py        |  2 +-
 blueprintcompiler/language/expression.py      | 84 +++++++++++++++++--
 blueprintcompiler/language/gobject_object.py  |  4 +-
 .../language/gobject_property.py              |  6 +-
 blueprintcompiler/outputs/xml/__init__.py     | 13 ++-
 tests/sample_errors/expr_cast_conversion.blp  |  5 ++
 tests/sample_errors/expr_cast_conversion.err  |  1 +
 tests/sample_errors/expr_lookup_dne.blp       |  5 ++
 tests/sample_errors/expr_lookup_dne.err       |  1 +
 .../expr_lookup_no_properties.blp             |  5 ++
 .../expr_lookup_no_properties.err             |  1 +
 tests/sample_errors/property_dne.err          |  2 +-
 tests/samples/expr_lookup.blp                 |  2 +-
 tests/samples/expr_lookup.ui                  |  6 +-
 tests/test_samples.py                         |  5 +-
 15 files changed, 122 insertions(+), 20 deletions(-)
 create mode 100644 tests/sample_errors/expr_cast_conversion.blp
 create mode 100644 tests/sample_errors/expr_cast_conversion.err
 create mode 100644 tests/sample_errors/expr_lookup_dne.blp
 create mode 100644 tests/sample_errors/expr_lookup_dne.err
 create mode 100644 tests/sample_errors/expr_lookup_no_properties.blp
 create mode 100644 tests/sample_errors/expr_lookup_no_properties.err

diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 58662b2..0f1132b 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,5 +1,5 @@
 from .attributes import BaseAttribute, BaseTypedAttribute
-from .expression import IdentExpr, LookupOp, Expr
+from .expression import CastExpr, IdentExpr, LookupOp, ExprChain
 from .gobject_object import Object, ObjectContent
 from .gobject_property import Property
 from .gobject_signal import Signal
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 29df93e..2d50984 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -19,29 +19,59 @@
 
 
 from .common import *
+from .types import TypeName
 
 
 expr = Pratt()
 
 
-class Expr(AstNode):
+class Expr:
+    @property
+    def type(self) -> T.Optional[GirType]:
+        raise NotImplementedError()
+
+
+class ExprChain(Expr, AstNode):
     grammar = expr
 
+    @property
+    def last(self) -> Expr:
+        return self.children[-1]
 
-class InfixExpr(AstNode):
+    @property
+    def type(self) -> T.Optional[GirType]:
+        return self.last.type
+
+
+class InfixExpr(Expr, AstNode):
     @property
     def lhs(self):
-        children = list(self.parent_by_type(Expr).children)
+        children = list(self.parent_by_type(ExprChain).children)
         return children[children.index(self) - 1]
 
 
-class IdentExpr(AstNode):
+class IdentExpr(Expr, AstNode):
     grammar = UseIdent("ident")
 
     @property
     def ident(self) -> str:
         return self.tokens["ident"]
 
+    @validate()
+    def exists(self):
+        if self.root.objects_by_id.get(self.ident) is None:
+            raise CompileError(
+                f"Could not find object with ID {self.ident}",
+                did_you_mean=(self.ident, self.root.objects_by_id.keys()),
+            )
+
+    @property
+    def type(self) -> T.Optional[GirType]:
+        if object := self.root.objects_by_id.get(self.ident):
+            return object.gir_class
+        else:
+            return None
+
 
 class LookupOp(InfixExpr):
     grammar = [".", UseIdent("property")]
@@ -50,9 +80,53 @@ class LookupOp(InfixExpr):
     def property_name(self) -> str:
         return self.tokens["property"]
 
+    @property
+    def type(self) -> T.Optional[GirType]:
+        if isinstance(self.lhs.type, gir.Class) or isinstance(
+            self.lhs.type, gir.Interface
+        ):
+            if property := self.lhs.type.properties.get(self.property_name):
+                return property.type
+
+        return None
+
+    @validate("property")
+    def property_exists(self):
+        if self.lhs.type is None or isinstance(self.lhs.type, UncheckedType):
+            return
+        elif not isinstance(self.lhs.type, gir.Class) and not isinstance(
+            self.lhs.type, gir.Interface
+        ):
+            raise CompileError(
+                f"Type {self.lhs.type.full_name} does not have properties"
+            )
+        elif self.lhs.type.properties.get(self.property_name) is None:
+            raise CompileError(
+                f"{self.lhs.type.full_name} does not have a property called {self.property_name}"
+            )
+
+
+class CastExpr(InfixExpr):
+    grammar = ["as", "(", TypeName, ")"]
+
+    @property
+    def type(self) -> T.Optional[GirType]:
+        return self.children[TypeName][0].gir_type
+
+    @validate()
+    def cast_makes_sense(self):
+        if self.lhs.type is None:
+            return
+
+        if not self.type.assignable_to(self.lhs.type):
+            raise CompileError(
+                f"Invalid cast. No instance of {self.lhs.type.full_name} can be an instance of {self.type.full_name}."
+            )
+
 
 expr.children = [
     Prefix(IdentExpr),
-    Prefix(["(", Expr, ")"]),
+    Prefix(["(", ExprChain, ")"]),
     Infix(10, LookupOp),
+    Infix(10, CastExpr),
 ]
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 8e6fd23..edf8b2a 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -54,7 +54,9 @@ class Object(AstNode):
         return self.children[ObjectContent][0]
 
     @property
-    def gir_class(self):
+    def gir_class(self) -> GirType:
+        if self.class_name is None:
+            raise CompilerBugError()
         return self.class_name.gir_type
 
     @cached_property
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index c6db999..10770a8 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .expression import Expr
+from .expression import ExprChain
 from .gobject_object import Object
 from .gtkbuilder_template import Template
 from .values import Value, TranslatedStringValue
@@ -51,7 +51,7 @@ class Property(AstNode):
             UseLiteral("binding", True),
             ":",
             "bind",
-            Expr,
+            ExprChain,
         ),
         Statement(
             UseIdent("name"),
@@ -91,7 +91,7 @@ class Property(AstNode):
 
         if self.gir_property is None:
             raise CompileError(
-                f"Class {self.gir_class.full_name} does not contain a property called {self.tokens['name']}",
+                f"Class {self.gir_class.full_name} does not have a property called {self.tokens['name']}",
                 did_you_mean=(self.tokens["name"], self.gir_class.properties.keys()),
             )
 
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 79f24f3..69ce12f 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -114,7 +114,7 @@ class XmlOutput(OutputFormat):
         elif value is None:
             if property.tokens["binding"]:
                 xml.start_tag("binding", **props)
-                self._emit_expression(property.children[Expr][0], xml)
+                self._emit_expression(property.children[ExprChain][0], xml)
                 xml.end_tag()
             else:
                 xml.put_self_closing("property", **props)
@@ -176,7 +176,7 @@ class XmlOutput(OutputFormat):
         else:
             raise CompilerBugError()
 
-    def _emit_expression(self, expression: Expr, xml: XmlEmitter):
+    def _emit_expression(self, expression: ExprChain, xml: XmlEmitter):
         self._emit_expression_part(expression.children[-1], xml)
 
     def _emit_expression_part(self, expression, xml: XmlEmitter):
@@ -184,8 +184,10 @@ class XmlOutput(OutputFormat):
             self._emit_ident_expr(expression, xml)
         elif isinstance(expression, LookupOp):
             self._emit_lookup_op(expression, xml)
-        elif isinstance(expression, Expr):
+        elif isinstance(expression, ExprChain):
             self._emit_expression(expression, xml)
+        elif isinstance(expression, CastExpr):
+            self._emit_cast_expr(expression, xml)
         else:
             raise CompilerBugError()
 
@@ -195,10 +197,13 @@ class XmlOutput(OutputFormat):
         xml.end_tag()
 
     def _emit_lookup_op(self, expr: LookupOp, xml: XmlEmitter):
-        xml.start_tag("lookup", name=expr.property_name)
+        xml.start_tag("lookup", name=expr.property_name, type=expr.lhs.type)
         self._emit_expression_part(expr.lhs, xml)
         xml.end_tag()
 
+    def _emit_cast_expr(self, expr: CastExpr, xml: XmlEmitter):
+        self._emit_expression_part(expr.lhs, xml)
+
     def _emit_attribute(
         self, tag: str, attr: str, name: str, value: Value, xml: XmlEmitter
     ):
diff --git a/tests/sample_errors/expr_cast_conversion.blp b/tests/sample_errors/expr_cast_conversion.blp
new file mode 100644
index 0000000..0b485c4
--- /dev/null
+++ b/tests/sample_errors/expr_cast_conversion.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Overlay overlay {
+  margin-bottom: bind overlay.child as (Adjustment).value;
+}
\ No newline at end of file
diff --git a/tests/sample_errors/expr_cast_conversion.err b/tests/sample_errors/expr_cast_conversion.err
new file mode 100644
index 0000000..e449a6c
--- /dev/null
+++ b/tests/sample_errors/expr_cast_conversion.err
@@ -0,0 +1 @@
+4,37,15,Invalid cast. No instance of Gtk.Widget can be an instance of Gtk.Adjustment.
\ No newline at end of file
diff --git a/tests/sample_errors/expr_lookup_dne.blp b/tests/sample_errors/expr_lookup_dne.blp
new file mode 100644
index 0000000..ca05bfc
--- /dev/null
+++ b/tests/sample_errors/expr_lookup_dne.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Overlay overlay {
+  margin-bottom: bind overlay.child as (Label).not-a-property;
+}
\ No newline at end of file
diff --git a/tests/sample_errors/expr_lookup_dne.err b/tests/sample_errors/expr_lookup_dne.err
new file mode 100644
index 0000000..9349c9d
--- /dev/null
+++ b/tests/sample_errors/expr_lookup_dne.err
@@ -0,0 +1 @@
+4,48,14,Gtk.Label does not have a property called not-a-property
\ No newline at end of file
diff --git a/tests/sample_errors/expr_lookup_no_properties.blp b/tests/sample_errors/expr_lookup_no_properties.blp
new file mode 100644
index 0000000..3c446ef
--- /dev/null
+++ b/tests/sample_errors/expr_lookup_no_properties.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Overlay overlay {
+  margin-bottom: bind overlay.margin-bottom.what;
+}
\ No newline at end of file
diff --git a/tests/sample_errors/expr_lookup_no_properties.err b/tests/sample_errors/expr_lookup_no_properties.err
new file mode 100644
index 0000000..02aa4a6
--- /dev/null
+++ b/tests/sample_errors/expr_lookup_no_properties.err
@@ -0,0 +1 @@
+4,45,4,Type int does not have properties
\ No newline at end of file
diff --git a/tests/sample_errors/property_dne.err b/tests/sample_errors/property_dne.err
index 2b6ff40..12df579 100644
--- a/tests/sample_errors/property_dne.err
+++ b/tests/sample_errors/property_dne.err
@@ -1 +1 @@
-4,3,19,Class Gtk.Label does not contain a property called not-a-real-property
+4,3,19,Class Gtk.Label does not have a property called not-a-real-property
diff --git a/tests/samples/expr_lookup.blp b/tests/samples/expr_lookup.blp
index d172f7e..2556f9a 100644
--- a/tests/samples/expr_lookup.blp
+++ b/tests/samples/expr_lookup.blp
@@ -5,5 +5,5 @@ Overlay {
 }
 
 Label {
-  label: bind (label.parent).child.label;
+  label: bind (label.parent) as (Overlay).child as (Label).label;
 }
diff --git a/tests/samples/expr_lookup.ui b/tests/samples/expr_lookup.ui
index 2137e9b..91d7590 100644
--- a/tests/samples/expr_lookup.ui
+++ b/tests/samples/expr_lookup.ui
@@ -8,9 +8,9 @@
   </object>
   <object class="GtkLabel">
     <binding name="label">
-      <lookup name="label">
-        <lookup name="child">
-          <lookup name="parent">
+      <lookup name="label" type="GtkLabel">
+        <lookup name="child" type="GtkOverlay">
+          <lookup name="parent" type="GtkLabel">
             <constant>label</constant>
           </lookup>
         </lookup>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index f038b60..1195cdf 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -151,7 +151,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("combo_box_text")
         self.assert_sample("comments")
         self.assert_sample("enum")
-        self.assert_sample("expr_lookup", skip_run=True)  # TODO: Fix
+        self.assert_sample("expr_lookup")
         self.assert_sample("file_filter")
         self.assert_sample("flags")
         self.assert_sample("id_prop")
@@ -207,6 +207,9 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("duplicates")
         self.assert_sample_error("empty")
         self.assert_sample_error("enum_member_dne")
+        self.assert_sample_error("expr_cast_conversion")
+        self.assert_sample_error("expr_lookup_dne")
+        self.assert_sample_error("expr_lookup_no_properties")
         self.assert_sample_error("filters_in_non_file_filter")
         self.assert_sample_error("gtk_3")
         self.assert_sample_error("gtk_exact_version")

From 59aa054c4cd0e5a6ca609f98448c86a2fe09bb95 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 24 Dec 2022 21:46:03 -0600
Subject: [PATCH 063/290] language: Add closure expressions

---
 blueprintcompiler/gir.py                      |  6 ++
 blueprintcompiler/language/__init__.py        |  2 +-
 blueprintcompiler/language/expression.py      | 57 +++++++++++++++++--
 blueprintcompiler/outputs/xml/__init__.py     | 10 +++-
 blueprintcompiler/tokenizer.py                |  2 +-
 tests/sample_errors/expr_closure_not_cast.blp |  5 ++
 tests/sample_errors/expr_closure_not_cast.err |  1 +
 tests/samples/expr_closure.blp                |  5 ++
 tests/samples/expr_closure.ui                 | 13 +++++
 tests/test_samples.py                         |  2 +
 10 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100644 tests/sample_errors/expr_closure_not_cast.blp
 create mode 100644 tests/sample_errors/expr_closure_not_cast.err
 create mode 100644 tests/samples/expr_closure.blp
 create mode 100644 tests/samples/expr_closure.ui

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index ab8af75..4ee2b1e 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -189,7 +189,10 @@ class TypeType(BasicType):
 
 
 _BASIC_TYPES = {
+    "bool": BoolType,
     "gboolean": BoolType,
+    "string": StringType,
+    "gchararray": StringType,
     "int": IntType,
     "gint": IntType,
     "gint64": IntType,
@@ -730,6 +733,9 @@ class GirContext:
         return None
 
     def get_type(self, name: str, ns: str) -> T.Optional[GirNode]:
+        if ns is None and name in _BASIC_TYPES:
+            return _BASIC_TYPES[name]()
+
         ns = ns or "Gtk"
 
         if ns not in self.namespaces:
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 0f1132b..4063943 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,5 +1,5 @@
 from .attributes import BaseAttribute, BaseTypedAttribute
-from .expression import CastExpr, IdentExpr, LookupOp, ExprChain
+from .expression import CastExpr, ClosureExpr, Expr, ExprChain, IdentExpr, LookupOp
 from .gobject_object import Object, ObjectContent
 from .gobject_property import Property
 from .gobject_signal import Signal
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 2d50984..f2b2ea1 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -25,13 +25,24 @@ from .types import TypeName
 expr = Pratt()
 
 
-class Expr:
+class Expr(AstNode):
     @property
     def type(self) -> T.Optional[GirType]:
         raise NotImplementedError()
 
+    @property
+    def rhs(self) -> T.Optional["Expr"]:
+        if isinstance(self.parent, ExprChain):
+            children = list(self.parent.children)
+            if children.index(self) + 1 < len(children):
+                return children[children.index(self) + 1]
+            else:
+                return self.parent.rhs
+        else:
+            return None
 
-class ExprChain(Expr, AstNode):
+
+class ExprChain(Expr):
     grammar = expr
 
     @property
@@ -43,14 +54,14 @@ class ExprChain(Expr, AstNode):
         return self.last.type
 
 
-class InfixExpr(Expr, AstNode):
+class InfixExpr(Expr):
     @property
     def lhs(self):
         children = list(self.parent_by_type(ExprChain).children)
         return children[children.index(self) - 1]
 
 
-class IdentExpr(Expr, AstNode):
+class IdentExpr(Expr):
     grammar = UseIdent("ident")
 
     @property
@@ -124,7 +135,45 @@ class CastExpr(InfixExpr):
             )
 
 
+class ClosureExpr(Expr):
+    grammar = [
+        Optional(["$", UseLiteral("extern", True)]),
+        UseIdent("name"),
+        "(",
+        Delimited(ExprChain, ","),
+        ")",
+    ]
+
+    @property
+    def type(self) -> T.Optional[GirType]:
+        if isinstance(self.rhs, CastExpr):
+            return self.rhs.type
+        else:
+            return None
+
+    @property
+    def closure_name(self) -> str:
+        return self.tokens["name"]
+
+    @property
+    def args(self) -> T.List[ExprChain]:
+        return self.children[ExprChain]
+
+    @validate()
+    def cast_to_return_type(self):
+        if not isinstance(self.rhs, CastExpr):
+            raise CompileError(
+                "Closure expression must be cast to the closure's return type"
+            )
+
+    @validate()
+    def builtin_exists(self):
+        if not self.tokens["extern"]:
+            raise CompileError(f"{self.closure_name} is not a builtin function")
+
+
 expr.children = [
+    Prefix(ClosureExpr),
     Prefix(IdentExpr),
     Prefix(["(", ExprChain, ")"]),
     Infix(10, LookupOp),
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 69ce12f..ac2aea8 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -179,7 +179,7 @@ class XmlOutput(OutputFormat):
     def _emit_expression(self, expression: ExprChain, xml: XmlEmitter):
         self._emit_expression_part(expression.children[-1], xml)
 
-    def _emit_expression_part(self, expression, xml: XmlEmitter):
+    def _emit_expression_part(self, expression: Expr, xml: XmlEmitter):
         if isinstance(expression, IdentExpr):
             self._emit_ident_expr(expression, xml)
         elif isinstance(expression, LookupOp):
@@ -188,6 +188,8 @@ class XmlOutput(OutputFormat):
             self._emit_expression(expression, xml)
         elif isinstance(expression, CastExpr):
             self._emit_cast_expr(expression, xml)
+        elif isinstance(expression, ClosureExpr):
+            self._emit_closure_expr(expression, xml)
         else:
             raise CompilerBugError()
 
@@ -204,6 +206,12 @@ class XmlOutput(OutputFormat):
     def _emit_cast_expr(self, expr: CastExpr, xml: XmlEmitter):
         self._emit_expression_part(expr.lhs, xml)
 
+    def _emit_closure_expr(self, expr: ClosureExpr, xml: XmlEmitter):
+        xml.start_tag("closure", function=expr.closure_name, type=expr.type)
+        for arg in expr.args:
+            self._emit_expression_part(arg, xml)
+        xml.end_tag()
+
     def _emit_attribute(
         self, tag: str, attr: str, name: str, value: Value, xml: XmlEmitter
     ):
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 4991967..516bc0b 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -46,7 +46,7 @@ _tokens = [
     (TokenType.WHITESPACE, r"\s+"),
     (TokenType.COMMENT, r"\/\*[\s\S]*?\*\/"),
     (TokenType.COMMENT, r"\/\/[^\n]*"),
-    (TokenType.OP, r"<<|>>|=>|::|<|>|:=|\.|\|\||\||\+|\-|\*|=|:|/"),
+    (TokenType.OP, r"\$|<<|>>|=>|::|<|>|:=|\.|\|\||\||\+|\-|\*|=|:|/"),
     (TokenType.PUNCTUATION, r"\(|\)|\{|\}|;|\[|\]|\,"),
 ]
 _TOKENS = [(type, re.compile(regex)) for (type, regex) in _tokens]
diff --git a/tests/sample_errors/expr_closure_not_cast.blp b/tests/sample_errors/expr_closure_not_cast.blp
new file mode 100644
index 0000000..7903bb6
--- /dev/null
+++ b/tests/sample_errors/expr_closure_not_cast.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: bind $closure();
+}
\ No newline at end of file
diff --git a/tests/sample_errors/expr_closure_not_cast.err b/tests/sample_errors/expr_closure_not_cast.err
new file mode 100644
index 0000000..fcc2dfb
--- /dev/null
+++ b/tests/sample_errors/expr_closure_not_cast.err
@@ -0,0 +1 @@
+4,15,10,Closure expression must be cast to the closure's return type
\ No newline at end of file
diff --git a/tests/samples/expr_closure.blp b/tests/samples/expr_closure.blp
new file mode 100644
index 0000000..99874e8
--- /dev/null
+++ b/tests/samples/expr_closure.blp
@@ -0,0 +1,5 @@
+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.ui b/tests/samples/expr_closure.ui
new file mode 100644
index 0000000..1581d65
--- /dev/null
+++ b/tests/samples/expr_closure.ui
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkLabel" id="my-label">
+    <binding name="label">
+      <closure function="my-closure" type="gchararray">
+        <lookup name="margin-bottom" type="GtkLabel">
+          <constant>my-label</constant>
+        </lookup>
+      </closure>
+    </binding>
+  </object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 1195cdf..6d809c5 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -151,6 +151,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("combo_box_text")
         self.assert_sample("comments")
         self.assert_sample("enum")
+        self.assert_sample("expr_closure", skip_run=True)  # The closure doesn't exist
         self.assert_sample("expr_lookup")
         self.assert_sample("file_filter")
         self.assert_sample("flags")
@@ -208,6 +209,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("empty")
         self.assert_sample_error("enum_member_dne")
         self.assert_sample_error("expr_cast_conversion")
+        self.assert_sample_error("expr_closure_not_cast")
         self.assert_sample_error("expr_lookup_dne")
         self.assert_sample_error("expr_lookup_no_properties")
         self.assert_sample_error("filters_in_non_file_filter")

From 40f493b378cf73d1cc3f128895e842e8665a56c3 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Thu, 5 Jan 2023 00:51:02 +0100
Subject: [PATCH 064/290] cli: Print compile errors to stderr

---
 blueprintcompiler/errors.py | 6 +++---
 blueprintcompiler/main.py   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 7ddaef0..816bd4a 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -28,7 +28,7 @@ class PrintableError(Exception):
     """Parent class for errors that can be pretty-printed for the user, e.g.
     compilation warnings and errors."""
 
-    def pretty_print(self, filename, code):
+    def pretty_print(self, filename, code, stream=sys.stdout):
         raise NotImplementedError()
 
 
@@ -144,9 +144,9 @@ class MultipleErrors(PrintableError):
         super().__init__()
         self.errors = errors
 
-    def pretty_print(self, filename, code) -> None:
+    def pretty_print(self, filename, code, stream=sys.stdout) -> None:
         for error in self.errors:
-            error.pretty_print(filename, code)
+            error.pretty_print(filename, code, stream)
         if len(self.errors) != 1:
             print(f"{len(self.errors)} errors")
 
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 4e4d378..a3a70a2 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -104,7 +104,7 @@ class BlueprintApp:
                 with open(opts.output, "w") as file:
                     file.write(xml)
         except PrintableError as e:
-            e.pretty_print(opts.input.name, data)
+            e.pretty_print(opts.input.name, data, stream=sys.stderr)
             sys.exit(1)
 
     def cmd_batch_compile(self, opts):

From 7ef314ff949f85c88cd941d0dca5ab0c88ff8dfe Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 25 Dec 2022 16:02:55 -0600
Subject: [PATCH 065/290] Fix diagnostic location reporting

Text positions at the beginning of a line were being shown on the
previous line.
---
 blueprintcompiler/utils.py                | 5 ++---
 tests/sample_errors/no_import_version.err | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/blueprintcompiler/utils.py b/blueprintcompiler/utils.py
index 1c69fd9..5e939c7 100644
--- a/blueprintcompiler/utils.py
+++ b/blueprintcompiler/utils.py
@@ -74,9 +74,8 @@ def did_you_mean(word: str, options: T.List[str]) -> T.Optional[str]:
 def idx_to_pos(idx: int, text: str) -> T.Tuple[int, int]:
     if idx == 0 or len(text) == 0:
         return (0, 0)
-    sp = text[:idx].splitlines(keepends=True)
-    line_num = len(sp)
-    col_num = len(sp[-1])
+    line_num = text.count("\n", 0, idx) + 1
+    col_num = idx - text.rfind("\n", 0, idx) - 1
     return (line_num - 1, col_num)
 
 
diff --git a/tests/sample_errors/no_import_version.err b/tests/sample_errors/no_import_version.err
index 4ee792f..db830e0 100644
--- a/tests/sample_errors/no_import_version.err
+++ b/tests/sample_errors/no_import_version.err
@@ -1 +1 @@
-1,10,0,Expected a version number for GTK
+1,11,0,Expected a version number for GTK

From be284de879d9ec6ee8a265220d8890351eaddffe Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 25 Dec 2022 16:08:37 -0600
Subject: [PATCH 066/290] parse_tree: Fix Warning node

---
 blueprintcompiler/parse_tree.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index 6634994..ef8586b 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -287,7 +287,9 @@ class Warning(ParseNode):
             ctx.warnings.append(
                 CompileWarning(self.message, start_token.start, end_token.end)
             )
-        return True
+            return True
+        else:
+            return False
 
 
 class Fail(ParseNode):

From 0b402db4d5567a9c3319dab8880cdccfe18840cf Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 25 Dec 2022 16:11:17 -0600
Subject: [PATCH 067/290] language: Change extern type syntax

Use a '$' instead of a '.' to indicate a type provided in application
code.

The reason for the change is to have a consistent "extern" symbol that
isn't widely used elsewhere and isn't ambiguous in expressions.
---
 blueprintcompiler/errors.py                  |  5 +++++
 blueprintcompiler/language/common.py         |  8 +++++++-
 blueprintcompiler/language/gobject_object.py |  2 +-
 blueprintcompiler/language/types.py          | 20 ++++++++++++++------
 blueprintcompiler/utils.py                   |  1 +
 tests/sample_errors/warn_old_extern.blp      |  5 +++++
 tests/sample_errors/warn_old_extern.err      |  2 ++
 tests/samples/typeof.blp                     |  2 +-
 tests/samples/unchecked_class.blp            |  4 ++--
 tests/samples/unchecked_class_dec.blp        |  4 ++--
 tests/test_samples.py                        |  1 +
 11 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 tests/sample_errors/warn_old_extern.blp
 create mode 100644 tests/sample_errors/warn_old_extern.err

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 816bd4a..01f9066 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -124,6 +124,11 @@ class CompileWarning(CompileError):
     color = Colors.YELLOW
 
 
+class UpgradeWarning(CompileWarning):
+    category = "upgrade"
+    color = Colors.PURPLE
+
+
 class UnexpectedTokenError(CompileError):
     def __init__(self, start, end):
         super().__init__("Unexpected tokens", start, end)
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index ec15c7a..8ae8d96 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -20,7 +20,13 @@
 
 from .. import gir
 from ..ast_utils import AstNode, validate, docs
-from ..errors import CompileError, MultipleErrors
+from ..errors import (
+    CompileError,
+    MultipleErrors,
+    UpgradeWarning,
+    CompileWarning,
+    CodeAction,
+)
 from ..completions_utils import *
 from .. import decompiler as decompile
 from ..decompiler import DecompileCtx, decompiler
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index edf8b2a..a66ffe6 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -87,7 +87,7 @@ def validate_parent_type(node, ns: str, name: str, err_msg: str):
 def decompile_object(ctx, 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
+        decompile.full_name(gir_class) if gir_class is not None else "$" + klass
     )
     if id is None:
         ctx.print(f"{klass_name} {{")
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index 3b454bc..e1e715d 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -31,33 +31,41 @@ class TypeName(AstNode):
             UseIdent("class_name"),
         ],
         [
-            ".",
+            AnyOf("$", [".", UseLiteral("old_extern", True)]),
             UseIdent("class_name"),
-            UseLiteral("ignore_gir", True),
+            UseLiteral("extern", True),
         ],
         UseIdent("class_name"),
     )
 
+    @validate()
+    def old_extern(self):
+        if self.tokens["old_extern"]:
+            raise UpgradeWarning(
+                "Use the '$' extern syntax introduced in blueprint 0.8.0",
+                actions=[CodeAction("Use '$' syntax", "$" + self.tokens["class_name"])],
+            )
+
     @validate("class_name")
     def type_exists(self):
-        if not self.tokens["ignore_gir"] and self.gir_ns is not None:
+        if not self.tokens["extern"] and self.gir_ns is not None:
             self.root.gir.validate_type(
                 self.tokens["class_name"], self.tokens["namespace"]
             )
 
     @validate("namespace")
     def gir_ns_exists(self):
-        if not self.tokens["ignore_gir"]:
+        if not self.tokens["extern"]:
             self.root.gir.validate_ns(self.tokens["namespace"])
 
     @property
     def gir_ns(self):
-        if not self.tokens["ignore_gir"]:
+        if not self.tokens["extern"]:
             return self.root.gir.namespaces.get(self.tokens["namespace"] or "Gtk")
 
     @property
     def gir_type(self) -> gir.GirType:
-        if self.tokens["class_name"] and not self.tokens["ignore_gir"]:
+        if self.tokens["class_name"] and not self.tokens["extern"]:
             return self.root.gir.get_type(
                 self.tokens["class_name"], self.tokens["namespace"]
             )
diff --git a/blueprintcompiler/utils.py b/blueprintcompiler/utils.py
index 5e939c7..4c4b44a 100644
--- a/blueprintcompiler/utils.py
+++ b/blueprintcompiler/utils.py
@@ -24,6 +24,7 @@ class Colors:
     RED = "\033[91m"
     GREEN = "\033[92m"
     YELLOW = "\033[33m"
+    PURPLE = "\033[35m"
     FAINT = "\033[2m"
     BOLD = "\033[1m"
     BLUE = "\033[34m"
diff --git a/tests/sample_errors/warn_old_extern.blp b/tests/sample_errors/warn_old_extern.blp
new file mode 100644
index 0000000..e50fb0f
--- /dev/null
+++ b/tests/sample_errors/warn_old_extern.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+.MyClass {
+  prop: typeof(.MyOtherClass);
+}
\ No newline at end of file
diff --git a/tests/sample_errors/warn_old_extern.err b/tests/sample_errors/warn_old_extern.err
new file mode 100644
index 0000000..8209d23
--- /dev/null
+++ b/tests/sample_errors/warn_old_extern.err
@@ -0,0 +1,2 @@
+3,1,8,Use the '$' extern syntax introduced in blueprint 0.8.0
+4,16,13,Use the '$' extern syntax introduced in blueprint 0.8.0
\ No newline at end of file
diff --git a/tests/samples/typeof.blp b/tests/samples/typeof.blp
index 5c5e2e5..cdc1b46 100644
--- a/tests/samples/typeof.blp
+++ b/tests/samples/typeof.blp
@@ -7,5 +7,5 @@ Gio.ListStore {
 }
 
 Gio.ListStore {
-  item-type: typeof(.MyObject);
+  item-type: typeof($MyObject);
 }
\ No newline at end of file
diff --git a/tests/samples/unchecked_class.blp b/tests/samples/unchecked_class.blp
index 3be0b04..3003842 100644
--- a/tests/samples/unchecked_class.blp
+++ b/tests/samples/unchecked_class.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 
-.MyComponent component {
-  .MyComponent2 {
+$MyComponent component {
+  $MyComponent2 {
     flags-value: a | b;
   }
 }
diff --git a/tests/samples/unchecked_class_dec.blp b/tests/samples/unchecked_class_dec.blp
index 81d342e..dbbfe14 100644
--- a/tests/samples/unchecked_class_dec.blp
+++ b/tests/samples/unchecked_class_dec.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 
-.MyComponent component {
-  .MyComponent2 {
+$MyComponent component {
+  $MyComponent2 {
     flags-value: "a|b";
   }
 }
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 6d809c5..6f8a4eb 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -236,6 +236,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("two_templates")
         self.assert_sample_error("uint")
         self.assert_sample_error("using_invalid_namespace")
+        self.assert_sample_error("warn_old_extern")
         self.assert_sample_error("widgets_in_non_size_group")
 
     def test_decompiler(self):

From 122b049ce99e69b234246b098e87a5c2119d295d Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 25 Dec 2022 16:22:33 -0600
Subject: [PATCH 068/290] language: Use new extern syntax in signal handlers

---
 blueprintcompiler/language/gobject_signal.py | 13 +++++++++++--
 tests/sample_errors/signal_dne.blp           |  2 +-
 tests/sample_errors/signal_object_dne.blp    |  2 +-
 tests/sample_errors/signal_object_dne.err    |  2 +-
 tests/sample_errors/warn_old_extern.blp      |  1 +
 tests/sample_errors/warn_old_extern.err      |  3 ++-
 tests/samples/signal.blp                     |  6 +++---
 tests/samples/template.blp                   |  2 +-
 8 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 11a69e0..74d7472 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -33,6 +33,7 @@ class Signal(AstNode):
             ]
         ),
         "=>",
+        Optional(["$", UseLiteral("extern", True)]),
         UseIdent("handler").expected("the name of a function to handle the signal"),
         Match("(").expected("argument list"),
         Optional(UseIdent("object")).expected("object identifier"),
@@ -78,6 +79,14 @@ class Signal(AstNode):
     def gir_class(self):
         return self.parent.parent.gir_class
 
+    @validate("handler")
+    def old_extern(self):
+        if not self.tokens["extern"]:
+            raise UpgradeWarning(
+                "Use the '$' extern syntax introduced in blueprint 0.8.0",
+                actions=[CodeAction("Use '$' syntax", "$" + self.tokens["handler"])],
+            )
+
     @validate("name")
     def signal_exists(self):
         if self.gir_class is None or isinstance(self.gir_class, UncheckedType):
@@ -116,7 +125,7 @@ def decompile_signal(ctx, gir, name, handler, swapped="false", object=None):
     object_name = object or ""
     name = name.replace("_", "-")
     if decompile.truthy(swapped):
-        ctx.print(f"{name} => {handler}({object_name}) swapped;")
+        ctx.print(f"{name} => ${handler}({object_name}) swapped;")
     else:
-        ctx.print(f"{name} => {handler}({object_name});")
+        ctx.print(f"{name} => ${handler}({object_name});")
     return gir
diff --git a/tests/sample_errors/signal_dne.blp b/tests/sample_errors/signal_dne.blp
index 9c5d046..0f90432 100644
--- a/tests/sample_errors/signal_dne.blp
+++ b/tests/sample_errors/signal_dne.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 Button {
-  eaten-by-velociraptors => on_eaten_by_velociraptors();
+  eaten-by-velociraptors => $on_eaten_by_velociraptors();
 }
diff --git a/tests/sample_errors/signal_object_dne.blp b/tests/sample_errors/signal_object_dne.blp
index 8c9610c..5492117 100644
--- a/tests/sample_errors/signal_object_dne.blp
+++ b/tests/sample_errors/signal_object_dne.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 Button {
-    clicked => function(dinosaur);
+    clicked => $function(dinosaur);
 }
\ No newline at end of file
diff --git a/tests/sample_errors/signal_object_dne.err b/tests/sample_errors/signal_object_dne.err
index dfffc0f..b76b98a 100644
--- a/tests/sample_errors/signal_object_dne.err
+++ b/tests/sample_errors/signal_object_dne.err
@@ -1 +1 @@
-4,25,8,Could not find object with ID 'dinosaur'
\ No newline at end of file
+4,26,8,Could not find object with ID 'dinosaur'
\ No newline at end of file
diff --git a/tests/sample_errors/warn_old_extern.blp b/tests/sample_errors/warn_old_extern.blp
index e50fb0f..c7ad01d 100644
--- a/tests/sample_errors/warn_old_extern.blp
+++ b/tests/sample_errors/warn_old_extern.blp
@@ -2,4 +2,5 @@ using Gtk 4.0;
 
 .MyClass {
   prop: typeof(.MyOtherClass);
+  clicked => handler();
 }
\ No newline at end of file
diff --git a/tests/sample_errors/warn_old_extern.err b/tests/sample_errors/warn_old_extern.err
index 8209d23..c3b3fe2 100644
--- a/tests/sample_errors/warn_old_extern.err
+++ b/tests/sample_errors/warn_old_extern.err
@@ -1,2 +1,3 @@
 3,1,8,Use the '$' extern syntax introduced in blueprint 0.8.0
-4,16,13,Use the '$' extern syntax introduced in blueprint 0.8.0
\ No newline at end of file
+4,16,13,Use the '$' extern syntax introduced in blueprint 0.8.0
+5,14,7,Use the '$' extern syntax introduced in blueprint 0.8.0
\ No newline at end of file
diff --git a/tests/samples/signal.blp b/tests/samples/signal.blp
index 1965e74..5f3aa7f 100644
--- a/tests/samples/signal.blp
+++ b/tests/samples/signal.blp
@@ -1,10 +1,10 @@
 using Gtk 4.0;
 
 Entry {
-  activate => click(button);
+  activate => $click(button);
 }
 
 Button button {
-  clicked => on_button_clicked() swapped;
-  notify::visible => on_button_notify_visible();
+  clicked => $on_button_clicked() swapped;
+  notify::visible => $on_button_notify_visible();
 }
diff --git a/tests/samples/template.blp b/tests/samples/template.blp
index 7773e25..a0ed5cc 100644
--- a/tests/samples/template.blp
+++ b/tests/samples/template.blp
@@ -2,7 +2,7 @@ using Gtk 4.0;
 
 template TestTemplate : ApplicationWindow {
   test-property: "Hello, world";
-  test-signal => on_test_signal();
+  test-signal => $on_test_signal();
 }
 
 Dialog {

From b6ee649458a39323dce40360b2df691a29a751cd Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 25 Dec 2022 17:10:21 -0600
Subject: [PATCH 069/290] Simplify error & warning handling

---
 blueprintcompiler/ast_utils.py                | 14 ++++++++++++-
 blueprintcompiler/interactive_port.py         |  6 +++---
 blueprintcompiler/lsp.py                      |  1 -
 blueprintcompiler/main.py                     |  6 +++---
 blueprintcompiler/parser.py                   | 21 ++++++++++++-------
 tests/fuzz.py                                 |  2 +-
 .../sample_errors/menu_toplevel_attribute.blp |  2 +-
 tests/test_samples.py                         |  7 +++----
 8 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index e4f2efa..16298ae 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -79,7 +79,19 @@ class AstNode:
 
     @cached_property
     def errors(self):
-        return list(self._get_errors())
+        return list(
+            error
+            for error in self._get_errors()
+            if not isinstance(error, CompileWarning)
+        )
+
+    @cached_property
+    def warnings(self):
+        return list(
+            warning
+            for warning in self._get_errors()
+            if isinstance(warning, CompileWarning)
+        )
 
     def _get_errors(self):
         for validator in self.validators:
diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index dd00317..ddb5e28 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -24,7 +24,7 @@ import os
 
 from . import decompiler, tokenizer, parser
 from .outputs.xml import XmlOutput
-from .errors import MultipleErrors, PrintableError
+from .errors import MultipleErrors, PrintableError, CompilerBugError
 from .utils import Colors
 
 
@@ -57,8 +57,8 @@ def decompile_file(in_file, out_file) -> T.Union[str, CouldNotPort]:
 
             if errors:
                 raise errors
-            if len(ast.errors):
-                raise MultipleErrors(ast.errors)
+            if not ast:
+                raise CompilerBugError()
 
             output = XmlOutput()
             output.emit(ast)
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index f579ab4..890eff0 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -75,7 +75,6 @@ class OpenFile:
             self.diagnostics += warnings
             if errors is not None:
                 self.diagnostics += errors.errors
-            self.diagnostics += self.ast.errors
         except MultipleErrors as e:
             self.diagnostics += e.errors
         except CompileError as e:
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index a3a70a2..345f430 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -21,7 +21,7 @@
 import typing as T
 import argparse, json, os, sys
 
-from .errors import PrintableError, report_bug, MultipleErrors
+from .errors import PrintableError, report_bug, MultipleErrors, CompilerBugError
 from .lsp import LanguageServer
 from . import parser, tokenizer, decompiler, interactive_port
 from .utils import Colors
@@ -149,8 +149,8 @@ class BlueprintApp:
 
         if errors:
             raise errors
-        if len(ast.errors):
-            raise MultipleErrors(ast.errors)
+        if ast is None:
+            raise CompilerBugError()
 
         formatter = XmlOutput()
 
diff --git a/blueprintcompiler/parser.py b/blueprintcompiler/parser.py
index 12c893a..a44f709 100644
--- a/blueprintcompiler/parser.py
+++ b/blueprintcompiler/parser.py
@@ -24,14 +24,21 @@ from .tokenizer import TokenType
 from .language import OBJECT_CONTENT_HOOKS, VALUE_HOOKS, Template, UI
 
 
-def parse(tokens) -> T.Tuple[UI, T.Optional[MultipleErrors], T.List[PrintableError]]:
+def parse(
+    tokens: T.List[Token],
+) -> T.Tuple[T.Optional[UI], T.Optional[MultipleErrors], T.List[PrintableError]]:
     """Parses a list of tokens into an abstract syntax tree."""
 
-    ctx = ParseContext(tokens)
-    AnyOf(UI).parse(ctx)
+    try:
+        ctx = ParseContext(tokens)
+        AnyOf(UI).parse(ctx)
+        ast_node = ctx.last_group.to_ast() if ctx.last_group else None
 
-    ast_node = ctx.last_group.to_ast() if ctx.last_group else None
-    errors = MultipleErrors(ctx.errors) if len(ctx.errors) else None
-    warnings = ctx.warnings
+        errors = [*ctx.errors, *ast_node.errors]
+        warnings = [*ctx.warnings, *ast_node.warnings]
 
-    return (ast_node, errors, warnings)
+        return (ast_node, MultipleErrors(errors) if len(errors) else None, warnings)
+    except MultipleErrors as e:
+        return (None, e, [])
+    except CompileError as e:
+        return (None, MultipleErrors([e]), [])
diff --git a/tests/fuzz.py b/tests/fuzz.py
index 0f6a1a7..ad1c764 100644
--- a/tests/fuzz.py
+++ b/tests/fuzz.py
@@ -26,7 +26,7 @@ def fuzz(buf):
         ast, errors, warnings = parser.parse(tokens)
 
         xml = XmlOutput()
-        if errors is None and len(ast.errors) == 0:
+        if errors is None and ast is not None:
             xml.emit(ast)
     except CompilerBugError as e:
         raise e
diff --git a/tests/sample_errors/menu_toplevel_attribute.blp b/tests/sample_errors/menu_toplevel_attribute.blp
index 21ceeff..e9923c2 100644
--- a/tests/sample_errors/menu_toplevel_attribute.blp
+++ b/tests/sample_errors/menu_toplevel_attribute.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
-menu {
+menu menu {
     not-allowed: true;
 }
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 6f8a4eb..e9e7697 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -57,8 +57,6 @@ class TestSamples(unittest.TestCase):
 
             if errors:
                 raise errors
-            if len(ast.errors):
-                raise MultipleErrors(ast.errors)
             if len(warnings):
                 raise MultipleErrors(warnings)
 
@@ -94,8 +92,9 @@ class TestSamples(unittest.TestCase):
             tokens = tokenizer.tokenize(blueprint)
             ast, errors, warnings = parser.parse(tokens)
 
-            self.assert_docs_dont_crash(blueprint, ast)
-            self.assert_completions_dont_crash(blueprint, ast, tokens)
+            if ast is not None:
+                self.assert_docs_dont_crash(blueprint, ast)
+                self.assert_completions_dont_crash(blueprint, ast, tokens)
 
             if errors:
                 raise errors

From 0b7dbaf90d17073dd13249393b65dd130c9e5c58 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 25 Dec 2022 18:32:23 -0600
Subject: [PATCH 070/290] Add some type hints

---
 blueprintcompiler/decompiler.py       |  42 ++++---
 blueprintcompiler/errors.py           |  30 ++---
 blueprintcompiler/gir.py              | 166 +++++++++++++-------------
 blueprintcompiler/interactive_port.py |   2 +-
 blueprintcompiler/lsp.py              |  11 +-
 blueprintcompiler/main.py             |   2 +-
 blueprintcompiler/parse_tree.py       |  71 +++++------
 blueprintcompiler/tokenizer.py        |  10 +-
 blueprintcompiler/typelib.py          |  26 ++--
 blueprintcompiler/xml_reader.py       |   6 +-
 10 files changed, 193 insertions(+), 173 deletions(-)

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 565d420..c068c93 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -51,17 +51,17 @@ class LineType(Enum):
 
 
 class DecompileCtx:
-    def __init__(self):
-        self._result = ""
+    def __init__(self) -> None:
+        self._result: str = ""
         self.gir = GirContext()
-        self._indent = 0
-        self._blocks_need_end = []
-        self._last_line_type = LineType.NONE
+        self._indent: int = 0
+        self._blocks_need_end: T.List[str] = []
+        self._last_line_type: LineType = LineType.NONE
 
         self.gir.add_namespace(get_namespace("Gtk", "4.0"))
 
     @property
-    def result(self):
+    def result(self) -> str:
         imports = "\n".join(
             [
                 f"using {ns} {namespace.version};"
@@ -70,7 +70,7 @@ class DecompileCtx:
         )
         return imports + "\n" + self._result
 
-    def type_by_cname(self, cname):
+    def type_by_cname(self, cname: str) -> T.Optional[GirType]:
         if type := self.gir.get_type_by_cname(cname):
             return type
 
@@ -83,17 +83,19 @@ class DecompileCtx:
             except:
                 pass
 
-    def start_block(self):
-        self._blocks_need_end.append(None)
+        return None
 
-    def end_block(self):
+    def start_block(self) -> None:
+        self._blocks_need_end.append("")
+
+    def end_block(self) -> None:
         if close := self._blocks_need_end.pop():
             self.print(close)
 
-    def end_block_with(self, text):
+    def end_block_with(self, text: str) -> None:
         self._blocks_need_end[-1] = text
 
-    def print(self, line, newline=True):
+    def print(self, line: str, newline: bool = True) -> None:
         if line == "}" or line == "]":
             self._indent -= 1
 
@@ -124,7 +126,7 @@ class DecompileCtx:
                 self._blocks_need_end[-1] = _CLOSING[line[-1]]
             self._indent += 1
 
-    def print_attribute(self, name, value, type):
+    def print_attribute(self, name: str, value: str, type: GirType) -> None:
         def get_enum_name(value):
             for member in type.members.values():
                 if (
@@ -169,13 +171,17 @@ class DecompileCtx:
             self.print(f'{name}: "{escape_quote(value)}";')
 
 
-def _decompile_element(ctx: DecompileCtx, gir, xml):
+def _decompile_element(
+    ctx: DecompileCtx, gir: T.Optional[GirContext], xml: Element
+) -> None:
     try:
         decompiler = _DECOMPILERS.get(xml.tag)
         if decompiler is None:
             raise UnsupportedError(f"unsupported XML tag: <{xml.tag}>")
 
-        args = {canon(name): value for name, value in xml.attrs.items()}
+        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
@@ -196,7 +202,7 @@ def _decompile_element(ctx: DecompileCtx, gir, xml):
         raise UnsupportedError(tag=xml.tag)
 
 
-def decompile(data):
+def decompile(data: str) -> str:
     ctx = DecompileCtx()
 
     xml = parse(data)
@@ -216,11 +222,11 @@ def truthy(string: str) -> bool:
     return string.lower() in ["yes", "true", "t", "y", "1"]
 
 
-def full_name(gir):
+def full_name(gir) -> str:
     return gir.name if gir.full_name.startswith("Gtk.") else gir.full_name
 
 
-def lookup_by_cname(gir, cname: str):
+def lookup_by_cname(gir, cname: str) -> T.Optional[GirType]:
     if isinstance(gir, GirContext):
         return gir.get_type_by_cname(cname)
     else:
diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 01f9066..4a18589 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -47,15 +47,15 @@ class CompileError(PrintableError):
 
     def __init__(
         self,
-        message,
-        start=None,
-        end=None,
-        did_you_mean=None,
-        hints=None,
-        actions=None,
-        fatal=False,
-        references=None,
-    ):
+        message: str,
+        start: T.Optional[int] = None,
+        end: T.Optional[int] = None,
+        did_you_mean: T.Optional[T.Tuple[str, T.List[str]]] = None,
+        hints: T.Optional[T.List[str]] = None,
+        actions: T.Optional[T.List["CodeAction"]] = None,
+        fatal: bool = False,
+        references: T.Optional[T.List[ErrorReference]] = None,
+    ) -> None:
         super().__init__(message)
 
         self.message = message
@@ -69,11 +69,11 @@ class CompileError(PrintableError):
         if did_you_mean is not None:
             self._did_you_mean(*did_you_mean)
 
-    def hint(self, hint: str):
+    def hint(self, hint: str) -> "CompileError":
         self.hints.append(hint)
         return self
 
-    def _did_you_mean(self, word: str, options: T.List[str]):
+    def _did_you_mean(self, word: str, options: T.List[str]) -> None:
         if word.replace("_", "-") in options:
             self.hint(f"use '-', not '_': `{word.replace('_', '-')}`")
             return
@@ -89,7 +89,9 @@ class CompileError(PrintableError):
             self.hint("Did you check your spelling?")
             self.hint("Are your dependencies up to date?")
 
-    def pretty_print(self, filename, code, stream=sys.stdout):
+    def pretty_print(self, filename: str, code: str, stream=sys.stdout) -> None:
+        assert self.start is not None
+
         line_num, col_num = utils.idx_to_pos(self.start + 1, code)
         line = code.splitlines(True)[line_num]
 
@@ -130,7 +132,7 @@ class UpgradeWarning(CompileWarning):
 
 
 class UnexpectedTokenError(CompileError):
-    def __init__(self, start, end):
+    def __init__(self, start, end) -> None:
         super().__init__("Unexpected tokens", start, end)
 
 
@@ -145,7 +147,7 @@ class MultipleErrors(PrintableError):
     a list and re-thrown using the MultipleErrors exception. It will
     pretty-print all of the errors and a count of how many errors there are."""
 
-    def __init__(self, errors: T.List[CompileError]):
+    def __init__(self, errors: T.List[CompileError]) -> None:
         super().__init__()
         self.errors = errors
 
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 4ee2b1e..70d8e89 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -33,7 +33,7 @@ _namespace_cache: T.Dict[str, "Namespace"] = {}
 _xml_cache = {}
 
 
-def get_namespace(namespace, version) -> "Namespace":
+def get_namespace(namespace: str, version: str) -> "Namespace":
     search_paths = GIRepository.Repository.get_search_path()
 
     filename = f"{namespace}-{version}.typelib"
@@ -58,10 +58,7 @@ def get_namespace(namespace, version) -> "Namespace":
     return _namespace_cache[filename]
 
 
-def get_xml(namespace, version):
-    from .main import VERSION
-    from xml.etree import ElementTree
-
+def get_xml(namespace: str, version: str):
     search_paths = []
 
     if data_paths := os.environ.get("XDG_DATA_DIRS"):
@@ -90,12 +87,17 @@ def get_xml(namespace, version):
 
 class GirType:
     @property
-    def doc(self):
+    def doc(self) -> T.Optional[str]:
         return None
 
     def assignable_to(self, other: "GirType") -> bool:
         raise NotImplementedError()
 
+    @property
+    def name(self) -> str:
+        """The GIR name of the type, not including the namespace"""
+        raise NotImplementedError()
+
     @property
     def full_name(self) -> str:
         """The GIR name of the type to use in diagnostics"""
@@ -108,7 +110,7 @@ class GirType:
 
 
 class UncheckedType(GirType):
-    def __init__(self, name) -> None:
+    def __init__(self, name: str) -> None:
         super().__init__()
         self._name = name
 
@@ -136,7 +138,7 @@ class BoolType(BasicType):
     name = "bool"
     glib_type_name: str = "gboolean"
 
-    def assignable_to(self, other) -> bool:
+    def assignable_to(self, other: GirType) -> bool:
         return isinstance(other, BoolType)
 
 
@@ -144,7 +146,7 @@ class IntType(BasicType):
     name = "int"
     glib_type_name: str = "gint"
 
-    def assignable_to(self, other) -> bool:
+    def assignable_to(self, other: GirType) -> bool:
         return (
             isinstance(other, IntType)
             or isinstance(other, UIntType)
@@ -156,7 +158,7 @@ class UIntType(BasicType):
     name = "uint"
     glib_type_name: str = "guint"
 
-    def assignable_to(self, other) -> bool:
+    def assignable_to(self, other: GirType) -> bool:
         return (
             isinstance(other, IntType)
             or isinstance(other, UIntType)
@@ -168,7 +170,7 @@ class FloatType(BasicType):
     name = "float"
     glib_type_name: str = "gfloat"
 
-    def assignable_to(self, other) -> bool:
+    def assignable_to(self, other: GirType) -> bool:
         return isinstance(other, FloatType)
 
 
@@ -176,7 +178,7 @@ class StringType(BasicType):
     name = "string"
     glib_type_name: str = "gchararray"
 
-    def assignable_to(self, other) -> bool:
+    def assignable_to(self, other: GirType) -> bool:
         return isinstance(other, StringType)
 
 
@@ -184,7 +186,7 @@ class TypeType(BasicType):
     name = "GType"
     glib_type_name: str = "GType"
 
-    def assignable_to(self, other) -> bool:
+    def assignable_to(self, other: GirType) -> bool:
         return isinstance(other, TypeType)
 
 
@@ -208,14 +210,17 @@ _BASIC_TYPES = {
 }
 
 
+TNode = T.TypeVar("TNode", bound="GirNode")
+
+
 class GirNode:
-    def __init__(self, container, tl):
+    def __init__(self, container: T.Optional["GirNode"], tl: typelib.Typelib) -> None:
         self.container = container
         self.tl = tl
 
-    def get_containing(self, container_type):
+    def get_containing(self, container_type: T.Type[TNode]) -> TNode:
         if self.container is None:
-            return None
+            raise CompilerBugError()
         elif isinstance(self.container, container_type):
             return self.container
         else:
@@ -228,11 +233,11 @@ class GirNode:
                 return el
 
     @cached_property
-    def glib_type_name(self):
+    def glib_type_name(self) -> str:
         return self.tl.OBJ_GTYPE_NAME
 
     @cached_property
-    def full_name(self):
+    def full_name(self) -> str:
         if self.container is None:
             return self.name
         else:
@@ -273,20 +278,16 @@ class GirNode:
         return None
 
     @property
-    def type_name(self):
-        return self.type.name
-
-    @property
-    def type(self):
+    def type(self) -> GirType:
         raise NotImplementedError()
 
 
 class Property(GirNode):
-    def __init__(self, klass, tl: typelib.Typelib):
+    def __init__(self, klass: T.Union["Class", "Interface"], tl: typelib.Typelib):
         super().__init__(klass, tl)
 
     @cached_property
-    def name(self):
+    def name(self) -> str:
         return self.tl.PROP_NAME
 
     @cached_property
@@ -295,24 +296,26 @@ class Property(GirNode):
 
     @cached_property
     def signature(self):
-        return f"{self.type_name} {self.container.name}.{self.name}"
+        return f"{self.full_name} {self.container.name}.{self.name}"
 
     @property
-    def writable(self):
+    def writable(self) -> bool:
         return self.tl.PROP_WRITABLE == 1
 
     @property
-    def construct_only(self):
+    def construct_only(self) -> bool:
         return self.tl.PROP_CONSTRUCT_ONLY == 1
 
 
 class Parameter(GirNode):
-    def __init__(self, container: GirNode, tl: typelib.Typelib):
+    def __init__(self, container: GirNode, tl: typelib.Typelib) -> None:
         super().__init__(container, tl)
 
 
 class Signal(GirNode):
-    def __init__(self, klass, tl: typelib.Typelib):
+    def __init__(
+        self, klass: T.Union["Class", "Interface"], tl: typelib.Typelib
+    ) -> None:
         super().__init__(klass, tl)
         # if parameters := xml.get_elements('parameters'):
         #     self.params = [Parameter(self, child) for child in parameters[0].get_elements('parameter')]
@@ -328,11 +331,11 @@ class Signal(GirNode):
 
 
 class Interface(GirNode, GirType):
-    def __init__(self, ns, tl: typelib.Typelib):
+    def __init__(self, ns: "Namespace", tl: typelib.Typelib):
         super().__init__(ns, tl)
 
     @cached_property
-    def properties(self):
+    def properties(self) -> T.Mapping[str, Property]:
         n_prerequisites = self.tl.INTERFACE_N_PREREQUISITES
         offset = self.tl.header.HEADER_INTERFACE_BLOB_SIZE
         offset += (n_prerequisites + n_prerequisites % 2) * 2
@@ -345,7 +348,7 @@ class Interface(GirNode, GirType):
         return result
 
     @cached_property
-    def signals(self):
+    def signals(self) -> T.Mapping[str, Signal]:
         n_prerequisites = self.tl.INTERFACE_N_PREREQUISITES
         offset = self.tl.header.HEADER_INTERFACE_BLOB_SIZE
         offset += (n_prerequisites + n_prerequisites % 2) * 2
@@ -362,7 +365,7 @@ class Interface(GirNode, GirType):
         return result
 
     @cached_property
-    def prerequisites(self):
+    def prerequisites(self) -> T.List["Interface"]:
         n_prerequisites = self.tl.INTERFACE_N_PREREQUISITES
         result = []
         for i in range(n_prerequisites):
@@ -370,7 +373,7 @@ class Interface(GirNode, GirType):
             result.append(self.get_containing(Repository)._resolve_dir_entry(entry))
         return result
 
-    def assignable_to(self, other) -> bool:
+    def assignable_to(self, other: GirType) -> bool:
         if self == other:
             return True
         for pre in self.prerequisites:
@@ -380,15 +383,15 @@ class Interface(GirNode, GirType):
 
 
 class Class(GirNode, GirType):
-    def __init__(self, ns, tl: typelib.Typelib):
+    def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
         super().__init__(ns, tl)
 
     @property
-    def abstract(self):
+    def abstract(self) -> bool:
         return self.tl.OBJ_ABSTRACT == 1
 
     @cached_property
-    def implements(self):
+    def implements(self) -> T.List[Interface]:
         n_interfaces = self.tl.OBJ_N_INTERFACES
         result = []
         for i in range(n_interfaces):
@@ -397,7 +400,7 @@ class Class(GirNode, GirType):
         return result
 
     @cached_property
-    def own_properties(self):
+    def own_properties(self) -> T.Mapping[str, Property]:
         n_interfaces = self.tl.OBJ_N_INTERFACES
         offset = self.tl.header.HEADER_OBJECT_BLOB_SIZE
         offset += (n_interfaces + n_interfaces % 2) * 2
@@ -414,7 +417,7 @@ class Class(GirNode, GirType):
         return result
 
     @cached_property
-    def own_signals(self):
+    def own_signals(self) -> T.Mapping[str, Signal]:
         n_interfaces = self.tl.OBJ_N_INTERFACES
         offset = self.tl.header.HEADER_OBJECT_BLOB_SIZE
         offset += (n_interfaces + n_interfaces % 2) * 2
@@ -433,16 +436,18 @@ class Class(GirNode, GirType):
         return result
 
     @cached_property
-    def parent(self):
+    def parent(self) -> T.Optional["Class"]:
         if entry := self.tl.OBJ_PARENT:
             return self.get_containing(Repository)._resolve_dir_entry(entry)
         else:
             return None
 
     @cached_property
-    def signature(self):
+    def signature(self) -> str:
+        assert self.container is not None
         result = f"class {self.container.name}.{self.name}"
         if self.parent is not None:
+            assert self.parent.container is not None
             result += f" : {self.parent.container.name}.{self.parent.name}"
         if len(self.implements):
             result += " implements " + ", ".join(
@@ -451,14 +456,14 @@ class Class(GirNode, GirType):
         return result
 
     @cached_property
-    def properties(self):
+    def properties(self) -> T.Mapping[str, Property]:
         return {p.name: p for p in self._enum_properties()}
 
     @cached_property
-    def signals(self):
+    def signals(self) -> T.Mapping[str, Signal]:
         return {s.name: s for s in self._enum_signals()}
 
-    def assignable_to(self, other) -> bool:
+    def assignable_to(self, other: GirType) -> bool:
         if self == other:
             return True
         elif self.parent and self.parent.assignable_to(other):
@@ -470,7 +475,7 @@ class Class(GirNode, GirType):
 
             return False
 
-    def _enum_properties(self):
+    def _enum_properties(self) -> T.Iterable[Property]:
         yield from self.own_properties.values()
 
         if self.parent is not None:
@@ -479,7 +484,7 @@ class Class(GirNode, GirType):
         for impl in self.implements:
             yield from impl.properties.values()
 
-    def _enum_signals(self):
+    def _enum_signals(self) -> T.Iterable[Signal]:
         yield from self.own_signals.values()
 
         if self.parent is not None:
@@ -490,8 +495,8 @@ class Class(GirNode, GirType):
 
 
 class EnumMember(GirNode):
-    def __init__(self, ns, tl: typelib.Typelib):
-        super().__init__(ns, tl)
+    def __init__(self, enum: "Enumeration", tl: typelib.Typelib) -> None:
+        super().__init__(enum, tl)
 
     @property
     def value(self) -> int:
@@ -502,20 +507,20 @@ class EnumMember(GirNode):
         return self.tl.VALUE_NAME
 
     @cached_property
-    def nick(self):
+    def nick(self) -> str:
         return self.name.replace("_", "-")
 
     @property
-    def c_ident(self):
+    def c_ident(self) -> str:
         return self.tl.attr("c:identifier")
 
     @property
-    def signature(self):
+    def signature(self) -> str:
         return f"enum member {self.full_name} = {self.value}"
 
 
 class Enumeration(GirNode, GirType):
-    def __init__(self, ns, tl: typelib.Typelib):
+    def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
         super().__init__(ns, tl)
 
     @cached_property
@@ -530,43 +535,43 @@ class Enumeration(GirNode, GirType):
         return members
 
     @property
-    def signature(self):
+    def signature(self) -> str:
         return f"enum {self.full_name}"
 
-    def assignable_to(self, type):
+    def assignable_to(self, type: GirType) -> bool:
         return type == self
 
 
 class Boxed(GirNode, GirType):
-    def __init__(self, ns, tl: typelib.Typelib):
+    def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
         super().__init__(ns, tl)
 
     @property
-    def signature(self):
+    def signature(self) -> str:
         return f"boxed {self.full_name}"
 
-    def assignable_to(self, type):
+    def assignable_to(self, type) -> bool:
         return type == self
 
 
 class Bitfield(Enumeration):
-    def __init__(self, ns, tl: typelib.Typelib):
+    def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
         super().__init__(ns, tl)
 
 
 class Namespace(GirNode):
-    def __init__(self, repo, tl: typelib.Typelib):
+    def __init__(self, repo: "Repository", tl: typelib.Typelib) -> None:
         super().__init__(repo, tl)
 
-        self.entries: T.Dict[str, GirNode] = {}
+        self.entries: T.Dict[str, GirType] = {}
 
-        n_local_entries = tl.HEADER_N_ENTRIES
-        directory = tl.HEADER_DIRECTORY
+        n_local_entries: int = tl.HEADER_N_ENTRIES
+        directory: typelib.Typelib = tl.HEADER_DIRECTORY
         for i in range(n_local_entries):
             entry = directory[i * tl.HEADER_ENTRY_BLOB_SIZE]
-            entry_name = entry.DIR_ENTRY_NAME
-            entry_type = entry.DIR_ENTRY_BLOB_TYPE
-            entry_blob = entry.DIR_ENTRY_OFFSET
+            entry_name: str = entry.DIR_ENTRY_NAME
+            entry_type: int = entry.DIR_ENTRY_BLOB_TYPE
+            entry_blob: typelib.Typelib = entry.DIR_ENTRY_OFFSET
 
             if entry_type == typelib.BLOB_TYPE_ENUM:
                 self.entries[entry_name] = Enumeration(self, entry_blob)
@@ -595,11 +600,11 @@ class Namespace(GirNode):
         return self.tl.HEADER_NSVERSION
 
     @property
-    def signature(self):
+    def signature(self) -> str:
         return f"namespace {self.name} {self.version}"
 
     @cached_property
-    def classes(self):
+    def classes(self) -> T.Mapping[str, Class]:
         return {
             name: entry
             for name, entry in self.entries.items()
@@ -607,24 +612,25 @@ class Namespace(GirNode):
         }
 
     @cached_property
-    def interfaces(self):
+    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):
+    def get_type(self, name) -> T.Optional[GirType]:
         """Gets a type (class, interface, enum, etc.) from this namespace."""
         return self.entries.get(name)
 
-    def get_type_by_cname(self, cname: str):
+    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:
                 return item
+        return None
 
-    def lookup_type(self, type_name: str):
+    def lookup_type(self, type_name: str) -> T.Optional[GirType]:
         """Looks up a type in the scope of this namespace (including in the
         namespace's dependencies)."""
 
@@ -638,7 +644,7 @@ class Namespace(GirNode):
 
 
 class Repository(GirNode):
-    def __init__(self, tl: typelib.Typelib):
+    def __init__(self, tl: typelib.Typelib) -> None:
         super().__init__(None, tl)
 
         self.namespace = Namespace(self, tl)
@@ -654,10 +660,10 @@ class Repository(GirNode):
         else:
             self.includes = {}
 
-    def get_type(self, name: str, ns: str) -> T.Optional[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[GirNode]:
+    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
@@ -679,7 +685,7 @@ class Repository(GirNode):
             ns = dir_entry.DIR_ENTRY_NAMESPACE
             return self.lookup_namespace(ns).get_type(dir_entry.DIR_ENTRY_NAME)
 
-    def _resolve_type_id(self, type_id: int):
+    def _resolve_type_id(self, type_id: int) -> GirType:
         if type_id & 0xFFFFFF == 0:
             type_id = (type_id >> 27) & 0x1F
             # simple type
@@ -726,13 +732,13 @@ class GirContext:
 
         self.namespaces[namespace.name] = namespace
 
-    def get_type_by_cname(self, name: str) -> T.Optional[GirNode]:
+    def get_type_by_cname(self, name: str) -> T.Optional[GirType]:
         for ns in self.namespaces.values():
             if type := ns.get_type_by_cname(name):
                 return type
         return None
 
-    def get_type(self, name: str, ns: str) -> T.Optional[GirNode]:
+    def get_type(self, name: str, ns: str) -> T.Optional[GirType]:
         if ns is None and name in _BASIC_TYPES:
             return _BASIC_TYPES[name]()
 
@@ -750,7 +756,7 @@ class GirContext:
         else:
             return None
 
-    def validate_ns(self, ns: str):
+    def validate_ns(self, ns: str) -> None:
         """Raises an exception if there is a problem looking up the given
         namespace."""
 
@@ -762,7 +768,7 @@ class GirContext:
                 did_you_mean=(ns, self.namespaces.keys()),
             )
 
-    def validate_type(self, name: str, ns: str):
+    def validate_type(self, name: str, ns: str) -> None:
         """Raises an exception if there is a problem looking up the given type."""
 
         self.validate_ns(ns)
diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index ddb5e28..ffc4292 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -32,7 +32,7 @@ from .utils import Colors
 
 
 class CouldNotPort:
-    def __init__(self, message):
+    def __init__(self, message: str):
         self.message = message
 
 
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 890eff0..dd12905 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -31,7 +31,7 @@ def printerr(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)
 
 
-def command(json_method):
+def command(json_method: str):
     def decorator(func):
         func._json_method = json_method
         return func
@@ -40,7 +40,7 @@ def command(json_method):
 
 
 class OpenFile:
-    def __init__(self, uri, text, version):
+    def __init__(self, uri: str, text: str, version: int):
         self.uri = uri
         self.text = text
         self.version = version
@@ -81,6 +81,9 @@ class OpenFile:
             self.diagnostics.append(e)
 
     def calc_semantic_tokens(self) -> T.List[int]:
+        if self.ast is None:
+            return []
+
         tokens = list(self.ast.get_semantic_tokens())
         token_lists = [
             [
@@ -318,9 +321,11 @@ class LanguageServer:
             },
         )
 
-    def _create_diagnostic(self, text, uri, err):
+    def _create_diagnostic(self, text: str, uri: str, err: CompileError):
         message = err.message
 
+        assert err.start is not None and err.end is not None
+
         for hint in err.hints:
             message += "\nhint: " + hint
 
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 345f430..6127630 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -82,7 +82,7 @@ class BlueprintApp:
         except:
             report_bug()
 
-    def add_subcommand(self, name, help, func):
+    def add_subcommand(self, name: str, help: str, func):
         parser = self.subparsers.add_parser(name, help=help)
         parser.set_defaults(func=func)
         return parser
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index ef8586b..670c72e 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -23,6 +23,7 @@ import typing as T
 
 from collections import defaultdict
 from enum import Enum
+from .ast_utils import AstNode
 
 from .errors import (
     assert_true,
@@ -64,19 +65,19 @@ class ParseGroup:
     be converted to AST nodes by passing the children and key=value pairs to
     the AST node constructor."""
 
-    def __init__(self, ast_type, start: int):
+    def __init__(self, ast_type: T.Type[AstNode], start: int):
         self.ast_type = ast_type
         self.children: T.List[ParseGroup] = []
         self.keys: T.Dict[str, T.Any] = {}
-        self.tokens: T.Dict[str, Token] = {}
+        self.tokens: T.Dict[str, T.Optional[Token]] = {}
         self.start = start
-        self.end = None
+        self.end: T.Optional[int] = None
         self.incomplete = False
 
-    def add_child(self, child):
+    def add_child(self, child: "ParseGroup"):
         self.children.append(child)
 
-    def set_val(self, key, val, token):
+    def set_val(self, key: str, val: T.Any, token: T.Optional[Token]):
         assert_true(key not in self.keys)
 
         self.keys[key] = val
@@ -105,22 +106,22 @@ class ParseGroup:
 class ParseContext:
     """Contains the state of the parser."""
 
-    def __init__(self, tokens, index=0):
+    def __init__(self, tokens: T.List[Token], index=0):
         self.tokens = list(tokens)
 
         self.binding_power = 0
         self.index = index
         self.start = index
-        self.group = None
-        self.group_keys = {}
-        self.group_children = []
-        self.last_group = None
+        self.group: T.Optional[ParseGroup] = None
+        self.group_keys: T.Dict[str, T.Tuple[T.Any, T.Optional[Token]]] = {}
+        self.group_children: T.List[ParseGroup] = []
+        self.last_group: T.Optional[ParseGroup] = None
         self.group_incomplete = False
 
-        self.errors = []
-        self.warnings = []
+        self.errors: T.List[CompileError] = []
+        self.warnings: T.List[CompileWarning] = []
 
-    def create_child(self):
+    def create_child(self) -> "ParseContext":
         """Creates a new ParseContext at this context's position. The new
         context will be used to parse one node. If parsing is successful, the
         new context will be applied to "self". If parsing fails, the new
@@ -131,7 +132,7 @@ class ParseContext:
         ctx.binding_power = self.binding_power
         return ctx
 
-    def apply_child(self, other):
+    def apply_child(self, other: "ParseContext"):
         """Applies a child context to this context."""
 
         if other.group is not None:
@@ -159,12 +160,12 @@ class ParseContext:
         elif other.last_group:
             self.last_group = other.last_group
 
-    def start_group(self, ast_type):
+    def start_group(self, ast_type: T.Type[AstNode]):
         """Sets this context to have its own match group."""
         assert_true(self.group is None)
         self.group = ParseGroup(ast_type, self.tokens[self.index].start)
 
-    def set_group_val(self, key, value, token):
+    def set_group_val(self, key: str, value: T.Any, token: T.Optional[Token]):
         """Sets a matched key=value pair on the current match group."""
         assert_true(key not in self.group_keys)
         self.group_keys[key] = (value, token)
@@ -213,7 +214,7 @@ class ParseContext:
         else:
             self.errors.append(UnexpectedTokenError(start, end))
 
-    def is_eof(self) -> Token:
+    def is_eof(self) -> bool:
         return self.index >= len(self.tokens) or self.peek_token().type == TokenType.EOF
 
 
@@ -237,17 +238,17 @@ class ParseNode:
     def _parse(self, ctx: ParseContext) -> bool:
         raise NotImplementedError()
 
-    def err(self, message):
+    def err(self, message: str) -> "Err":
         """Causes this ParseNode to raise an exception if it fails to parse.
         This prevents the parser from backtracking, so you should understand
         what it does and how the parser works before using it."""
         return Err(self, message)
 
-    def expected(self, expect):
+    def expected(self, expect) -> "Err":
         """Convenience method for err()."""
         return self.err("Expected " + expect)
 
-    def warn(self, message):
+    def warn(self, message) -> "Warning":
         """Causes this ParseNode to emit a warning if it parses successfully."""
         return Warning(self, message)
 
@@ -255,11 +256,11 @@ class ParseNode:
 class Err(ParseNode):
     """ParseNode that emits a compile error if it fails to parse."""
 
-    def __init__(self, child, message):
+    def __init__(self, child, message: str):
         self.child = to_parse_node(child)
         self.message = message
 
-    def _parse(self, ctx):
+    def _parse(self, ctx: ParseContext):
         if self.child.parse(ctx).failed():
             start_idx = ctx.start
             while ctx.tokens[start_idx].type in SKIP_TOKENS:
@@ -274,11 +275,11 @@ class Err(ParseNode):
 class Warning(ParseNode):
     """ParseNode that emits a compile warning if it parses successfully."""
 
-    def __init__(self, child, message):
+    def __init__(self, child, message: str):
         self.child = to_parse_node(child)
         self.message = message
 
-    def _parse(self, ctx):
+    def _parse(self, ctx: ParseContext):
         ctx.skip()
         start_idx = ctx.index
         if self.child.parse(ctx).succeeded():
@@ -295,11 +296,11 @@ class Warning(ParseNode):
 class Fail(ParseNode):
     """ParseNode that emits a compile error if it parses successfully."""
 
-    def __init__(self, child, message):
+    def __init__(self, child, message: str):
         self.child = to_parse_node(child)
         self.message = message
 
-    def _parse(self, ctx):
+    def _parse(self, ctx: ParseContext):
         if self.child.parse(ctx).succeeded():
             start_idx = ctx.start
             while ctx.tokens[start_idx].type in SKIP_TOKENS:
@@ -314,7 +315,7 @@ class Fail(ParseNode):
 class Group(ParseNode):
     """ParseNode that creates a match group."""
 
-    def __init__(self, ast_type, child):
+    def __init__(self, ast_type: T.Type[AstNode], child):
         self.ast_type = ast_type
         self.child = to_parse_node(child)
 
@@ -393,7 +394,7 @@ class Until(ParseNode):
         self.child = to_parse_node(child)
         self.delimiter = to_parse_node(delimiter)
 
-    def _parse(self, ctx):
+    def _parse(self, ctx: ParseContext):
         while not self.delimiter.parse(ctx).succeeded():
             if ctx.is_eof():
                 return False
@@ -463,7 +464,7 @@ class Eof(ParseNode):
 class Match(ParseNode):
     """ParseNode that matches the given literal token."""
 
-    def __init__(self, op):
+    def __init__(self, op: str):
         self.op = op
 
     def _parse(self, ctx: ParseContext) -> bool:
@@ -482,7 +483,7 @@ class UseIdent(ParseNode):
     """ParseNode that matches any identifier and sets it in a key=value pair on
     the containing match group."""
 
-    def __init__(self, key):
+    def __init__(self, key: str):
         self.key = key
 
     def _parse(self, ctx: ParseContext):
@@ -498,7 +499,7 @@ class UseNumber(ParseNode):
     """ParseNode that matches a number and sets it in a key=value pair on
     the containing match group."""
 
-    def __init__(self, key):
+    def __init__(self, key: str):
         self.key = key
 
     def _parse(self, ctx: ParseContext):
@@ -517,7 +518,7 @@ class UseNumberText(ParseNode):
     """ParseNode that matches a number, but sets its *original text* it in a
     key=value pair on the containing match group."""
 
-    def __init__(self, key):
+    def __init__(self, key: str):
         self.key = key
 
     def _parse(self, ctx: ParseContext):
@@ -533,7 +534,7 @@ class UseQuoted(ParseNode):
     """ParseNode that matches a quoted string and sets it in a key=value pair
     on the containing match group."""
 
-    def __init__(self, key):
+    def __init__(self, key: str):
         self.key = key
 
     def _parse(self, ctx: ParseContext):
@@ -557,7 +558,7 @@ class UseLiteral(ParseNode):
     pair on the containing group. Useful for, e.g., property and signal flags:
     `Sequence(Keyword("swapped"), UseLiteral("swapped", True))`"""
 
-    def __init__(self, key, literal):
+    def __init__(self, key: str, literal: T.Any):
         self.key = key
         self.literal = literal
 
@@ -570,7 +571,7 @@ class Keyword(ParseNode):
     """Matches the given identifier and sets it as a named token, with the name
     being the identifier itself."""
 
-    def __init__(self, kw):
+    def __init__(self, kw: str):
         self.kw = kw
         self.set_token = True
 
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 516bc0b..170316c 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -22,7 +22,7 @@ import typing as T
 import re
 from enum import Enum
 
-from .errors import CompileError
+from .errors import CompileError, CompilerBugError
 
 
 class TokenType(Enum):
@@ -53,18 +53,18 @@ _TOKENS = [(type, re.compile(regex)) for (type, regex) in _tokens]
 
 
 class Token:
-    def __init__(self, type, start, end, string):
+    def __init__(self, type: TokenType, start: int, end: int, string: str):
         self.type = type
         self.start = start
         self.end = end
         self.string = string
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.string[self.start : self.end]
 
-    def get_number(self):
+    def get_number(self) -> T.Union[int, float]:
         if self.type != TokenType.NUMBER:
-            return None
+            raise CompilerBugError()
 
         string = str(self).replace("_", "")
         try:
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index 88e7b57..48ec416 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -58,14 +58,14 @@ TYPE_UNICHAR = 21
 
 
 class Field:
-    def __init__(self, offset, type, shift=0, mask=None):
+    def __init__(self, offset: int, type: str, shift=0, mask=None):
         self._offset = offset
         self._type = type
         self._shift = shift
         self._mask = (1 << mask) - 1 if mask else None
         self._name = f"{offset}__{type}__{shift}__{mask}"
 
-    def __get__(self, typelib, _objtype=None):
+    def __get__(self, typelib: "Typelib", _objtype=None):
         if typelib is None:
             return self
 
@@ -181,47 +181,47 @@ class Typelib:
     VALUE_NAME = Field(0x4, "string")
     VALUE_VALUE = Field(0x8, "i32")
 
-    def __init__(self, typelib_file, offset):
+    def __init__(self, typelib_file, offset: int):
         self._typelib_file = typelib_file
         self._offset = offset
 
-    def __getitem__(self, index):
+    def __getitem__(self, index: int):
         return Typelib(self._typelib_file, self._offset + index)
 
     def attr(self, name):
         return self.header.attr(self._offset, name)
 
     @property
-    def header(self):
+    def header(self) -> "TypelibHeader":
         return TypelibHeader(self._typelib_file)
 
     @property
-    def u8(self):
+    def u8(self) -> int:
         """Gets the 8-bit unsigned int at this location."""
         return self._int(1, False)
 
     @property
-    def u16(self):
+    def u16(self) -> int:
         """Gets the 16-bit unsigned int at this location."""
         return self._int(2, False)
 
     @property
-    def u32(self):
+    def u32(self) -> int:
         """Gets the 32-bit unsigned int at this location."""
         return self._int(4, False)
 
     @property
-    def i8(self):
+    def i8(self) -> int:
         """Gets the 8-bit unsigned int at this location."""
         return self._int(1, True)
 
     @property
-    def i16(self):
+    def i16(self) -> int:
         """Gets the 16-bit unsigned int at this location."""
         return self._int(2, True)
 
     @property
-    def i32(self):
+    def i32(self) -> int:
         """Gets the 32-bit unsigned int at this location."""
         return self._int(4, True)
 
@@ -240,7 +240,7 @@ class Typelib:
             end += 1
         return self._typelib_file[loc:end].decode("utf-8")
 
-    def _int(self, size, signed):
+    def _int(self, size, signed) -> int:
         return int.from_bytes(
             self._typelib_file[self._offset : self._offset + size], sys.byteorder
         )
@@ -250,7 +250,7 @@ class TypelibHeader(Typelib):
     def __init__(self, typelib_file):
         super().__init__(typelib_file, 0)
 
-    def dir_entry(self, index):
+    def dir_entry(self, index) -> T.Optional[Typelib]:
         if index == 0:
             return None
         else:
diff --git a/blueprintcompiler/xml_reader.py b/blueprintcompiler/xml_reader.py
index c0552f5..5e31773 100644
--- a/blueprintcompiler/xml_reader.py
+++ b/blueprintcompiler/xml_reader.py
@@ -46,7 +46,7 @@ PARSE_GIR = set(
 
 
 class Element:
-    def __init__(self, tag, attrs: T.Dict[str, str]):
+    def __init__(self, tag: str, attrs: T.Dict[str, str]):
         self.tag = tag
         self.attrs = attrs
         self.children: T.List["Element"] = []
@@ -56,10 +56,10 @@ class Element:
     def cdata(self):
         return "".join(self.cdata_chunks)
 
-    def get_elements(self, name) -> T.List["Element"]:
+    def get_elements(self, name: str) -> T.List["Element"]:
         return [child for child in self.children if child.tag == name]
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: str):
         return self.attrs.get(key)
 
 

From 693826795203863eba3973fedf5d23d5505438f8 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 9 Jan 2023 21:55:14 -0600
Subject: [PATCH 071/290] Add properties to AST types

I want to have a cleaner API that relies less on the specifics of the
grammar and parser.
---
 blueprintcompiler/language/gtk_menu.py    |  4 ++++
 blueprintcompiler/language/ui.py          | 20 +++++++++++++++++++-
 blueprintcompiler/language/values.py      |  4 ++++
 blueprintcompiler/outputs/xml/__init__.py | 16 +++++++---------
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 73aa039..dedf6e3 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -39,6 +39,10 @@ class Menu(AstNode):
     def tag(self) -> str:
         return self.tokens["tag"]
 
+    @property
+    def items(self) -> T.List[T.Union["Menu", "MenuAttribute"]]:
+        return self.children
+
     @validate("menu")
     def has_id(self):
         if self.tokens["tag"] == "menu" and self.tokens["id"] is None:
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index c277c56..d45fe4c 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -22,7 +22,7 @@ from .. import gir
 from .imports import GtkDirective, Import
 from .gtkbuilder_template import Template
 from .gobject_object import Object
-from .gtk_menu import menu
+from .gtk_menu import menu, Menu
 from .common import *
 
 
@@ -64,6 +64,24 @@ class UI(AstNode):
 
         return gir_ctx
 
+    @property
+    def using(self) -> T.List[Import]:
+        return self.children[Import]
+
+    @property
+    def gtk_decl(self) -> GtkDirective:
+        return self.children[GtkDirective][0]
+
+    @property
+    def contents(self) -> T.List[T.Union[Object, Template, Menu]]:
+        return [
+            child
+            for child in self.children
+            if isinstance(child, Object)
+            or isinstance(child, Template)
+            or isinstance(child, Menu)
+        ]
+
     @property
     def objects_by_id(self):
         return {
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 4a71247..8447267 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -203,6 +203,10 @@ class Flag(AstNode):
 class FlagsValue(Value):
     grammar = [Flag, "|", Delimited(Flag, "|")]
 
+    @property
+    def flags(self) -> T.List[Flag]:
+        return self.children
+
     @validate()
     def parent_is_bitfield(self):
         type = self.parent.value_type
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index ac2aea8..48a18ac 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -14,12 +14,10 @@ class XmlOutput(OutputFormat):
     def _emit_ui(self, ui: UI, xml: XmlEmitter):
         xml.start_tag("interface")
 
-        for x in ui.children:
-            if isinstance(x, GtkDirective):
-                self._emit_gtk_directive(x, xml)
-            elif isinstance(x, Import):
-                pass
-            elif isinstance(x, Template):
+        self._emit_gtk_directive(ui.gtk_decl, xml)
+
+        for x in ui.contents:
+            if isinstance(x, Template):
                 self._emit_template(x, xml)
             elif isinstance(x, Object):
                 self._emit_object(x, xml)
@@ -74,7 +72,7 @@ class XmlOutput(OutputFormat):
 
     def _emit_menu(self, menu: Menu, xml: XmlEmitter):
         xml.start_tag(menu.tag, id=menu.id)
-        for child in menu.children:
+        for child in menu.items:
             if isinstance(child, Menu):
                 self._emit_menu(child, xml)
             elif isinstance(child, MenuAttribute):
@@ -167,7 +165,7 @@ class XmlOutput(OutputFormat):
             xml.put_text(value.value)
         elif isinstance(value, FlagsValue):
             xml.put_text(
-                "|".join([str(flag.value or flag.name) for flag in value.children])
+                "|".join([str(flag.value or flag.name) for flag in value.flags])
             )
         elif isinstance(value, TranslatedStringValue):
             raise CompilerBugError("translated values must be handled in the parent")
@@ -177,7 +175,7 @@ class XmlOutput(OutputFormat):
             raise CompilerBugError()
 
     def _emit_expression(self, expression: ExprChain, xml: XmlEmitter):
-        self._emit_expression_part(expression.children[-1], xml)
+        self._emit_expression_part(expression.last, xml)
 
     def _emit_expression_part(self, expression: Expr, xml: XmlEmitter):
         if isinstance(expression, IdentExpr):

From 1df46b5a06f4310d2c4ad0b3734d34b5d4bde251 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 12 Jan 2023 13:19:15 -0600
Subject: [PATCH 072/290] Change the way values work

Change the parsing for values to make them more reusable, in particular
for when I implement extensions.
---
 .gitlab-ci.yml                                |   2 +-
 blueprintcompiler/ast_utils.py                |  59 +++-
 blueprintcompiler/decompiler.py               |   2 +-
 blueprintcompiler/language/__init__.py        |  28 +-
 blueprintcompiler/language/attributes.py      |   2 +-
 blueprintcompiler/language/binding.py         |  55 ++++
 blueprintcompiler/language/common.py          |   3 +-
 blueprintcompiler/language/contexts.py        |  28 ++
 blueprintcompiler/language/expression.py      |  33 ++-
 .../language/gobject_property.py              | 105 +++-----
 blueprintcompiler/language/gobject_signal.py  |   9 +-
 blueprintcompiler/language/gtk_a11y.py        |  15 +-
 .../language/gtk_combo_box_text.py            |  19 +-
 blueprintcompiler/language/gtk_layout.py      |  22 +-
 blueprintcompiler/language/gtk_menu.py        |  21 +-
 blueprintcompiler/language/gtk_string_list.py |  11 +-
 blueprintcompiler/language/imports.py         |   3 +
 .../language/property_binding.py              | 139 ++++++++++
 blueprintcompiler/language/types.py           |   2 +-
 blueprintcompiler/language/values.py          | 251 +++++++++++-------
 blueprintcompiler/outputs/xml/__init__.py     | 143 +++++-----
 blueprintcompiler/parse_tree.py               |  13 +
 blueprintcompiler/parser.py                   |   2 +-
 tests/sample_errors/obj_prop_type.err         |   2 +-
 .../warn_old_bind.blp}                        |   0
 tests/sample_errors/warn_old_bind.err         |   2 +
 tests/samples/property_binding.blp            |  11 +
 .../{binding.ui => property_binding.ui}       |   0
 tests/samples/property_binding_dec.blp        |  11 +
 tests/test_samples.py                         |   5 +-
 30 files changed, 707 insertions(+), 291 deletions(-)
 create mode 100644 blueprintcompiler/language/binding.py
 create mode 100644 blueprintcompiler/language/contexts.py
 create mode 100644 blueprintcompiler/language/property_binding.py
 rename tests/{samples/binding.blp => sample_errors/warn_old_bind.blp} (100%)
 create mode 100644 tests/sample_errors/warn_old_bind.err
 create mode 100644 tests/samples/property_binding.blp
 rename tests/samples/{binding.ui => property_binding.ui} (100%)
 create mode 100644 tests/samples/property_binding_dec.blp

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b924a7d..0295b09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ build:
     - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
-    - git checkout 58fda9381dac4a9c42c18a4b06149ed59ee702dc
+    - git checkout 59eecfbd73020889410da6cc9f5ce90e5b6f9e24
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'
diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 16298ae..7bd5418 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -24,6 +24,8 @@ import typing as T
 from .errors import *
 from .lsp_utils import SemanticToken
 
+TType = T.TypeVar("TType")
+
 
 class Children:
     """Allows accessing children by type using array syntax."""
@@ -34,6 +36,14 @@ class Children:
     def __iter__(self):
         return iter(self._children)
 
+    @T.overload
+    def __getitem__(self, key: T.Type[TType]) -> T.List[TType]:
+        ...
+
+    @T.overload
+    def __getitem__(self, key: int) -> "AstNode":
+        ...
+
     def __getitem__(self, key):
         if isinstance(key, int):
             return self._children[key]
@@ -41,6 +51,27 @@ class Children:
             return [child for child in self._children if isinstance(child, key)]
 
 
+TCtx = T.TypeVar("TCtx")
+TAttr = T.TypeVar("TAttr")
+
+
+class Ctx:
+    """Allows accessing values from higher in the syntax tree."""
+
+    def __init__(self, node: "AstNode") -> None:
+        self.node = node
+
+    def __getitem__(self, key: T.Type[TCtx]) -> T.Optional[TCtx]:
+        attrs = self.node._attrs_by_type(Context)
+        for name, attr in attrs:
+            if attr.type == key:
+                return getattr(self.node, name)
+        if self.node.parent is not None:
+            return self.node.parent.context[key]
+        else:
+            return None
+
+
 class AstNode:
     """Base class for nodes in the abstract syntax tree."""
 
@@ -62,6 +93,10 @@ class AstNode:
             getattr(cls, f) for f in dir(cls) if hasattr(getattr(cls, f), "_validator")
         ]
 
+    @cached_property
+    def context(self):
+        return Ctx(self)
+
     @property
     def root(self):
         if self.parent is None:
@@ -105,7 +140,9 @@ class AstNode:
         for child in self.children:
             yield from child._get_errors()
 
-    def _attrs_by_type(self, attr_type):
+    def _attrs_by_type(
+        self, attr_type: T.Type[TAttr]
+    ) -> T.Iterator[T.Tuple[str, TAttr]]:
         for name in dir(type(self)):
             item = getattr(type(self), name)
             if isinstance(item, attr_type):
@@ -217,3 +254,23 @@ def docs(*args, **kwargs):
         return Docs(func, *args, **kwargs)
 
     return decorator
+
+
+class Context:
+    def __init__(self, type: T.Type[TCtx], func: T.Callable[[AstNode], TCtx]) -> None:
+        self.type = type
+        self.func = func
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        return self.func(instance)
+
+
+def context(type: T.Type[TCtx]):
+    """Decorator for functions that return a context object, which is passed down to ."""
+
+    def decorator(func: T.Callable[[AstNode], TCtx]) -> Context:
+        return Context(type, func)
+
+    return decorator
diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index c068c93..036c86f 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 {bind_source}.{bind_property}{flags};")
+        ctx.print(f"{name}: bind-property {bind_source}.{bind_property}{flags};")
     elif truthy(translatable):
         if context is not None:
             ctx.print(
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 4063943..822a91a 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,4 +1,6 @@
 from .attributes import BaseAttribute, BaseTypedAttribute
+from .binding import Binding
+from .contexts import ValueTypeCtx
 from .expression import CastExpr, ClosureExpr, Expr, ExprChain, IdentExpr, LookupOp
 from .gobject_object import Object, ObjectContent
 from .gobject_property import Property
@@ -14,16 +16,21 @@ from .gtk_styles import Styles
 from .gtkbuilder_child import Child
 from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
+from .property_binding import PropertyBinding
 from .ui import UI
 from .types import ClassName
 from .values import (
-    TypeValue,
-    IdentValue,
-    TranslatedStringValue,
-    FlagsValue,
     Flag,
-    QuotedValue,
-    NumberValue,
+    Flags,
+    IdentLiteral,
+    Literal,
+    NumberLiteral,
+    ObjectValue,
+    QuotedLiteral,
+    Translated,
+    TranslatedWithContext,
+    TranslatedWithoutContext,
+    TypeLiteral,
     Value,
 )
 
@@ -43,12 +50,3 @@ OBJECT_CONTENT_HOOKS.children = [
     Strings,
     Child,
 ]
-
-VALUE_HOOKS.children = [
-    TypeValue,
-    TranslatedStringValue,
-    FlagsValue,
-    IdentValue,
-    QuotedValue,
-    NumberValue,
-]
diff --git a/blueprintcompiler/language/attributes.py b/blueprintcompiler/language/attributes.py
index 77f01f2..c713917 100644
--- a/blueprintcompiler/language/attributes.py
+++ b/blueprintcompiler/language/attributes.py
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .values import Value, TranslatedStringValue
+from .values import Value, Translated
 from .common import *
 
 
diff --git a/blueprintcompiler/language/binding.py b/blueprintcompiler/language/binding.py
new file mode 100644
index 0000000..91d5a6b
--- /dev/null
+++ b/blueprintcompiler/language/binding.py
@@ -0,0 +1,55 @@
+# binding.py
+#
+# Copyright 2023 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 dataclasses import dataclass
+
+from .common import *
+from .expression import ExprChain, LookupOp, IdentExpr
+from .contexts import ValueTypeCtx
+
+
+class Binding(AstNode):
+    grammar = [
+        Keyword("bind"),
+        ExprChain,
+    ]
+
+    @property
+    def expression(self) -> ExprChain:
+        return self.children[ExprChain][0]
+
+    @property
+    def simple_binding(self) -> T.Optional["SimpleBinding"]:
+        if isinstance(self.expression.last, LookupOp):
+            if isinstance(self.expression.last.lhs, IdentExpr):
+                return SimpleBinding(
+                    self.expression.last.lhs.ident, self.expression.last.property_name
+                )
+        return None
+
+    @validate("bind")
+    def not_bindable(self) -> None:
+        if binding_error := self.context[ValueTypeCtx].binding_error:
+            raise binding_error
+
+
+@dataclass
+class SimpleBinding:
+    source: str
+    property_name: str
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index 8ae8d96..636f15d 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -19,7 +19,7 @@
 
 
 from .. import gir
-from ..ast_utils import AstNode, validate, docs
+from ..ast_utils import AstNode, validate, docs, context
 from ..errors import (
     CompileError,
     MultipleErrors,
@@ -44,4 +44,3 @@ from ..parse_tree import *
 
 
 OBJECT_CONTENT_HOOKS = AnyOf()
-VALUE_HOOKS = AnyOf()
diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
new file mode 100644
index 0000000..f5b92c2
--- /dev/null
+++ b/blueprintcompiler/language/contexts.py
@@ -0,0 +1,28 @@
+# contexts.py
+#
+# Copyright 2023 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 typing as T
+from dataclasses import dataclass
+from .common import *
+
+
+@dataclass
+class ValueTypeCtx:
+    value_type: T.Optional[GirType]
+    binding_error: T.Optional[CompileError] = None
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index f2b2ea1..e75b961 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -20,6 +20,7 @@
 
 from .common import *
 from .types import TypeName
+from .gtkbuilder_template import Template
 
 
 expr = Pratt()
@@ -30,6 +31,10 @@ class Expr(AstNode):
     def type(self) -> T.Optional[GirType]:
         raise NotImplementedError()
 
+    @property
+    def type_complete(self) -> bool:
+        return True
+
     @property
     def rhs(self) -> T.Optional["Expr"]:
         if isinstance(self.parent, ExprChain):
@@ -53,6 +58,10 @@ class ExprChain(Expr):
     def type(self) -> T.Optional[GirType]:
         return self.last.type
 
+    @property
+    def type_complete(self) -> bool:
+        return self.last.type_complete
+
 
 class InfixExpr(Expr):
     @property
@@ -83,6 +92,13 @@ class IdentExpr(Expr):
         else:
             return None
 
+    @property
+    def type_complete(self) -> bool:
+        if object := self.root.objects_by_id.get(self.ident):
+            return not isinstance(object, Template)
+        else:
+            return True
+
 
 class LookupOp(InfixExpr):
     grammar = [".", UseIdent("property")]
@@ -103,17 +119,24 @@ class LookupOp(InfixExpr):
 
     @validate("property")
     def property_exists(self):
-        if self.lhs.type is None or isinstance(self.lhs.type, UncheckedType):
+        if (
+            self.lhs.type is None
+            or not self.lhs.type_complete
+            or isinstance(self.lhs.type, UncheckedType)
+        ):
             return
+
         elif not isinstance(self.lhs.type, gir.Class) and not isinstance(
             self.lhs.type, gir.Interface
         ):
             raise CompileError(
                 f"Type {self.lhs.type.full_name} does not have properties"
             )
+
         elif self.lhs.type.properties.get(self.property_name) is None:
             raise CompileError(
-                f"{self.lhs.type.full_name} does not have a property called {self.property_name}"
+                f"{self.lhs.type.full_name} does not have a property called {self.property_name}",
+                did_you_mean=(self.property_name, self.lhs.type.properties.keys()),
             )
 
 
@@ -124,9 +147,13 @@ 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.lhs.type is None:
+        if self.type is None or self.lhs.type is None:
             return
 
         if not self.type.assignable_to(self.lhs.type):
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 10770a8..13374f8 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -17,51 +17,28 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+from dataclasses import dataclass
 
 from .expression import ExprChain
 from .gobject_object import Object
 from .gtkbuilder_template import Template
-from .values import Value, TranslatedStringValue
+from .values import Value, Translated
 from .common import *
+from .contexts import ValueTypeCtx
+from .property_binding import PropertyBinding
+from .binding import Binding
 
 
 class Property(AstNode):
-    grammar = AnyOf(
-        [
-            UseIdent("name"),
-            ":",
-            Keyword("bind"),
-            UseIdent("bind_source"),
-            ".",
-            UseIdent("bind_property"),
-            ZeroOrMore(
-                AnyOf(
-                    ["no-sync-create", UseLiteral("no_sync_create", True)],
-                    ["inverted", UseLiteral("inverted", True)],
-                    ["bidirectional", UseLiteral("bidirectional", True)],
-                    Match("sync-create").warn(
-                        "sync-create is deprecated in favor of no-sync-create"
-                    ),
-                )
-            ),
-            ";",
-        ],
-        Statement(
-            UseIdent("name"),
-            UseLiteral("binding", True),
-            ":",
-            "bind",
-            ExprChain,
-        ),
-        Statement(
-            UseIdent("name"),
-            ":",
-            AnyOf(
-                Object,
-                VALUE_HOOKS,
-            ).expected("a value"),
-        ),
-    )
+    grammar = [UseIdent("name"), ":", Value, ";"]
+
+    @property
+    def name(self) -> str:
+        return self.tokens["name"]
+
+    @property
+    def value(self) -> Value:
+        return self.children[0]
 
     @property
     def gir_class(self):
@@ -72,10 +49,29 @@ class Property(AstNode):
         if self.gir_class is not None and not isinstance(self.gir_class, UncheckedType):
             return self.gir_class.properties.get(self.tokens["name"])
 
-    @property
-    def value_type(self):
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        if (
+            (
+                isinstance(self.value.child, PropertyBinding)
+                or isinstance(self.value.child, Binding)
+            )
+            and self.gir_property is not None
+            and self.gir_property.construct_only
+        ):
+            binding_error = CompileError(
+                f"{self.gir_property.full_name} can't be bound because it is construct-only",
+                hints=["construct-only properties may only be set to a static value"],
+            )
+        else:
+            binding_error = None
+
         if self.gir_property is not None:
-            return self.gir_property.type
+            type = self.gir_property.type
+        else:
+            type = None
+
+        return ValueTypeCtx(type, binding_error)
 
     @validate("name")
     def property_exists(self):
@@ -95,40 +91,11 @@ class Property(AstNode):
                 did_you_mean=(self.tokens["name"], self.gir_class.properties.keys()),
             )
 
-    @validate("bind")
-    def property_bindable(self):
-        if (
-            self.tokens["bind"]
-            and self.gir_property is not None
-            and self.gir_property.construct_only
-        ):
-            raise CompileError(
-                f"{self.gir_property.full_name} can't be bound because it is construct-only",
-                hints=["construct-only properties may only be set to a static value"],
-            )
-
     @validate("name")
     def property_writable(self):
         if self.gir_property is not None and not self.gir_property.writable:
             raise CompileError(f"{self.gir_property.full_name} is not writable")
 
-    @validate()
-    def obj_property_type(self):
-        if len(self.children[Object]) == 0:
-            return
-
-        object = self.children[Object][0]
-        type = self.value_type
-        if (
-            object
-            and type
-            and object.gir_class
-            and not object.gir_class.assignable_to(type)
-        ):
-            raise CompileError(
-                f"Cannot assign {object.gir_class.full_name} to {type.full_name}"
-            )
-
     @validate("name")
     def unique_in_parent(self):
         self.validate_unique_in_parent(
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 74d7472..0c649b7 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -82,10 +82,11 @@ class Signal(AstNode):
     @validate("handler")
     def old_extern(self):
         if not self.tokens["extern"]:
-            raise UpgradeWarning(
-                "Use the '$' extern syntax introduced in blueprint 0.8.0",
-                actions=[CodeAction("Use '$' syntax", "$" + self.tokens["handler"])],
-            )
+            if self.handler is not None:
+                raise UpgradeWarning(
+                    "Use the '$' extern syntax introduced in blueprint 0.8.0",
+                    actions=[CodeAction("Use '$' syntax", "$" + self.handler)],
+                )
 
     @validate("name")
     def signal_exists(self):
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index f2066ff..a3e1888 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -21,6 +21,7 @@ from .gobject_object import ObjectContent, validate_parent_type
 from .attributes import BaseTypedAttribute
 from .values import Value
 from .common import *
+from .contexts import ValueTypeCtx
 
 
 def get_property_types(gir):
@@ -108,7 +109,7 @@ class A11yProperty(BaseTypedAttribute):
     grammar = Statement(
         UseIdent("name"),
         ":",
-        VALUE_HOOKS.expected("a value"),
+        Value,
     )
 
     @property
@@ -129,8 +130,12 @@ class A11yProperty(BaseTypedAttribute):
         return self.tokens["name"].replace("_", "-")
 
     @property
-    def value_type(self) -> GirType:
-        return get_types(self.root.gir).get(self.tokens["name"])
+    def value(self) -> Value:
+        return self.children[0]
+
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        return ValueTypeCtx(get_types(self.root.gir).get(self.tokens["name"]))
 
     @validate("name")
     def is_valid_property(self):
@@ -161,6 +166,10 @@ class A11y(AstNode):
         Until(A11yProperty, "}"),
     ]
 
+    @property
+    def properties(self) -> T.List[A11yProperty]:
+        return self.children[A11yProperty]
+
     @validate("accessibility")
     def container_is_widget(self):
         validate_parent_type(self, "Gtk", "Widget", "accessibility properties")
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index f0f6f37..e1a8a12 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -21,15 +21,22 @@
 from .attributes import BaseTypedAttribute
 from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
+from .contexts import ValueTypeCtx
+from .values import Value
 
 
-class Item(BaseTypedAttribute):
-    tag_name = "item"
-    attr_name = "id"
+class Item(AstNode):
+    @property
+    def name(self) -> str:
+        return self.tokens["name"]
 
     @property
-    def value_type(self):
-        return StringType()
+    def value(self) -> Value:
+        return self.children[Value][0]
+
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        return ValueTypeCtx(StringType())
 
 
 item = Group(
@@ -41,7 +48,7 @@ item = Group(
                 ":",
             ]
         ),
-        VALUE_HOOKS,
+        Value,
     ],
 )
 
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index 9af82fd..4862148 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -21,15 +21,25 @@
 from .attributes import BaseAttribute
 from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
+from .contexts import ValueTypeCtx
+from .values import Value
 
 
-class LayoutProperty(BaseAttribute):
+class LayoutProperty(AstNode):
     tag_name = "property"
 
     @property
-    def value_type(self):
+    def name(self) -> str:
+        return self.tokens["name"]
+
+    @property
+    def value(self) -> Value:
+        return self.children[Value][0]
+
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
         # there isn't really a way to validate these
-        return None
+        return ValueTypeCtx(None)
 
     @validate("name")
     def unique_in_parent(self):
@@ -41,11 +51,7 @@ class LayoutProperty(BaseAttribute):
 
 layout_prop = Group(
     LayoutProperty,
-    Statement(
-        UseIdent("name"),
-        ":",
-        VALUE_HOOKS.expected("a value"),
-    ),
+    Statement(UseIdent("name"), ":", Err(Value, "Expected a value")),
 )
 
 
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index dedf6e3..df4b031 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -24,6 +24,7 @@ from blueprintcompiler.language.values import Value
 from .attributes import BaseAttribute
 from .gobject_object import Object, ObjectContent
 from .common import *
+from .contexts import ValueTypeCtx
 
 
 class Menu(AstNode):
@@ -49,17 +50,23 @@ class Menu(AstNode):
             raise CompileError("Menu requires an ID")
 
 
-class MenuAttribute(BaseAttribute):
+class MenuAttribute(AstNode):
     tag_name = "attribute"
 
     @property
-    def value_type(self):
-        return None
+    def name(self) -> str:
+        return self.tokens["name"]
 
     @property
     def value(self) -> Value:
         return self.children[Value][0]
 
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        return ValueTypeCtx(
+            None, binding_error=CompileError("Bindings are not permitted in menus")
+        )
+
 
 menu_contents = Sequence()
 
@@ -78,7 +85,7 @@ menu_attribute = Group(
     [
         UseIdent("name"),
         ":",
-        VALUE_HOOKS.expected("a value"),
+        Err(Value, "Expected a value"),
         Match(";").expected(),
     ],
 )
@@ -102,7 +109,7 @@ menu_item_shorthand = Group(
         "(",
         Group(
             MenuAttribute,
-            [UseLiteral("name", "label"), VALUE_HOOKS],
+            [UseLiteral("name", "label"), Value],
         ),
         Optional(
             [
@@ -111,14 +118,14 @@ menu_item_shorthand = Group(
                     [
                         Group(
                             MenuAttribute,
-                            [UseLiteral("name", "action"), VALUE_HOOKS],
+                            [UseLiteral("name", "action"), Value],
                         ),
                         Optional(
                             [
                                 ",",
                                 Group(
                                     MenuAttribute,
-                                    [UseLiteral("name", "icon"), VALUE_HOOKS],
+                                    [UseLiteral("name", "icon"), Value],
                                 ),
                             ]
                         ),
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index 347b9e8..b07fa69 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -20,16 +20,17 @@
 
 from .attributes import BaseTypedAttribute
 from .gobject_object import ObjectContent, validate_parent_type
-from .values import Value, TranslatedStringValue
+from .values import Value, Translated
 from .common import *
+from .contexts import ValueTypeCtx
 
 
 class Item(AstNode):
-    grammar = VALUE_HOOKS
+    grammar = Value
 
-    @property
-    def value_type(self):
-        return StringType()
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        return ValueTypeCtx(StringType())
 
 
 class Strings(AstNode):
diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index be6a003..224e0a3 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -64,6 +64,9 @@ class GtkDirective(AstNode):
         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")
 
 
 class Import(AstNode):
diff --git a/blueprintcompiler/language/property_binding.py b/blueprintcompiler/language/property_binding.py
new file mode 100644
index 0000000..37a5c91
--- /dev/null
+++ b/blueprintcompiler/language/property_binding.py
@@ -0,0 +1,139 @@
+# property_binding.py
+#
+# Copyright 2023 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 *
+from .contexts import ValueTypeCtx
+from .gobject_object import Object
+from .gtkbuilder_template import Template
+
+
+class PropertyBindingFlag(AstNode):
+    grammar = [
+        AnyOf(
+            UseExact("flag", "inverted"),
+            UseExact("flag", "bidirectional"),
+            UseExact("flag", "no-sync-create"),
+            UseExact("flag", "sync-create"),
+        )
+    ]
+
+    @property
+    def flag(self) -> str:
+        return self.tokens["flag"]
+
+    @validate()
+    def sync_create(self):
+        if self.flag == "sync-create":
+            raise UpgradeWarning(
+                "'sync-create' is now the default. Use 'no-sync-create' if this is not wanted.",
+                actions=[CodeAction("remove 'sync-create'", "")],
+            )
+
+
+class PropertyBinding(AstNode):
+    grammar = AnyOf(
+        [
+            Keyword("bind-property"),
+            UseIdent("source"),
+            ".",
+            UseIdent("property"),
+            ZeroOrMore(PropertyBindingFlag),
+        ],
+        [
+            Keyword("bind"),
+            UseIdent("source"),
+            ".",
+            UseIdent("property"),
+            PropertyBindingFlag,
+            ZeroOrMore(PropertyBindingFlag),
+        ],
+    )
+
+    @property
+    def source(self) -> str:
+        return self.tokens["source"]
+
+    @property
+    def source_obj(self) -> T.Optional[Object]:
+        return self.root.objects_by_id.get(self.source)
+
+    @property
+    def property_name(self) -> str:
+        return self.tokens["property"]
+
+    @property
+    def flags(self) -> T.List[PropertyBindingFlag]:
+        return self.children[PropertyBindingFlag]
+
+    @property
+    def inverted(self) -> bool:
+        return any([f.flag == "inverted" for f in self.flags])
+
+    @property
+    def bidirectional(self) -> bool:
+        return any([f.flag == "bidirectional" for f in self.flags])
+
+    @property
+    def no_sync_create(self) -> bool:
+        return any([f.flag == "no-sync-create" for f in self.flags])
+
+    @validate("source")
+    def source_object_exists(self) -> None:
+        if self.source_obj is None:
+            raise CompileError(
+                f"Could not find object with ID {self.source}",
+                did_you_mean=(self.source, self.root.objects_by_id.keys()),
+            )
+
+    @validate("property")
+    def property_exists(self) -> None:
+        if self.source_obj is None:
+            return
+
+        gir_class = self.source_obj.gir_class
+
+        if (
+            isinstance(self.source_obj, Template)
+            or gir_class is None
+            or isinstance(gir_class, UncheckedType)
+        ):
+            # Objects that we have no gir data on should not be validated
+            # This happens for classes defined by the app itself
+            return
+
+        if (
+            isinstance(gir_class, gir.Class)
+            and gir_class.properties.get(self.property_name) is None
+        ):
+            raise CompileError(
+                f"{gir_class.full_name} does not have a property called {self.property_name}"
+            )
+
+    @validate("bind-property")
+    def not_bindable(self) -> None:
+        if binding_error := self.context[ValueTypeCtx].binding_error:
+            raise binding_error
+
+    @validate("bind")
+    def old_bind(self):
+        if self.tokens["bind"]:
+            raise UpgradeWarning(
+                "Use 'bind-property', introduced in blueprint 0.8.0, to use binding flags",
+                actions=[CodeAction("Use 'bind-property'", "bind-property")],
+            )
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index e1e715d..702ed32 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -94,7 +94,7 @@ class ClassName(TypeName):
     @validate("namespace", "class_name")
     def gir_class_exists(self):
         if (
-            self.gir_type
+            self.gir_type is not None
             and not isinstance(self.gir_type, UncheckedType)
             and not isinstance(self.gir_type, Class)
         ):
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 8447267..4300c39 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -21,41 +21,57 @@ import typing as T
 
 from .common import *
 from .types import TypeName
+from .property_binding import PropertyBinding
+from .binding import Binding
+from .gobject_object import Object
+from .contexts import ValueTypeCtx
 
 
-class Value(AstNode):
-    pass
-
-
-class TranslatedStringValue(Value):
-    grammar = AnyOf(
-        [
-            "_",
-            "(",
-            UseQuoted("value").expected("a quoted string"),
-            Match(")").expected(),
-        ],
-        [
-            "C_",
-            "(",
-            UseQuoted("context").expected("a quoted string"),
-            ",",
-            UseQuoted("value").expected("a quoted string"),
-            Optional(","),
-            Match(")").expected(),
-        ],
-    )
+class TranslatedWithoutContext(AstNode):
+    grammar = ["_", "(", UseQuoted("string"), Optional(","), ")"]
 
     @property
     def string(self) -> str:
-        return self.tokens["value"]
+        return self.tokens["string"]
+
+
+class TranslatedWithContext(AstNode):
+    grammar = [
+        "C_",
+        "(",
+        UseQuoted("context"),
+        ",",
+        UseQuoted("string"),
+        Optional(","),
+        ")",
+    ]
 
     @property
-    def context(self) -> T.Optional[str]:
+    def string(self) -> str:
+        return self.tokens["string"]
+
+    @property
+    def context(self) -> str:
         return self.tokens["context"]
 
 
-class TypeValue(Value):
+class Translated(AstNode):
+    grammar = AnyOf(TranslatedWithoutContext, TranslatedWithContext)
+
+    @property
+    def child(self) -> T.Union[TranslatedWithContext, TranslatedWithoutContext]:
+        return self.children[0]
+
+    @validate()
+    def validate_for_type(self) -> None:
+        expected_type = self.context[ValueTypeCtx].value_type
+        if expected_type is not None and not expected_type.assignable_to(StringType()):
+            raise CompileError(
+                f"Cannot convert translated string to {expected_type.full_name}"
+            )
+
+
+class TypeLiteral(AstNode):
     grammar = [
         "typeof",
         "(",
@@ -64,17 +80,17 @@ class TypeValue(Value):
     ]
 
     @property
-    def type_name(self):
+    def type_name(self) -> TypeName:
         return self.children[TypeName][0]
 
     @validate()
-    def validate_for_type(self):
-        type = self.parent.value_type
-        if type is not None and not isinstance(type, gir.TypeType):
-            raise CompileError(f"Cannot convert GType to {type.full_name}")
+    def validate_for_type(self) -> None:
+        expected_type = self.context[ValueTypeCtx].value_type
+        if expected_type is not None and not isinstance(expected_type, gir.TypeType):
+            raise CompileError(f"Cannot convert GType to {expected_type.full_name}")
 
 
-class QuotedValue(Value):
+class QuotedLiteral(AstNode):
     grammar = UseQuoted("value")
 
     @property
@@ -82,22 +98,22 @@ class QuotedValue(Value):
         return self.tokens["value"]
 
     @validate()
-    def validate_for_type(self):
-        type = self.parent.value_type
+    def validate_for_type(self) -> None:
+        expected_type = self.context[ValueTypeCtx].value_type
         if (
-            isinstance(type, gir.IntType)
-            or isinstance(type, gir.UIntType)
-            or isinstance(type, gir.FloatType)
+            isinstance(expected_type, gir.IntType)
+            or isinstance(expected_type, gir.UIntType)
+            or isinstance(expected_type, gir.FloatType)
         ):
             raise CompileError(f"Cannot convert string to number")
 
-        elif isinstance(type, gir.StringType):
+        elif isinstance(expected_type, gir.StringType):
             pass
 
         elif (
-            isinstance(type, gir.Class)
-            or isinstance(type, gir.Interface)
-            or isinstance(type, gir.Boxed)
+            isinstance(expected_type, gir.Class)
+            or isinstance(expected_type, gir.Interface)
+            or isinstance(expected_type, gir.Boxed)
         ):
             parseable_types = [
                 "Gdk.Paintable",
@@ -111,31 +127,32 @@ class QuotedValue(Value):
                 "Gsk.Transform",
                 "GLib.Variant",
             ]
-            if type.full_name not in parseable_types:
+            if expected_type.full_name not in parseable_types:
                 hints = []
-                if isinstance(type, gir.TypeType):
-                    hints.append(
-                        f"use the typeof operator: 'typeof({self.tokens('value')})'"
-                    )
+                if isinstance(expected_type, gir.TypeType):
+                    hints.append(f"use the typeof operator: 'typeof({self.value})'")
                 raise CompileError(
-                    f"Cannot convert string to {type.full_name}", hints=hints
+                    f"Cannot convert string to {expected_type.full_name}", hints=hints
                 )
 
-        elif type is not None:
-            raise CompileError(f"Cannot convert string to {type.full_name}")
+        elif expected_type is not None:
+            raise CompileError(f"Cannot convert string to {expected_type.full_name}")
 
 
-class NumberValue(Value):
-    grammar = UseNumber("value")
+class NumberLiteral(AstNode):
+    grammar = [
+        Optional(AnyOf(UseExact("sign", "-"), UseExact("sign", "+"))),
+        UseNumber("value"),
+    ]
 
     @property
     def value(self) -> T.Union[int, float]:
         return self.tokens["value"]
 
     @validate()
-    def validate_for_type(self):
-        type = self.parent.value_type
-        if isinstance(type, gir.IntType):
+    def validate_for_type(self) -> None:
+        expected_type = self.context[ValueTypeCtx].value_type
+        if isinstance(expected_type, gir.IntType):
             try:
                 int(self.tokens["value"])
             except:
@@ -143,7 +160,7 @@ class NumberValue(Value):
                     f"Cannot convert {self.group.tokens['value']} to integer"
                 )
 
-        elif isinstance(type, gir.UIntType):
+        elif isinstance(expected_type, gir.UIntType):
             try:
                 int(self.tokens["value"])
                 if int(self.tokens["value"]) < 0:
@@ -153,7 +170,7 @@ class NumberValue(Value):
                     f"Cannot convert {self.group.tokens['value']} to unsigned integer"
                 )
 
-        elif isinstance(type, gir.FloatType):
+        elif isinstance(expected_type, gir.FloatType):
             try:
                 float(self.tokens["value"])
             except:
@@ -161,8 +178,8 @@ class NumberValue(Value):
                     f"Cannot convert {self.group.tokens['value']} to float"
                 )
 
-        elif type is not None:
-            raise CompileError(f"Cannot convert number to {type.full_name}")
+        elif expected_type is not None:
+            raise CompileError(f"Cannot convert number to {expected_type.full_name}")
 
 
 class Flag(AstNode):
@@ -174,17 +191,17 @@ class Flag(AstNode):
 
     @property
     def value(self) -> T.Optional[int]:
-        type = self.parent.parent.value_type
+        type = self.context[ValueTypeCtx].value_type
         if not isinstance(type, Enumeration):
             return None
-        elif member := type.members.get(self.tokens["value"]):
+        elif member := type.members.get(self.name):
             return member.value
         else:
             return None
 
     @docs()
     def docs(self):
-        type = self.parent.parent.value_type
+        type = self.context[ValueTypeCtx].value_type
         if not isinstance(type, Enumeration):
             return
         if member := type.members.get(self.tokens["value"]):
@@ -192,15 +209,18 @@ class Flag(AstNode):
 
     @validate()
     def validate_for_type(self):
-        type = self.parent.parent.value_type
-        if isinstance(type, gir.Bitfield) and self.tokens["value"] not in type.members:
+        expected_type = self.context[ValueTypeCtx].value_type
+        if (
+            isinstance(expected_type, gir.Bitfield)
+            and self.tokens["value"] not in expected_type.members
+        ):
             raise CompileError(
-                f"{self.tokens['value']} is not a member of {type.full_name}",
-                did_you_mean=(self.tokens["value"], type.members.keys()),
+                f"{self.tokens['value']} is not a member of {expected_type.full_name}",
+                did_you_mean=(self.tokens["value"], expected_type.members.keys()),
             )
 
 
-class FlagsValue(Value):
+class Flags(AstNode):
     grammar = [Flag, "|", Delimited(Flag, "|")]
 
     @property
@@ -208,57 +228,104 @@ class FlagsValue(Value):
         return self.children
 
     @validate()
-    def parent_is_bitfield(self):
-        type = self.parent.value_type
-        if type is not None and not isinstance(type, gir.Bitfield):
-            raise CompileError(f"{type.full_name} is not a bitfield type")
+    def validate_for_type(self) -> None:
+        expected_type = self.context[ValueTypeCtx].value_type
+        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")
 
 
-class IdentValue(Value):
+class IdentLiteral(AstNode):
     grammar = UseIdent("value")
 
+    @property
+    def ident(self) -> str:
+        return self.tokens["value"]
+
     @validate()
-    def validate_for_type(self):
-        type = self.parent.value_type
+    def validate_for_type(self) -> None:
+        expected_type = self.context[ValueTypeCtx].value_type
+        if isinstance(expected_type, gir.BoolType):
+            if self.ident not in ["true", "false"]:
+                raise CompileError(f"Expected 'true' or 'false' for boolean value")
 
-        if isinstance(type, gir.Enumeration):
-            if self.tokens["value"] not in type.members:
+        elif isinstance(expected_type, gir.Enumeration):
+            if self.ident not in expected_type.members:
                 raise CompileError(
-                    f"{self.tokens['value']} is not a member of {type.full_name}",
-                    did_you_mean=(self.tokens["value"], type.members.keys()),
+                    f"{self.ident} is not a member of {expected_type.full_name}",
+                    did_you_mean=(self.ident, list(expected_type.members.keys())),
                 )
 
-        elif isinstance(type, gir.BoolType):
-            if self.tokens["value"] not in ["true", "false"]:
-                raise CompileError(
-                    f"Expected 'true' or 'false' for boolean value",
-                    did_you_mean=(self.tokens["value"], ["true", "false"]),
-                )
-
-        elif type is not None:
-            object = self.root.objects_by_id.get(self.tokens["value"])
+        elif expected_type is not None:
+            object = self.root.objects_by_id.get(self.ident)
             if object is None:
                 raise CompileError(
-                    f"Could not find object with ID {self.tokens['value']}",
-                    did_you_mean=(self.tokens["value"], self.root.objects_by_id.keys()),
+                    f"Could not find object with ID {self.ident}",
+                    did_you_mean=(self.ident, self.root.objects_by_id.keys()),
                 )
-            elif object.gir_class and not object.gir_class.assignable_to(type):
+            elif object.gir_class and not object.gir_class.assignable_to(expected_type):
                 raise CompileError(
-                    f"Cannot assign {object.gir_class.full_name} to {type.full_name}"
+                    f"Cannot assign {object.gir_class.full_name} to {expected_type.full_name}"
                 )
 
     @docs()
-    def docs(self):
-        type = self.parent.value_type
+    def docs(self) -> T.Optional[str]:
+        type = self.context[ValueTypeCtx].value_type
         if isinstance(type, gir.Enumeration):
-            if member := type.members.get(self.tokens["value"]):
+            if member := type.members.get(self.ident):
                 return member.doc
             else:
                 return type.doc
         elif isinstance(type, gir.GirNode):
             return type.doc
+        else:
+            return None
 
     def get_semantic_tokens(self) -> T.Iterator[SemanticToken]:
         if isinstance(self.parent.value_type, gir.Enumeration):
             token = self.group.tokens["value"]
             yield SemanticToken(token.start, token.end, SemanticTokenType.EnumMember)
+
+
+class Literal(AstNode):
+    grammar = AnyOf(
+        TypeLiteral,
+        QuotedLiteral,
+        NumberLiteral,
+        IdentLiteral,
+    )
+
+    @property
+    def value(
+        self,
+    ) -> T.Union[TypeLiteral, QuotedLiteral, NumberLiteral, IdentLiteral]:
+        return self.children[0]
+
+
+class ObjectValue(AstNode):
+    grammar = Object
+
+    @property
+    def object(self) -> Object:
+        return self.children[Object][0]
+
+    @validate()
+    def validate_for_type(self) -> None:
+        expected_type = self.context[ValueTypeCtx].value_type
+        if (
+            expected_type is not None
+            and self.object.gir_class is not None
+            and not self.object.gir_class.assignable_to(expected_type)
+        ):
+            raise CompileError(
+                f"Cannot assign {self.object.gir_class.full_name} to {expected_type.full_name}"
+            )
+
+
+class Value(AstNode):
+    grammar = AnyOf(PropertyBinding, Binding, Translated, ObjectValue, Flags, Literal)
+
+    @property
+    def child(
+        self,
+    ) -> T.Union[PropertyBinding, Binding, Translated, ObjectValue, Flags, Literal,]:
+        return self.children[0]
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 48a18ac..c38c070 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -82,51 +82,57 @@ class XmlOutput(OutputFormat):
         xml.end_tag()
 
     def _emit_property(self, property: Property, xml: XmlEmitter):
-        values = property.children[Value]
-        value = values[0] if len(values) == 1 else None
+        value = property.value
+        child = value.child
 
-        bind_flags = []
-        if property.tokens["bind_source"] and not property.tokens["no_sync_create"]:
-            bind_flags.append("sync-create")
-        if property.tokens["inverted"]:
-            bind_flags.append("invert-boolean")
-        if property.tokens["bidirectional"]:
-            bind_flags.append("bidirectional")
-        bind_flags_str = "|".join(bind_flags) or None
-
-        props = {
-            "name": property.tokens["name"],
-            "bind-source": property.tokens["bind_source"],
-            "bind-property": property.tokens["bind_property"],
-            "bind-flags": bind_flags_str,
+        props: T.Dict[str, T.Optional[str]] = {
+            "name": property.name,
         }
 
-        if isinstance(value, TranslatedStringValue):
-            xml.start_tag("property", **props, **self._translated_string_attrs(value))
-            xml.put_text(value.string)
+        if isinstance(child, Translated):
+            xml.start_tag("property", **props, **self._translated_string_attrs(child))
+            xml.put_text(child.child.string)
             xml.end_tag()
-        elif len(property.children[Object]) == 1:
+        elif isinstance(child, Object):
             xml.start_tag("property", **props)
-            self._emit_object(property.children[Object][0], xml)
+            self._emit_object(child, xml)
             xml.end_tag()
-        elif value is None:
-            if property.tokens["binding"]:
-                xml.start_tag("binding", **props)
-                self._emit_expression(property.children[ExprChain][0], xml)
-                xml.end_tag()
-            else:
+        elif isinstance(child, Binding):
+            if simple := child.simple_binding:
+                props["bind-source"] = simple.source
+                props["bind-property"] = simple.property_name
+                props["bind-flags"] = "sync-create"
                 xml.put_self_closing("property", **props)
+            else:
+                xml.start_tag("binding", **props)
+                self._emit_expression(child.expression, xml)
+                xml.end_tag()
+        elif isinstance(child, PropertyBinding):
+            bind_flags = []
+            if not child.no_sync_create:
+                bind_flags.append("sync-create")
+            if child.inverted:
+                bind_flags.append("invert-boolean")
+            if child.bidirectional:
+                bind_flags.append("bidirectional")
+
+            props["bind-source"] = child.source
+            props["bind-property"] = child.property_name
+            props["bind-flags"] = "|".join(bind_flags) or None
+            xml.put_self_closing("property", **props)
         else:
             xml.start_tag("property", **props)
             self._emit_value(value, xml)
             xml.end_tag()
 
     def _translated_string_attrs(
-        self, translated: TranslatedStringValue
+        self, translated: Translated
     ) -> T.Dict[str, T.Optional[str]]:
         return {
             "translatable": "true",
-            "context": translated.context,
+            "context": translated.child.context
+            if isinstance(translated.child, TranslatedWithContext)
+            else None,
         }
 
     def _emit_signal(self, signal: Signal, xml: XmlEmitter):
@@ -154,23 +160,30 @@ class XmlOutput(OutputFormat):
         xml.end_tag()
 
     def _emit_value(self, value: Value, xml: XmlEmitter):
-        if isinstance(value, IdentValue):
-            if isinstance(value.parent.value_type, gir.Enumeration):
-                xml.put_text(
-                    str(value.parent.value_type.members[value.tokens["value"]].value)
-                )
+        if isinstance(value.child, Literal):
+            literal = value.child.value
+            if isinstance(literal, IdentLiteral):
+                value_type = value.context[ValueTypeCtx].value_type
+                if isinstance(value_type, gir.BoolType):
+                    xml.put_text(literal.ident)
+                elif isinstance(value_type, gir.Enumeration):
+                    xml.put_text(str(value_type.members[literal.ident].value))
+                else:
+                    xml.put_text(literal.ident)
+            elif isinstance(literal, TypeLiteral):
+                xml.put_text(literal.type_name.glib_type_name)
             else:
-                xml.put_text(value.tokens["value"])
-        elif isinstance(value, QuotedValue) or isinstance(value, NumberValue):
-            xml.put_text(value.value)
-        elif isinstance(value, FlagsValue):
+                xml.put_text(literal.value)
+        elif isinstance(value.child, Flags):
             xml.put_text(
-                "|".join([str(flag.value or flag.name) for flag in value.flags])
+                "|".join([str(flag.value or flag.name) for flag in value.child.flags])
             )
-        elif isinstance(value, TranslatedStringValue):
+        elif isinstance(value.child, Translated):
             raise CompilerBugError("translated values must be handled in the parent")
-        elif isinstance(value, TypeValue):
-            xml.put_text(value.type_name.glib_type_name)
+        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()
 
@@ -215,9 +228,9 @@ class XmlOutput(OutputFormat):
     ):
         attrs = {attr: name}
 
-        if isinstance(value, TranslatedStringValue):
-            xml.start_tag(tag, **attrs, **self._translated_string_attrs(value))
-            xml.put_text(value.string)
+        if isinstance(value.child, Translated):
+            xml.start_tag(tag, **attrs, **self._translated_string_attrs(value.child))
+            xml.put_text(value.child.child.string)
             xml.end_tag()
         else:
             xml.start_tag(tag, **attrs)
@@ -227,43 +240,37 @@ class XmlOutput(OutputFormat):
     def _emit_extensions(self, extension, xml: XmlEmitter):
         if isinstance(extension, A11y):
             xml.start_tag("accessibility")
-            for child in extension.children:
-                self._emit_attribute(
-                    child.tag_name, "name", child.name, child.children[Value][0], xml
-                )
+            for prop in extension.properties:
+                self._emit_attribute(prop.tag_name, "name", prop.name, prop.value, xml)
             xml.end_tag()
 
         elif isinstance(extension, Filters):
             xml.start_tag(extension.tokens["tag_name"])
-            for child in extension.children:
-                xml.start_tag(child.tokens["tag_name"])
-                xml.put_text(child.tokens["name"])
+            for prop in extension.children:
+                xml.start_tag(prop.tokens["tag_name"])
+                xml.put_text(prop.tokens["name"])
                 xml.end_tag()
             xml.end_tag()
 
         elif isinstance(extension, Items):
             xml.start_tag("items")
-            for child in extension.children:
-                self._emit_attribute(
-                    "item", "id", child.name, child.children[Value][0], xml
-                )
+            for prop in extension.children:
+                self._emit_attribute("item", "id", prop.name, prop.value, xml)
             xml.end_tag()
 
         elif isinstance(extension, Layout):
             xml.start_tag("layout")
-            for child in extension.children:
-                self._emit_attribute(
-                    "property", "name", child.name, child.children[Value][0], xml
-                )
+            for prop in extension.children:
+                self._emit_attribute("property", "name", prop.name, prop.value, xml)
             xml.end_tag()
 
         elif isinstance(extension, Strings):
             xml.start_tag("items")
-            for child in extension.children:
-                value = child.children[Value][0]
-                if isinstance(value, TranslatedStringValue):
+            for prop in extension.children:
+                value = prop.children[Value][0]
+                if isinstance(value.child, Translated):
                     xml.start_tag("item", **self._translated_string_attrs(value))
-                    xml.put_text(value.string)
+                    xml.put_text(value.child.child.string)
                     xml.end_tag()
                 else:
                     xml.start_tag("item")
@@ -273,14 +280,14 @@ class XmlOutput(OutputFormat):
 
         elif isinstance(extension, Styles):
             xml.start_tag("style")
-            for child in extension.children:
-                xml.put_self_closing("class", name=child.tokens["name"])
+            for prop in extension.children:
+                xml.put_self_closing("class", name=prop.tokens["name"])
             xml.end_tag()
 
         elif isinstance(extension, Widgets):
             xml.start_tag("widgets")
-            for child in extension.children:
-                xml.put_self_closing("widget", name=child.tokens["name"])
+            for prop in extension.children:
+                xml.put_self_closing("widget", name=prop.tokens["name"])
             xml.end_tag()
 
         else:
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index 670c72e..c85015a 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -567,6 +567,19 @@ class UseLiteral(ParseNode):
         return True
 
 
+class UseExact(ParseNode):
+    """Matches the given identifier and sets it as a named token."""
+
+    def __init__(self, key: str, string: str):
+        self.key = key
+        self.string = string
+
+    def _parse(self, ctx: ParseContext):
+        token = ctx.next_token()
+        ctx.set_group_val(self.key, self.string, token)
+        return str(token) == self.string
+
+
 class Keyword(ParseNode):
     """Matches the given identifier and sets it as a named token, with the name
     being the identifier itself."""
diff --git a/blueprintcompiler/parser.py b/blueprintcompiler/parser.py
index a44f709..edef840 100644
--- a/blueprintcompiler/parser.py
+++ b/blueprintcompiler/parser.py
@@ -21,7 +21,7 @@
 from .errors import MultipleErrors, PrintableError
 from .parse_tree import *
 from .tokenizer import TokenType
-from .language import OBJECT_CONTENT_HOOKS, VALUE_HOOKS, Template, UI
+from .language import OBJECT_CONTENT_HOOKS, Template, UI
 
 
 def parse(
diff --git a/tests/sample_errors/obj_prop_type.err b/tests/sample_errors/obj_prop_type.err
index 01f1202..6687c7f 100644
--- a/tests/sample_errors/obj_prop_type.err
+++ b/tests/sample_errors/obj_prop_type.err
@@ -1 +1 @@
-4,3,21,Cannot assign Gtk.Label to Gtk.Adjustment
+4,15,8,Cannot assign Gtk.Label to Gtk.Adjustment
diff --git a/tests/samples/binding.blp b/tests/sample_errors/warn_old_bind.blp
similarity index 100%
rename from tests/samples/binding.blp
rename to tests/sample_errors/warn_old_bind.blp
diff --git a/tests/sample_errors/warn_old_bind.err b/tests/sample_errors/warn_old_bind.err
new file mode 100644
index 0000000..f1acc86
--- /dev/null
+++ b/tests/sample_errors/warn_old_bind.err
@@ -0,0 +1,2 @@
+4,12,4,Use 'bind-property', introduced in blueprint 0.8.0, to use binding flags
+6,12,4,Use 'bind-property', introduced in blueprint 0.8.0, to use binding flags
\ No newline at end of file
diff --git a/tests/samples/property_binding.blp b/tests/samples/property_binding.blp
new file mode 100644
index 0000000..1d7d6ea
--- /dev/null
+++ b/tests/samples/property_binding.blp
@@ -0,0 +1,11 @@
+using Gtk 4.0;
+
+Box {
+  visible: bind-property box2.visible inverted;
+  orientation: bind box2.orientation;
+  spacing: bind-property box2.spacing no-sync-create;
+}
+
+Box box2 {
+  spacing: 6;
+}
diff --git a/tests/samples/binding.ui b/tests/samples/property_binding.ui
similarity index 100%
rename from tests/samples/binding.ui
rename to tests/samples/property_binding.ui
diff --git a/tests/samples/property_binding_dec.blp b/tests/samples/property_binding_dec.blp
new file mode 100644
index 0000000..7e74ab8
--- /dev/null
+++ b/tests/samples/property_binding_dec.blp
@@ -0,0 +1,11 @@
+using Gtk 4.0;
+
+Box {
+  visible: bind-property box2.visible inverted;
+  orientation: bind-property box2.orientation;
+  spacing: bind-property box2.spacing no-sync-create;
+}
+
+Box box2 {
+  spacing: 6;
+}
diff --git a/tests/test_samples.py b/tests/test_samples.py
index e9e7697..c5caca5 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -145,7 +145,6 @@ class TestSamples(unittest.TestCase):
     def test_samples(self):
         self.assert_sample("accessibility")
         self.assert_sample("action_widgets")
-        self.assert_sample("binding")
         self.assert_sample("child_type")
         self.assert_sample("combo_box_text")
         self.assert_sample("comments")
@@ -163,6 +162,7 @@ class TestSamples(unittest.TestCase):
             "parseable", skip_run=True
         )  # The image resource doesn't exist
         self.assert_sample("property")
+        self.assert_sample("property_binding")
         self.assert_sample("signal", skip_run=True)  # The callback doesn't exist
         self.assert_sample("size_group")
         self.assert_sample("string_list")
@@ -235,12 +235,12 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("two_templates")
         self.assert_sample_error("uint")
         self.assert_sample_error("using_invalid_namespace")
+        self.assert_sample_error("warn_old_bind")
         self.assert_sample_error("warn_old_extern")
         self.assert_sample_error("widgets_in_non_size_group")
 
     def test_decompiler(self):
         self.assert_decompile("accessibility_dec")
-        self.assert_decompile("binding")
         self.assert_decompile("child_type")
         self.assert_decompile("file_filter")
         self.assert_decompile("flags")
@@ -248,6 +248,7 @@ class TestSamples(unittest.TestCase):
         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("signal")
         self.assert_decompile("strings")

From 9fcb63a0135c9bd8b2cf712c136b9ce3648be984 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 16 Feb 2023 20:39:43 -0600
Subject: [PATCH 073/290] typelib: Fix crash when handling array types

---
 blueprintcompiler/gir.py     | 28 +++++++++++++++++++++++++---
 blueprintcompiler/typelib.py |  4 +++-
 tests/sample_errors/strv.blp |  6 ++++++
 tests/sample_errors/strv.err |  1 +
 tests/test_samples.py        |  1 +
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 tests/sample_errors/strv.blp
 create mode 100644 tests/sample_errors/strv.err

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 70d8e89..a9f5693 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -126,6 +126,22 @@ class UncheckedType(GirType):
         return self._name
 
 
+class ArrayType(GirType):
+    def __init__(self, inner: GirType) -> None:
+        self._inner = inner
+
+    def assignable_to(self, other: GirType) -> bool:
+        return isinstance(other, ArrayType) and self._inner.assignable_to(other._inner)
+
+    @property
+    def name(self) -> str:
+        return self._inner.name + "[]"
+
+    @property
+    def full_name(self) -> str:
+        return self._inner.full_name + "[]"
+
+
 class BasicType(GirType):
     name: str = "unknown type"
 
@@ -714,9 +730,15 @@ class Repository(GirNode):
             else:
                 raise CompilerBugError("Unknown type ID", type_id)
         else:
-            return self._resolve_dir_entry(
-                self.tl.header[type_id].INTERFACE_TYPE_INTERFACE
-            )
+            blob = self.tl.header[type_id]
+            if blob.TYPE_BLOB_TAG == typelib.TYPE_INTERFACE:
+                return self._resolve_dir_entry(
+                    self.tl.header[type_id].TYPE_BLOB_INTERFACE
+                )
+            elif blob.TYPE_BLOB_TAG == typelib.TYPE_ARRAY:
+                return ArrayType(self._resolve_type_id(blob.TYPE_BLOB_ARRAY_INNER))
+            else:
+                raise CompilerBugError(f"{blob.TYPE_BLOB_TAG}")
 
 
 class GirContext:
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index 48ec416..6babc10 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -136,7 +136,9 @@ class Typelib:
     ATTR_NAME = Field(0x0, "string")
     ATTR_VALUE = Field(0x0, "string")
 
-    INTERFACE_TYPE_INTERFACE = Field(0x2, "dir_entry")
+    TYPE_BLOB_TAG = Field(0x0, "u8", 3, 5)
+    TYPE_BLOB_INTERFACE = Field(0x2, "dir_entry")
+    TYPE_BLOB_ARRAY_INNER = Field(0x4, "u32")
 
     BLOB_NAME = Field(0x4, "string")
 
diff --git a/tests/sample_errors/strv.blp b/tests/sample_errors/strv.blp
new file mode 100644
index 0000000..2f4983a
--- /dev/null
+++ b/tests/sample_errors/strv.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.AboutWindow {
+  developers: Gtk.StringList {};
+}
\ No newline at end of file
diff --git a/tests/sample_errors/strv.err b/tests/sample_errors/strv.err
new file mode 100644
index 0000000..f0d6961
--- /dev/null
+++ b/tests/sample_errors/strv.err
@@ -0,0 +1 @@
+5,15,17,Cannot assign Gtk.StringList to string[]
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index c5caca5..7bc7d28 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -231,6 +231,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("signal_object_dne")
         self.assert_sample_error("size_group_non_widget")
         self.assert_sample_error("size_group_obj_dne")
+        self.assert_sample_error("strv")
         self.assert_sample_error("styles_in_non_widget")
         self.assert_sample_error("two_templates")
         self.assert_sample_error("uint")

From 8874cf60b394890a5d56587df903e7d25271b9b4 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 11 Mar 2023 21:05:27 -0600
Subject: [PATCH 074/290] parse_tree: Remove Pratt parser

It isn't actually needed; the way we parse expressions as a prefix
followed by zero or more suffixes is enough.
---
 .vscode/settings.json                    |  3 ++
 blueprintcompiler/language/expression.py |  9 ++--
 blueprintcompiler/parse_tree.py          | 62 ------------------------
 3 files changed, 6 insertions(+), 68 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..de288e1
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.formatting.provider": "black"
+}
\ No newline at end of file
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index e75b961..82787ef 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -23,7 +23,7 @@ from .types import TypeName
 from .gtkbuilder_template import Template
 
 
-expr = Pratt()
+expr = Sequence()
 
 
 class Expr(AstNode):
@@ -200,9 +200,6 @@ class ClosureExpr(Expr):
 
 
 expr.children = [
-    Prefix(ClosureExpr),
-    Prefix(IdentExpr),
-    Prefix(["(", ExprChain, ")"]),
-    Infix(10, LookupOp),
-    Infix(10, CastExpr),
+    AnyOf(ClosureExpr, IdentExpr, ["(", ExprChain, ")"]),
+    ZeroOrMore(AnyOf(LookupOp, CastExpr)),
 ]
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index c85015a..7a44c80 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -594,68 +594,6 @@ class Keyword(ParseNode):
         return str(token) == self.kw
 
 
-class Prefix(ParseNode):
-    def __init__(self, child):
-        self.child = to_parse_node(child)
-
-    def _parse(self, ctx: ParseContext):
-        return self.child.parse(ctx).succeeded()
-
-
-class Infix(ParseNode):
-    def __init__(self, binding_power: int, child):
-        self.binding_power = binding_power
-        self.child = to_parse_node(child)
-
-    def _parse(self, ctx: ParseContext):
-        ctx.binding_power = self.binding_power
-        return self.child.parse(ctx).succeeded()
-
-    def __lt__(self, other):
-        return self.binding_power < other.binding_power
-
-    def __eq__(self, other):
-        return self.binding_power == other.binding_power
-
-
-class Pratt(ParseNode):
-    """Basic Pratt parser implementation."""
-
-    def __init__(self, *children):
-        self.children = children
-
-    @property
-    def children(self):
-        return self._children
-
-    @children.setter
-    def children(self, children):
-        self._children = children
-        self.prefixes = [child for child in children if isinstance(child, Prefix)]
-        self.infixes = sorted(
-            [child for child in children if isinstance(child, Infix)], reverse=True
-        )
-
-    def _parse(self, ctx: ParseContext) -> bool:
-        for prefix in self.prefixes:
-            if prefix.parse(ctx).succeeded():
-                break
-        else:
-            # none of the prefixes could be parsed
-            return False
-
-        while True:
-            succeeded = False
-            for infix in self.infixes:
-                if infix.binding_power <= ctx.binding_power:
-                    break
-                if infix.parse(ctx).succeeded():
-                    succeeded = True
-                    break
-            if not succeeded:
-                return True
-
-
 def to_parse_node(value) -> ParseNode:
     if isinstance(value, str):
         return Match(value)

From 0f5f08ade955ba2e80675b8e6447c4f399e8c51c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 11 Mar 2023 21:24:52 -0600
Subject: [PATCH 075/290] Fix flag syntax

Unlike commas, no trailing "|" is allowed.
---
 blueprintcompiler/language/values.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 4300c39..d03fc84 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -221,7 +221,7 @@ class Flag(AstNode):
 
 
 class Flags(AstNode):
-    grammar = [Flag, "|", Delimited(Flag, "|")]
+    grammar = [Flag, "|", Flag, ZeroOrMore(["|", Flag])]
 
     @property
     def flags(self) -> T.List[Flag]:
@@ -327,5 +327,5 @@ class Value(AstNode):
     @property
     def child(
         self,
-    ) -> T.Union[PropertyBinding, Binding, Translated, ObjectValue, Flags, Literal,]:
+    ) -> T.Union[PropertyBinding, Binding, Translated, ObjectValue, Flags, Literal]:
         return self.children[0]

From fad3b3553105b6007927297cce24e6441dc3cc90 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 11 Mar 2023 21:36:27 -0600
Subject: [PATCH 076/290] types: Remove g* type names

They aren't used in GIR parsing anymore since we use typelibs, and
blueprint files should use the non-prefixed names.
---
 blueprintcompiler/gir.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index a9f5693..f03a37f 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -208,20 +208,11 @@ class TypeType(BasicType):
 
 _BASIC_TYPES = {
     "bool": BoolType,
-    "gboolean": BoolType,
     "string": StringType,
-    "gchararray": StringType,
     "int": IntType,
-    "gint": IntType,
-    "gint64": IntType,
-    "guint": UIntType,
-    "guint64": UIntType,
-    "gfloat": FloatType,
-    "gdouble": FloatType,
+    "uint": UIntType,
     "float": FloatType,
     "double": FloatType,
-    "utf8": StringType,
-    "gtype": TypeType,
     "type": TypeType,
 }
 

From b636d9ed7134f3ccff7edd1b4f86390c0562f055 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 12 Mar 2023 14:29:20 -0500
Subject: [PATCH 077/290] Fix bugs in number literals

---
 blueprintcompiler/language/response_id.py     | 18 +++++++----
 blueprintcompiler/language/values.py          | 30 ++++++++-----------
 blueprintcompiler/tokenizer.py                |  6 ++--
 .../action_widget_negative_response.err       |  2 +-
 4 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/blueprintcompiler/language/response_id.py b/blueprintcompiler/language/response_id.py
index 073173a..e3b44a9 100644
--- a/blueprintcompiler/language/response_id.py
+++ b/blueprintcompiler/language/response_id.py
@@ -31,7 +31,13 @@ class ResponseId(AstNode):
     grammar = [
         Keyword("response"),
         "=",
-        AnyOf(UseIdent("response_id"), UseNumber("response_id")),
+        AnyOf(
+            UseIdent("response_id"),
+            [
+                Optional(UseExact("sign", "-")),
+                UseNumber("response_id"),
+            ],
+        ),
         Optional([Keyword("default"), UseLiteral("is_default", True)]),
     ]
 
@@ -81,14 +87,14 @@ class ResponseId(AstNode):
         gir = self.root.gir
         response = self.tokens["response_id"]
 
-        if isinstance(response, int):
-            if response < 0:
-                raise CompileError("Numeric response type can't be negative")
-        elif isinstance(response, float):
+        if self.tokens["sign"] == "-":
+            raise CompileError("Numeric response type can't be negative")
+
+        if isinstance(response, float):
             raise CompileError(
                 "Response type must be GtkResponseType member or integer," " not float"
             )
-        else:
+        elif not isinstance(response, int):
             responses = gir.get_type("ResponseType", "Gtk").members.keys()
             if response not in responses:
                 raise CompileError(f'Response type "{response}" doesn\'t exist')
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index d03fc84..ca10f50 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -145,39 +145,35 @@ class NumberLiteral(AstNode):
         UseNumber("value"),
     ]
 
+    @property
+    def type(self) -> gir.GirType:
+        if isinstance(self.value, int):
+            return gir.IntType()
+        else:
+            return gir.FloatType()
+
     @property
     def value(self) -> T.Union[int, float]:
-        return self.tokens["value"]
+        if self.tokens["sign"] == "-":
+            return -self.tokens["value"]
+        else:
+            return self.tokens["value"]
 
     @validate()
     def validate_for_type(self) -> None:
         expected_type = self.context[ValueTypeCtx].value_type
         if isinstance(expected_type, gir.IntType):
-            try:
-                int(self.tokens["value"])
-            except:
+            if not isinstance(self.value, int):
                 raise CompileError(
                     f"Cannot convert {self.group.tokens['value']} to integer"
                 )
 
         elif isinstance(expected_type, gir.UIntType):
-            try:
-                int(self.tokens["value"])
-                if int(self.tokens["value"]) < 0:
-                    raise Exception()
-            except:
+            if self.value < 0:
                 raise CompileError(
                     f"Cannot convert {self.group.tokens['value']} to unsigned integer"
                 )
 
-        elif isinstance(expected_type, gir.FloatType):
-            try:
-                float(self.tokens["value"])
-            except:
-                raise CompileError(
-                    f"Cannot convert {self.group.tokens['value']} to float"
-                )
-
         elif expected_type is not None:
             raise CompileError(f"Cannot convert number to {expected_type.full_name}")
 
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 170316c..5a40803 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -41,8 +41,8 @@ _tokens = [
     (TokenType.QUOTED, r'"(\\"|[^"\n])*"'),
     (TokenType.QUOTED, r"'(\\'|[^'\n])*'"),
     (TokenType.NUMBER, r"0x[A-Za-z0-9_]+"),
-    (TokenType.NUMBER, r"[-+]?[\d_]+(\.[\d_]+)?"),
-    (TokenType.NUMBER, r"[-+]?\.[\d_]+"),
+    (TokenType.NUMBER, r"[\d_]+(\.[\d_]+)?"),
+    (TokenType.NUMBER, r"\.[\d_]+"),
     (TokenType.WHITESPACE, r"\s+"),
     (TokenType.COMMENT, r"\/\*[\s\S]*?\*\/"),
     (TokenType.COMMENT, r"\/\/[^\n]*"),
@@ -71,7 +71,7 @@ class Token:
             if string.startswith("0x"):
                 return int(string, 16)
             else:
-                return float(string.replace("_", ""))
+                return float(string)
         except:
             raise CompileError(
                 f"{str(self)} is not a valid number literal", self.start, self.end
diff --git a/tests/sample_errors/action_widget_negative_response.err b/tests/sample_errors/action_widget_negative_response.err
index 6e6836d..6f0a627 100644
--- a/tests/sample_errors/action_widget_negative_response.err
+++ b/tests/sample_errors/action_widget_negative_response.err
@@ -1 +1 @@
-4,24,4,Numeric response type can't be negative
+4,25,3,Numeric response type can't be negative

From 98ba7d467a2e92f09fd824b52753ce1b2b59b8da Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 12 Mar 2023 15:35:05 -0500
Subject: [PATCH 078/290] Improve expression type checking

---
 blueprintcompiler/language/__init__.py    | 12 ++-
 blueprintcompiler/language/binding.py     | 14 ++--
 blueprintcompiler/language/common.py      |  1 +
 blueprintcompiler/language/expression.py  | 90 ++++++++++++++++-------
 blueprintcompiler/language/values.py      | 24 +++++-
 blueprintcompiler/outputs/xml/__init__.py | 44 ++++++-----
 tests/sample_errors/expr_cast_needed.blp  |  7 ++
 tests/sample_errors/expr_cast_needed.err  |  1 +
 tests/samples/expr_closure_args.blp       |  5 ++
 tests/samples/expr_closure_args.ui        | 13 ++++
 tests/test_samples.py                     |  4 +
 11 files changed, 160 insertions(+), 55 deletions(-)
 create mode 100644 tests/sample_errors/expr_cast_needed.blp
 create mode 100644 tests/sample_errors/expr_cast_needed.err
 create mode 100644 tests/samples/expr_closure_args.blp
 create mode 100644 tests/samples/expr_closure_args.ui

diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 822a91a..8f68647 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,7 +1,15 @@
 from .attributes import BaseAttribute, BaseTypedAttribute
 from .binding import Binding
 from .contexts import ValueTypeCtx
-from .expression import CastExpr, ClosureExpr, Expr, ExprChain, IdentExpr, LookupOp
+from .expression import (
+    CastExpr,
+    ClosureArg,
+    ClosureExpr,
+    Expr,
+    ExprChain,
+    LiteralExpr,
+    LookupOp,
+)
 from .gobject_object import Object, ObjectContent
 from .gobject_property import Property
 from .gobject_signal import Signal
@@ -50,3 +58,5 @@ OBJECT_CONTENT_HOOKS.children = [
     Strings,
     Child,
 ]
+
+LITERAL.children = [Literal]
diff --git a/blueprintcompiler/language/binding.py b/blueprintcompiler/language/binding.py
index 91d5a6b..ab544ca 100644
--- a/blueprintcompiler/language/binding.py
+++ b/blueprintcompiler/language/binding.py
@@ -20,7 +20,7 @@
 from dataclasses import dataclass
 
 from .common import *
-from .expression import ExprChain, LookupOp, IdentExpr
+from .expression import ExprChain, LookupOp, LiteralExpr
 from .contexts import ValueTypeCtx
 
 
@@ -37,10 +37,14 @@ class Binding(AstNode):
     @property
     def simple_binding(self) -> T.Optional["SimpleBinding"]:
         if isinstance(self.expression.last, LookupOp):
-            if isinstance(self.expression.last.lhs, IdentExpr):
-                return SimpleBinding(
-                    self.expression.last.lhs.ident, self.expression.last.property_name
-                )
+            if isinstance(self.expression.last.lhs, LiteralExpr):
+                from .values import IdentLiteral
+
+                if isinstance(self.expression.last.lhs.literal.value, IdentLiteral):
+                    return SimpleBinding(
+                        self.expression.last.lhs.literal.value.ident,
+                        self.expression.last.property_name,
+                    )
         return None
 
     @validate("bind")
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index 636f15d..734e59b 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -44,3 +44,4 @@ from ..parse_tree import *
 
 
 OBJECT_CONTENT_HOOKS = AnyOf()
+LITERAL = AnyOf()
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 82787ef..5347a88 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -19,6 +19,7 @@
 
 
 from .common import *
+from .contexts import ValueTypeCtx
 from .types import TypeName
 from .gtkbuilder_template import Template
 
@@ -27,6 +28,13 @@ expr = Sequence()
 
 
 class Expr(AstNode):
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        if rhs := self.rhs:
+            return rhs.context[ValueTypeCtx]
+        else:
+            return self.parent.context[ValueTypeCtx]
+
     @property
     def type(self) -> T.Optional[GirType]:
         raise NotImplementedError()
@@ -70,39 +78,45 @@ class InfixExpr(Expr):
         return children[children.index(self) - 1]
 
 
-class IdentExpr(Expr):
-    grammar = UseIdent("ident")
+class LiteralExpr(Expr):
+    grammar = LITERAL
 
     @property
-    def ident(self) -> str:
-        return self.tokens["ident"]
+    def is_object(self) -> bool:
+        from .values import IdentLiteral
 
-    @validate()
-    def exists(self):
-        if self.root.objects_by_id.get(self.ident) is None:
-            raise CompileError(
-                f"Could not find object with ID {self.ident}",
-                did_you_mean=(self.ident, self.root.objects_by_id.keys()),
-            )
+        return (
+            isinstance(self.literal.value, IdentLiteral)
+            and self.literal.value.ident in self.root.objects_by_id
+        )
+
+    @property
+    def literal(self):
+        from .values import Literal
+
+        return self.children[Literal][0]
 
     @property
     def type(self) -> T.Optional[GirType]:
-        if object := self.root.objects_by_id.get(self.ident):
-            return object.gir_class
-        else:
-            return None
+        return self.literal.value.type
 
     @property
     def type_complete(self) -> bool:
-        if object := self.root.objects_by_id.get(self.ident):
-            return not isinstance(object, Template)
-        else:
-            return True
+        from .values import IdentLiteral
+
+        if isinstance(self.literal, IdentLiteral):
+            if object := self.root.objects_by_id.get(self.ident):
+                return not isinstance(object, Template)
+        return True
 
 
 class LookupOp(InfixExpr):
     grammar = [".", UseIdent("property")]
 
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        return ValueTypeCtx(None)
+
     @property
     def property_name(self) -> str:
         return self.tokens["property"]
@@ -119,11 +133,15 @@ class LookupOp(InfixExpr):
 
     @validate("property")
     def property_exists(self):
-        if (
-            self.lhs.type is None
-            or not self.lhs.type_complete
-            or isinstance(self.lhs.type, UncheckedType)
-        ):
+        if self.lhs.type is None:
+            raise CompileError(
+                f"Could not determine the type of the preceding expression",
+                hints=[
+                    f"add a type cast so blueprint knows which type the property {self.property_name} belongs to"
+                ],
+            )
+
+        if isinstance(self.lhs.type, UncheckedType):
             return
 
         elif not isinstance(self.lhs.type, gir.Class) and not isinstance(
@@ -143,6 +161,10 @@ class LookupOp(InfixExpr):
 class CastExpr(InfixExpr):
     grammar = ["as", "(", TypeName, ")"]
 
+    @context(ValueTypeCtx)
+    def value_type(self):
+        return ValueTypeCtx(self.type)
+
     @property
     def type(self) -> T.Optional[GirType]:
         return self.children[TypeName][0].gir_type
@@ -162,12 +184,24 @@ class CastExpr(InfixExpr):
             )
 
 
+class ClosureArg(AstNode):
+    grammar = ExprChain
+
+    @property
+    def expr(self) -> ExprChain:
+        return self.children[ExprChain][0]
+
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        return ValueTypeCtx(None)
+
+
 class ClosureExpr(Expr):
     grammar = [
         Optional(["$", UseLiteral("extern", True)]),
         UseIdent("name"),
         "(",
-        Delimited(ExprChain, ","),
+        Delimited(ClosureArg, ","),
         ")",
     ]
 
@@ -183,8 +217,8 @@ class ClosureExpr(Expr):
         return self.tokens["name"]
 
     @property
-    def args(self) -> T.List[ExprChain]:
-        return self.children[ExprChain]
+    def args(self) -> T.List[ClosureArg]:
+        return self.children[ClosureArg]
 
     @validate()
     def cast_to_return_type(self):
@@ -200,6 +234,6 @@ class ClosureExpr(Expr):
 
 
 expr.children = [
-    AnyOf(ClosureExpr, IdentExpr, ["(", ExprChain, ")"]),
+    AnyOf(ClosureExpr, LiteralExpr, ["(", ExprChain, ")"]),
     ZeroOrMore(AnyOf(LookupOp, CastExpr)),
 ]
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index ca10f50..83de28e 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -79,6 +79,10 @@ class TypeLiteral(AstNode):
         Match(")").expected(),
     ]
 
+    @property
+    def type(self):
+        return gir.TypeType()
+
     @property
     def type_name(self) -> TypeName:
         return self.children[TypeName][0]
@@ -97,6 +101,10 @@ class QuotedLiteral(AstNode):
     def value(self) -> str:
         return self.tokens["value"]
 
+    @property
+    def type(self):
+        return gir.StringType()
+
     @validate()
     def validate_for_type(self) -> None:
         expected_type = self.context[ValueTypeCtx].value_type
@@ -171,10 +179,10 @@ class NumberLiteral(AstNode):
         elif isinstance(expected_type, gir.UIntType):
             if self.value < 0:
                 raise CompileError(
-                    f"Cannot convert {self.group.tokens['value']} to unsigned integer"
+                    f"Cannot convert -{self.group.tokens['value']} to unsigned integer"
                 )
 
-        elif expected_type is not None:
+        elif not isinstance(expected_type, gir.FloatType) and expected_type is not None:
             raise CompileError(f"Cannot convert number to {expected_type.full_name}")
 
 
@@ -237,6 +245,18 @@ class IdentLiteral(AstNode):
     def ident(self) -> str:
         return self.tokens["value"]
 
+    @property
+    def type(self) -> T.Optional[gir.GirType]:
+        # If the expected type is known, then use that. Otherwise, guess.
+        if expected_type := self.context[ValueTypeCtx].value_type:
+            return expected_type
+        elif self.ident in ["true", "false"]:
+            return gir.BoolType()
+        elif object := self.root.objects_by_id.get(self.ident):
+            return object.gir_class
+        else:
+            return None
+
     @validate()
     def validate_for_type(self) -> None:
         expected_type = self.context[ValueTypeCtx].value_type
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index c38c070..f379710 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -159,21 +159,24 @@ class XmlOutput(OutputFormat):
         self._emit_object(child.object, xml)
         xml.end_tag()
 
+    def _emit_literal(self, literal: Literal, xml: XmlEmitter):
+        literal = literal.value
+        if isinstance(literal, IdentLiteral):
+            value_type = literal.context[ValueTypeCtx].value_type
+            if isinstance(value_type, gir.BoolType):
+                xml.put_text(literal.ident)
+            elif isinstance(value_type, gir.Enumeration):
+                xml.put_text(str(value_type.members[literal.ident].value))
+            else:
+                xml.put_text(literal.ident)
+        elif isinstance(literal, TypeLiteral):
+            xml.put_text(literal.type_name.glib_type_name)
+        else:
+            xml.put_text(literal.value)
+
     def _emit_value(self, value: Value, xml: XmlEmitter):
         if isinstance(value.child, Literal):
-            literal = value.child.value
-            if isinstance(literal, IdentLiteral):
-                value_type = value.context[ValueTypeCtx].value_type
-                if isinstance(value_type, gir.BoolType):
-                    xml.put_text(literal.ident)
-                elif isinstance(value_type, gir.Enumeration):
-                    xml.put_text(str(value_type.members[literal.ident].value))
-                else:
-                    xml.put_text(literal.ident)
-            elif isinstance(literal, TypeLiteral):
-                xml.put_text(literal.type_name.glib_type_name)
-            else:
-                xml.put_text(literal.value)
+            self._emit_literal(value.child, xml)
         elif isinstance(value.child, Flags):
             xml.put_text(
                 "|".join([str(flag.value or flag.name) for flag in value.child.flags])
@@ -191,8 +194,8 @@ class XmlOutput(OutputFormat):
         self._emit_expression_part(expression.last, xml)
 
     def _emit_expression_part(self, expression: Expr, xml: XmlEmitter):
-        if isinstance(expression, IdentExpr):
-            self._emit_ident_expr(expression, xml)
+        if isinstance(expression, LiteralExpr):
+            self._emit_literal_expr(expression, xml)
         elif isinstance(expression, LookupOp):
             self._emit_lookup_op(expression, xml)
         elif isinstance(expression, ExprChain):
@@ -204,9 +207,12 @@ class XmlOutput(OutputFormat):
         else:
             raise CompilerBugError()
 
-    def _emit_ident_expr(self, expr: IdentExpr, xml: XmlEmitter):
-        xml.start_tag("constant")
-        xml.put_text(expr.ident)
+    def _emit_literal_expr(self, expr: LiteralExpr, xml: XmlEmitter):
+        if expr.is_object:
+            xml.start_tag("constant")
+        else:
+            xml.start_tag("constant", type=expr.type)
+        self._emit_literal(expr.literal, xml)
         xml.end_tag()
 
     def _emit_lookup_op(self, expr: LookupOp, xml: XmlEmitter):
@@ -220,7 +226,7 @@ class XmlOutput(OutputFormat):
     def _emit_closure_expr(self, expr: ClosureExpr, xml: XmlEmitter):
         xml.start_tag("closure", function=expr.closure_name, type=expr.type)
         for arg in expr.args:
-            self._emit_expression_part(arg, xml)
+            self._emit_expression_part(arg.expr, xml)
         xml.end_tag()
 
     def _emit_attribute(
diff --git a/tests/sample_errors/expr_cast_needed.blp b/tests/sample_errors/expr_cast_needed.blp
new file mode 100644
index 0000000..f647cb5
--- /dev/null
+++ b/tests/sample_errors/expr_cast_needed.blp
@@ -0,0 +1,7 @@
+using Gtk 4.0;
+
+template GtkListItem {
+  Label {
+    label: bind GtkListItem.item.label;
+  }
+}
\ No newline at end of file
diff --git a/tests/sample_errors/expr_cast_needed.err b/tests/sample_errors/expr_cast_needed.err
new file mode 100644
index 0000000..51269d2
--- /dev/null
+++ b/tests/sample_errors/expr_cast_needed.err
@@ -0,0 +1 @@
+5,34,5,Could not determine the type of the preceding expression
\ No newline at end of file
diff --git a/tests/samples/expr_closure_args.blp b/tests/samples/expr_closure_args.blp
new file mode 100644
index 0000000..d09c881
--- /dev/null
+++ b/tests/samples/expr_closure_args.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: bind $my-closure (true, 10, "Hello") as (string);
+}
\ No newline at end of file
diff --git a/tests/samples/expr_closure_args.ui b/tests/samples/expr_closure_args.ui
new file mode 100644
index 0000000..1b539ac
--- /dev/null
+++ b/tests/samples/expr_closure_args.ui
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkLabel">
+    <binding name="label">
+      <closure function="my-closure" type="gchararray">
+        <constant type="gboolean">true</constant>
+        <constant type="gint">10</constant>
+        <constant type="gchararray">Hello</constant>
+      </closure>
+    </binding>
+  </object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 7bc7d28..29d2f14 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -150,6 +150,9 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("comments")
         self.assert_sample("enum")
         self.assert_sample("expr_closure", skip_run=True)  # The closure doesn't exist
+        self.assert_sample(
+            "expr_closure_args", skip_run=True
+        )  # The closure doesn't exist
         self.assert_sample("expr_lookup")
         self.assert_sample("file_filter")
         self.assert_sample("flags")
@@ -208,6 +211,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("empty")
         self.assert_sample_error("enum_member_dne")
         self.assert_sample_error("expr_cast_conversion")
+        self.assert_sample_error("expr_cast_needed")
         self.assert_sample_error("expr_closure_not_cast")
         self.assert_sample_error("expr_lookup_dne")
         self.assert_sample_error("expr_lookup_no_properties")

From 90001bd885b1ffa00e82fe48ad556a8a15ddb56c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 12 Mar 2023 20:56:31 -0500
Subject: [PATCH 079/290] Fix mypy errors & other bugs

---
 blueprintcompiler/language/expression.py  |  6 +++---
 blueprintcompiler/outputs/xml/__init__.py | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 5347a88..fca7f0e 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -104,8 +104,8 @@ class LiteralExpr(Expr):
     def type_complete(self) -> bool:
         from .values import IdentLiteral
 
-        if isinstance(self.literal, IdentLiteral):
-            if object := self.root.objects_by_id.get(self.ident):
+        if isinstance(self.literal.value, IdentLiteral):
+            if object := self.root.objects_by_id.get(self.literal.value.ident):
                 return not isinstance(object, Template)
         return True
 
@@ -141,7 +141,7 @@ class LookupOp(InfixExpr):
                 ],
             )
 
-        if isinstance(self.lhs.type, UncheckedType):
+        if isinstance(self.lhs.type, UncheckedType) or not self.lhs.type_complete:
             return
 
         elif not isinstance(self.lhs.type, gir.Class) and not isinstance(
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index f379710..6f71595 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -160,19 +160,19 @@ class XmlOutput(OutputFormat):
         xml.end_tag()
 
     def _emit_literal(self, literal: Literal, xml: XmlEmitter):
-        literal = literal.value
-        if isinstance(literal, IdentLiteral):
-            value_type = literal.context[ValueTypeCtx].value_type
+        value = literal.value
+        if isinstance(value, IdentLiteral):
+            value_type = value.context[ValueTypeCtx].value_type
             if isinstance(value_type, gir.BoolType):
-                xml.put_text(literal.ident)
+                xml.put_text(value.ident)
             elif isinstance(value_type, gir.Enumeration):
-                xml.put_text(str(value_type.members[literal.ident].value))
+                xml.put_text(str(value_type.members[value.ident].value))
             else:
-                xml.put_text(literal.ident)
-        elif isinstance(literal, TypeLiteral):
-            xml.put_text(literal.type_name.glib_type_name)
+                xml.put_text(value.ident)
+        elif isinstance(value, TypeLiteral):
+            xml.put_text(value.type_name.glib_type_name)
         else:
-            xml.put_text(literal.value)
+            xml.put_text(value.value)
 
     def _emit_value(self, value: Value, xml: XmlEmitter):
         if isinstance(value.child, Literal):

From 8c3c43a34ad894e9a14cddbb52ecc040db2653cb Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 16 Mar 2023 15:10:04 -0500
Subject: [PATCH 080/290] Add --typelib-path command line argument

Allows adding directories to search for typelib files.
---
 blueprintcompiler/gir.py  |  8 +++++++-
 blueprintcompiler/main.py | 11 +++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index f03a37f..d795789 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -32,9 +32,15 @@ from . import typelib, xml_reader
 _namespace_cache: T.Dict[str, "Namespace"] = {}
 _xml_cache = {}
 
+_user_search_paths = []
+
+
+def add_typelib_search_path(path: str):
+    _user_search_paths.append(path)
+
 
 def get_namespace(namespace: str, version: str) -> "Namespace":
-    search_paths = GIRepository.Repository.get_search_path()
+    search_paths = [*GIRepository.Repository.get_search_path(), *_user_search_paths]
 
     filename = f"{namespace}-{version}.typelib"
 
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 6127630..6ac7a11 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -22,6 +22,7 @@ import typing as T
 import argparse, json, os, sys
 
 from .errors import PrintableError, report_bug, MultipleErrors, CompilerBugError
+from .gir import add_typelib_search_path
 from .lsp import LanguageServer
 from . import parser, tokenizer, decompiler, interactive_port
 from .utils import Colors
@@ -41,6 +42,7 @@ class BlueprintApp:
             "compile", "Compile blueprint files", self.cmd_compile
         )
         compile.add_argument("--output", dest="output", default="-")
+        compile.add_argument("--typelib-path", nargs="?", action="append")
         compile.add_argument(
             "input", metavar="filename", default=sys.stdin, type=argparse.FileType("r")
         )
@@ -52,6 +54,7 @@ class BlueprintApp:
         )
         batch_compile.add_argument("output_dir", metavar="output-dir")
         batch_compile.add_argument("input_dir", metavar="input-dir")
+        batch_compile.add_argument("--typelib-path", nargs="?", action="append")
         batch_compile.add_argument(
             "inputs",
             nargs="+",
@@ -91,6 +94,10 @@ class BlueprintApp:
         self.parser.print_help()
 
     def cmd_compile(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:
             xml, warnings = self._compile(data)
@@ -108,6 +115,10 @@ class BlueprintApp:
             sys.exit(1)
 
     def cmd_batch_compile(self, opts):
+        if opts.typelib_path != None:
+            for typelib_path in opts.typelib_path:
+                add_typelib_search_path(typelib_path)
+
         for file in opts.inputs:
             data = file.read()
 

From 6f4806bfb3514c3fa01e0880c4bd9d399e058a44 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonnyp@gnome.org>
Date: Sun, 19 Mar 2023 22:14:42 +0000
Subject: [PATCH 081/290] lsp: Add compile an decompile commands

---
 CONTRIBUTING.md                 |  4 +++
 blueprintcompiler/decompiler.py | 11 ++++++-
 blueprintcompiler/lsp.py        | 52 +++++++++++++++++++++++++++++++--
 blueprintcompiler/lsp_utils.py  |  4 +++
 blueprintcompiler/xml_reader.py |  6 ++++
 5 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d817250..20a865d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,10 @@ If you learn something useful, please add it to this file.
 python -m unittest
 ```
 
+# Formatting
+
+Blueprint uses [Black](https://github.com/psf/black) for code formatting.
+
 # Build the docs
 
 ```sh
diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 036c86f..1d9f4dd 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -22,7 +22,7 @@ from enum import Enum
 import typing as T
 from dataclasses import dataclass
 
-from .xml_reader import Element, parse
+from .xml_reader import Element, parse, parse_string
 from .gir import *
 from .utils import Colors
 
@@ -211,6 +211,15 @@ def decompile(data: str) -> str:
     return ctx.result
 
 
+def decompile_string(data):
+    ctx = DecompileCtx()
+
+    xml = parse_string(data)
+    _decompile_element(ctx, None, xml)
+
+    return ctx.result
+
+
 def canon(string: str) -> str:
     if string == "class":
         return "klass"
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index dd12905..b44d631 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -24,7 +24,8 @@ import json, sys, traceback
 from .completions import complete
 from .errors import PrintableError, CompileError, MultipleErrors
 from .lsp_utils import *
-from . import tokenizer, parser, utils, xml_reader
+from .outputs.xml import XmlOutput
+from . import tokenizer, parser, utils, xml_reader, decompiler
 
 
 def printerr(*args, **kwargs):
@@ -149,6 +150,18 @@ class LanguageServer:
         )
         sys.stdout.flush()
 
+    def _send_error(self, id, code, message, data=None):
+        self._send(
+            {
+                "id": id,
+                "error": {
+                    "code": code,
+                    "message": message,
+                    "data": data,
+                },
+            }
+        )
+
     def _send_response(self, id, result):
         self._send(
             {
@@ -169,7 +182,7 @@ class LanguageServer:
     def initialize(self, id, params):
         from . import main
 
-        self.client_capabilities = params.get("capabilities")
+        self.client_capabilities = params.get("capabilities", {})
         self._send_response(
             id,
             {
@@ -256,6 +269,41 @@ class LanguageServer:
             id, [completion.to_json(True) for completion in completions]
         )
 
+    @command("textDocument/x-blueprint-compile")
+    def compile(self, id, params):
+        open_file = self._open_files[params["textDocument"]["uri"]]
+
+        if open_file.ast is None:
+            self._send_error(id, ErrorCode.RequestFailed, "Document is not open")
+            return
+
+        xml = None
+        try:
+            output = XmlOutput()
+            xml = output.emit(open_file.ast)
+        except:
+            printerr(traceback.format_exc())
+            self._send_error(id, ErrorCode.RequestFailed, "Could not compile document")
+            return
+        self._send_response(id, {"xml": xml})
+
+    @command("x-blueprint/decompile")
+    def decompile(self, id, params):
+        text = params.get("text")
+        blp = None
+
+        try:
+            blp = decompiler.decompile_string(text)
+        except decompiler.UnsupportedError as e:
+            self._send_error(id, ErrorCode.RequestFailed, e.message)
+            return
+        except:
+            printerr(traceback.format_exc())
+            self._send_error(id, ErrorCode.RequestFailed, "Invalid input")
+            return
+
+        self._send_response(id, {"blp": blp})
+
     @command("textDocument/semanticTokens/full")
     def semantic_tokens(self, id, params):
         open_file = self._open_files[params["textDocument"]["uri"]]
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 5e4ef89..219cade 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -69,6 +69,10 @@ class CompletionItemKind(enum.IntEnum):
     TypeParameter = 25
 
 
+class ErrorCode(enum.IntEnum):
+    RequestFailed = -32803
+
+
 @dataclass
 class Completion:
     label: str
diff --git a/blueprintcompiler/xml_reader.py b/blueprintcompiler/xml_reader.py
index 5e31773..b2d579b 100644
--- a/blueprintcompiler/xml_reader.py
+++ b/blueprintcompiler/xml_reader.py
@@ -92,3 +92,9 @@ def parse(filename):
     parser.setContentHandler(handler)
     parser.parse(filename)
     return handler.root
+
+
+def parse_string(xml):
+    handler = Handler()
+    parser = sax.parseString(xml, handler)
+    return handler.root

From 3f27e92eb0f247b208453dcb0d55530bd21033b6 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 20 Mar 2023 13:27:21 -0500
Subject: [PATCH 082/290] Remove unnecessary list() call

---
 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 7a44c80..8b2963a 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -107,7 +107,7 @@ class ParseContext:
     """Contains the state of the parser."""
 
     def __init__(self, tokens: T.List[Token], index=0):
-        self.tokens = list(tokens)
+        self.tokens = tokens
 
         self.binding_power = 0
         self.index = index

From 402677f687ecdb78026864188bae50b9d85949de Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 20 Mar 2023 13:34:17 -0500
Subject: [PATCH 083/290] performance: Cache some properties

---
 blueprintcompiler/ast_utils.py   | 19 +++++++++++--------
 blueprintcompiler/language/ui.py |  3 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 7bd5418..73ffe62 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -76,6 +76,7 @@ class AstNode:
     """Base class for nodes in the abstract syntax tree."""
 
     completers: T.List = []
+    attrs_by_type: T.Dict[T.Type, T.List] = {}
 
     def __init__(self, group, children, tokens, incomplete=False):
         self.group = group
@@ -92,12 +93,13 @@ class AstNode:
         cls.validators = [
             getattr(cls, f) for f in dir(cls) if hasattr(getattr(cls, f), "_validator")
         ]
+        cls.attrs_by_type = {}
 
     @cached_property
     def context(self):
         return Ctx(self)
 
-    @property
+    @cached_property
     def root(self):
         if self.parent is None:
             return self
@@ -140,13 +142,14 @@ class AstNode:
         for child in self.children:
             yield from child._get_errors()
 
-    def _attrs_by_type(
-        self, attr_type: T.Type[TAttr]
-    ) -> T.Iterator[T.Tuple[str, TAttr]]:
-        for name in dir(type(self)):
-            item = getattr(type(self), name)
-            if isinstance(item, attr_type):
-                yield name, item
+    def _attrs_by_type(self, attr_type: T.Type[TAttr]) -> T.List[T.Tuple[str, TAttr]]:
+        if attr_type not in self.attrs_by_type:
+            self.attrs_by_type[attr_type] = []
+            for name in dir(type(self)):
+                item = getattr(type(self), name)
+                if isinstance(item, attr_type):
+                    self.attrs_by_type[attr_type].append((name, item))
+        return self.attrs_by_type[attr_type]
 
     def get_docs(self, idx: int) -> T.Optional[str]:
         for name, attr in self._attrs_by_type(Docs):
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index d45fe4c..aeff186 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -17,6 +17,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+from functools import cached_property
 
 from .. import gir
 from .imports import GtkDirective, Import
@@ -82,7 +83,7 @@ class UI(AstNode):
             or isinstance(child, Menu)
         ]
 
-    @property
+    @cached_property
     def objects_by_id(self):
         return {
             obj.tokens["id"]: obj

From bc605c5df86a33ff415f627ab1aa8cca53780c81 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 21 Mar 2023 11:31:02 -0500
Subject: [PATCH 084/290] Reduce errors when a namespace is not found

When the typelib for a namespace is not found, don't emit "namespace not
imported" errors. Just emit the one error on the import statement.
---
 blueprintcompiler/gir.py              | 3 ++-
 blueprintcompiler/language/imports.py | 8 ++++++++
 blueprintcompiler/language/ui.py      | 2 ++
 tests/sample_errors/ns_not_found.blp  | 6 ++++++
 tests/sample_errors/ns_not_found.err  | 1 +
 tests/test_samples.py                 | 1 +
 6 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tests/sample_errors/ns_not_found.blp
 create mode 100644 tests/sample_errors/ns_not_found.err

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index d795789..a8831af 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -741,6 +741,7 @@ class Repository(GirNode):
 class GirContext:
     def __init__(self):
         self.namespaces = {}
+        self.not_found_namespaces: T.Set[str] = set()
 
     def add_namespace(self, namespace: Namespace):
         other = self.namespaces.get(namespace.name)
@@ -781,7 +782,7 @@ class GirContext:
 
         ns = ns or "Gtk"
 
-        if ns not in self.namespaces:
+        if ns not in self.namespaces and ns not in self.not_found_namespaces:
             raise CompileError(
                 f"Namespace {ns} was not imported",
                 did_you_mean=(ns, self.namespaces.keys()),
diff --git a/blueprintcompiler/language/imports.py b/blueprintcompiler/language/imports.py
index 224e0a3..e34901c 100644
--- a/blueprintcompiler/language/imports.py
+++ b/blueprintcompiler/language/imports.py
@@ -76,6 +76,14 @@ class Import(AstNode):
         UseNumberText("version").expected("a version number"),
     )
 
+    @property
+    def namespace(self):
+        return self.tokens["namespace"]
+
+    @property
+    def version(self):
+        return self.tokens["version"]
+
     @validate("namespace", "version")
     def namespace_exists(self):
         gir.get_namespace(self.tokens["namespace"], self.tokens["version"])
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index aeff186..8d27c0e 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -58,6 +58,8 @@ class UI(AstNode):
             try:
                 if i.gir_namespace is not None:
                     gir_ctx.add_namespace(i.gir_namespace)
+                else:
+                    gir_ctx.not_found_namespaces.add(i.namespace)
             except CompileError as e:
                 e.start = i.group.tokens["namespace"].start
                 e.end = i.group.tokens["version"].end
diff --git a/tests/sample_errors/ns_not_found.blp b/tests/sample_errors/ns_not_found.blp
new file mode 100644
index 0000000..071d554
--- /dev/null
+++ b/tests/sample_errors/ns_not_found.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+using NotARealNamespace 1;
+
+NotARealNamespace.Widget widget {
+    property: true;
+}
\ No newline at end of file
diff --git a/tests/sample_errors/ns_not_found.err b/tests/sample_errors/ns_not_found.err
new file mode 100644
index 0000000..4a6a111
--- /dev/null
+++ b/tests/sample_errors/ns_not_found.err
@@ -0,0 +1 @@
+2,7,19,Namespace NotARealNamespace-1 could not be found
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 29d2f14..45fb692 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -224,6 +224,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("menu_no_id")
         self.assert_sample_error("menu_toplevel_attribute")
         self.assert_sample_error("no_import_version")
+        self.assert_sample_error("ns_not_found")
         self.assert_sample_error("ns_not_imported")
         self.assert_sample_error("not_a_class")
         self.assert_sample_error("object_dne")

From 7e20983b44c9f917dc8ecfe0c83d520b1d9fb39f Mon Sep 17 00:00:00 2001
From: Cameron Dehning <bedsteler2.0@gmail.com>
Date: Fri, 24 Mar 2023 16:27:22 +0000
Subject: [PATCH 085/290] Lsp hotfix

---
 blueprintcompiler/language/values.py | 3 ++-
 blueprintcompiler/tokenizer.py       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 83de28e..e446b29 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -297,7 +297,8 @@ class IdentLiteral(AstNode):
             return None
 
     def get_semantic_tokens(self) -> T.Iterator[SemanticToken]:
-        if isinstance(self.parent.value_type, gir.Enumeration):
+        type = self.context[ValueTypeCtx].value_type
+        if isinstance(type, gir.Enumeration):
             token = self.group.tokens["value"]
             yield SemanticToken(token.start, token.end, SemanticTokenType.EnumMember)
 
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 5a40803..f68f5a7 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -82,7 +82,7 @@ def _tokenize(ui_ml: str):
     i = 0
     while i < len(ui_ml):
         matched = False
-        for (type, regex) in _TOKENS:
+        for type, regex in _TOKENS:
             match = regex.match(ui_ml, i)
 
             if match is not None:

From 749ee03e86f4e92e44bbcf99546abea13543c9f3 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 28 Mar 2023 10:09:20 -0500
Subject: [PATCH 086/290] Fix misleading error message for missing semicolon

Fixes #105.
---
 blueprintcompiler/language/gobject_property.py | 2 +-
 tests/sample_errors/expected_semicolon.blp     | 6 ++++++
 tests/sample_errors/expected_semicolon.err     | 1 +
 tests/test_samples.py                          | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 tests/sample_errors/expected_semicolon.blp
 create mode 100644 tests/sample_errors/expected_semicolon.err

diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 13374f8..b57f3b0 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -30,7 +30,7 @@ from .binding import Binding
 
 
 class Property(AstNode):
-    grammar = [UseIdent("name"), ":", Value, ";"]
+    grammar = Statement(UseIdent("name"), ":", Value)
 
     @property
     def name(self) -> str:
diff --git a/tests/sample_errors/expected_semicolon.blp b/tests/sample_errors/expected_semicolon.blp
new file mode 100644
index 0000000..973726d
--- /dev/null
+++ b/tests/sample_errors/expected_semicolon.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+
+Button {
+  child: Label {
+  }
+}
\ No newline at end of file
diff --git a/tests/sample_errors/expected_semicolon.err b/tests/sample_errors/expected_semicolon.err
new file mode 100644
index 0000000..bfabc9a
--- /dev/null
+++ b/tests/sample_errors/expected_semicolon.err
@@ -0,0 +1 @@
+6,1,1,Expected `;`
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 45fb692..c292214 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -210,6 +210,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("duplicates")
         self.assert_sample_error("empty")
         self.assert_sample_error("enum_member_dne")
+        self.assert_sample_error("expected_semicolon")
         self.assert_sample_error("expr_cast_conversion")
         self.assert_sample_error("expr_cast_needed")
         self.assert_sample_error("expr_closure_not_cast")

From 0cf9a8e4fc61bc9783bb228093ca9ee987ef74e7 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 19 Mar 2023 18:19:31 -0500
Subject: [PATCH 087/290] Add Adw.MessageDialog responses extension

---
 blueprintcompiler/decompiler.py               |  33 ++++-
 blueprintcompiler/language/__init__.py        |   2 +
 .../language/adw_message_dialog.py            | 131 ++++++++++++++++++
 blueprintcompiler/outputs/xml/__init__.py     |  35 ++++-
 tests/samples/responses.blp                   |  10 ++
 tests/samples/responses.ui                    |  11 ++
 tests/test_samples.py                         |  13 ++
 7 files changed, 221 insertions(+), 14 deletions(-)
 create mode 100644 blueprintcompiler/language/adw_message_dialog.py
 create mode 100644 tests/samples/responses.blp
 create mode 100644 tests/samples/responses.ui

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 1d9f4dd..f7d858c 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -275,9 +275,28 @@ def decompile_placeholder(ctx, gir):
     pass
 
 
+def decompile_translatable(
+    string: str,
+    translatable: T.Optional[str],
+    context: T.Optional[str],
+    comments: T.Optional[str],
+) -> T.Tuple[T.Optional[str], str]:
+    if translatable is not None and truthy(translatable):
+        if comments is not None:
+            comments = comments.replace("/*", " ").replace("*/", " ")
+            comments = f"/* Translators: {comments} */"
+
+        if context is not None:
+            return comments, f'C_("{escape_quote(context)}", "{escape_quote(string)}")'
+        else:
+            return comments, f'_("{escape_quote(string)}")'
+    else:
+        return comments, f'"{escape_quote(string)}"'
+
+
 @decompiler("property", cdata=True)
 def decompile_property(
-    ctx,
+    ctx: DecompileCtx,
     gir,
     name,
     cdata,
@@ -306,12 +325,12 @@ def decompile_property(
             flags += " bidirectional"
         ctx.print(f"{name}: bind-property {bind_source}.{bind_property}{flags};")
     elif truthy(translatable):
-        if context is not None:
-            ctx.print(
-                f'{name}: C_("{escape_quote(context)}", "{escape_quote(cdata)}");'
-            )
-        else:
-            ctx.print(f'{name}: _("{escape_quote(cdata)}");')
+        comments, translatable = decompile_translatable(
+            cdata, translatable, context, comments
+        )
+        if comments is not None:
+            ctx.print(comments)
+        ctx.print(f"{name}: {translatable};")
     elif gir is None or gir.properties.get(name) is None:
         ctx.print(f'{name}: "{escape_quote(cdata)}";')
     else:
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 8f68647..a7334b1 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,3 +1,4 @@
+from .adw_message_dialog import Responses
 from .attributes import BaseAttribute, BaseTypedAttribute
 from .binding import Binding
 from .contexts import ValueTypeCtx
@@ -56,6 +57,7 @@ OBJECT_CONTENT_HOOKS.children = [
     Widgets,
     Items,
     Strings,
+    Responses,
     Child,
 ]
 
diff --git a/blueprintcompiler/language/adw_message_dialog.py b/blueprintcompiler/language/adw_message_dialog.py
new file mode 100644
index 0000000..2911735
--- /dev/null
+++ b/blueprintcompiler/language/adw_message_dialog.py
@@ -0,0 +1,131 @@
+# adw_message_dialog.py
+#
+# Copyright 2023 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 ..decompiler import truthy, decompile_translatable
+from .common import *
+from .contexts import ValueTypeCtx
+from .gobject_object import ObjectContent, validate_parent_type
+from .values import QuotedLiteral, Translated
+
+
+class Response(AstNode):
+    grammar = [
+        UseIdent("id"),
+        Match(":").expected(),
+        AnyOf(QuotedLiteral, Translated).expected("a value"),
+        ZeroOrMore(
+            AnyOf(Keyword("destructive"), Keyword("suggested"), Keyword("disabled"))
+        ),
+    ]
+
+    @property
+    def id(self) -> str:
+        return self.tokens["id"]
+
+    @property
+    def appearance(self) -> T.Optional[str]:
+        if "destructive" in self.tokens:
+            return "destructive"
+        if "suggested" in self.tokens:
+            return "suggested"
+        return None
+
+    @property
+    def enabled(self) -> bool:
+        return "disabled" not in self.tokens
+
+    @property
+    def value(self) -> T.Union[QuotedLiteral, Translated]:
+        return self.children[0]
+
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        return ValueTypeCtx(StringType())
+
+    @validate("id")
+    def unique_in_parent(self):
+        self.validate_unique_in_parent(
+            f"Duplicate response ID '{self.id}'",
+            check=lambda child: child.id == self.id,
+        )
+
+
+class Responses(AstNode):
+    grammar = [
+        Keyword("responses"),
+        Match("[").expected(),
+        Delimited(Response, ","),
+        "]",
+    ]
+
+    @property
+    def responses(self) -> T.List[Response]:
+        return self.children
+
+    @validate("responses")
+    def container_is_message_dialog(self):
+        validate_parent_type(self, "Adw", "MessageDialog", "responses")
+
+    @validate("responses")
+    def unique_in_parent(self):
+        self.validate_unique_in_parent("Duplicate responses block")
+
+
+@completer(
+    applies_in=[ObjectContent],
+    applies_in_subclass=("Adw", "MessageDialog"),
+    matches=new_statement_patterns,
+)
+def style_completer(ast_node, match_variables):
+    yield Completion(
+        "responses", CompletionItemKind.Keyword, snippet="responses [\n\t$0\n]"
+    )
+
+
+@decompiler("responses")
+def decompile_responses(ctx, gir):
+    ctx.print(f"responses [")
+
+
+@decompiler("response", cdata=True)
+def decompile_response(
+    ctx,
+    gir,
+    cdata,
+    id,
+    appearance=None,
+    enabled=None,
+    translatable=None,
+    context=None,
+    comments=None,
+):
+    comments, translated = decompile_translatable(
+        cdata, translatable, context, comments
+    )
+    if comments is not None:
+        ctx.print(comments)
+
+    flags = ""
+    if appearance is not None:
+        flags += f" {appearance}"
+    if enabled is not None and not truthy(enabled):
+        flags += " disabled"
+
+    ctx.print(f"{id}: {translated}{flags},")
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 6f71595..ad6e658 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -126,14 +126,17 @@ class XmlOutput(OutputFormat):
             xml.end_tag()
 
     def _translated_string_attrs(
-        self, translated: Translated
+        self, translated: T.Union[QuotedLiteral, Translated]
     ) -> T.Dict[str, T.Optional[str]]:
-        return {
-            "translatable": "true",
-            "context": translated.child.context
-            if isinstance(translated.child, TranslatedWithContext)
-            else None,
-        }
+        if isinstance(translated, QuotedLiteral):
+            return {}
+        else:
+            return {
+                "translatable": "true",
+                "context": translated.child.context
+                if isinstance(translated.child, TranslatedWithContext)
+                else None,
+            }
 
     def _emit_signal(self, signal: Signal, xml: XmlEmitter):
         name = signal.name
@@ -270,6 +273,24 @@ class XmlOutput(OutputFormat):
                 self._emit_attribute("property", "name", prop.name, prop.value, xml)
             xml.end_tag()
 
+        elif isinstance(extension, Responses):
+            xml.start_tag("responses")
+            for response in extension.responses:
+                # todo: translated
+                xml.start_tag(
+                    "response",
+                    id=response.id,
+                    **self._translated_string_attrs(response.value),
+                    enabled=None if response.enabled else "false",
+                    appearance=response.appearance,
+                )
+                if isinstance(response.value, Translated):
+                    xml.put_text(response.value.child.string)
+                else:
+                    xml.put_text(response.value.value)
+                xml.end_tag()
+            xml.end_tag()
+
         elif isinstance(extension, Strings):
             xml.start_tag("items")
             for prop in extension.children:
diff --git a/tests/samples/responses.blp b/tests/samples/responses.blp
new file mode 100644
index 0000000..d7032a7
--- /dev/null
+++ b/tests/samples/responses.blp
@@ -0,0 +1,10 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.MessageDialog {
+  responses [
+    cancel: _("Cancel"),
+    discard: _("Discard") destructive,
+    save: "Save" suggested disabled,
+  ]
+}
\ No newline at end of file
diff --git a/tests/samples/responses.ui b/tests/samples/responses.ui
new file mode 100644
index 0000000..ba26de5
--- /dev/null
+++ b/tests/samples/responses.ui
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <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="save" enabled="false" appearance="suggested">Save</response>
+    </responses>
+  </object>
+</interface>
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index c292214..9988bb6 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -143,6 +143,17 @@ class TestSamples(unittest.TestCase):
             raise AssertionError()
 
     def test_samples(self):
+        try:
+            import gi
+
+            gi.require_version("Adw", "1")
+            from gi.repository import Adw
+
+            have_adw = True
+            Adw.init()
+        except:
+            have_adw = False
+
         self.assert_sample("accessibility")
         self.assert_sample("action_widgets")
         self.assert_sample("child_type")
@@ -166,6 +177,7 @@ class TestSamples(unittest.TestCase):
         )  # The image resource doesn't exist
         self.assert_sample("property")
         self.assert_sample("property_binding")
+        self.assert_sample("responses", skip_run=not have_adw)
         self.assert_sample("signal", skip_run=True)  # The callback doesn't exist
         self.assert_sample("size_group")
         self.assert_sample("string_list")
@@ -257,6 +269,7 @@ class TestSamples(unittest.TestCase):
         self.assert_decompile("property")
         self.assert_decompile("property_binding_dec")
         self.assert_decompile("placeholder_dec")
+        self.assert_decompile("responses")
         self.assert_decompile("signal")
         self.assert_decompile("strings")
         self.assert_decompile("style_dec")

From a2fb86bc3119fc31f0bb40b569c6439b6c91dcb0 Mon Sep 17 00:00:00 2001
From: Cameron Dehning <bedsteler2.0@gmail.com>
Date: Sat, 8 Apr 2023 01:34:47 +0000
Subject: [PATCH 088/290] Builder list factory

---
 .gitignore                                    |  4 ++-
 blueprintcompiler/language/__init__.py        |  2 ++
 .../language/gtk_list_item_factory.py         | 32 +++++++++++++++++++
 blueprintcompiler/outputs/xml/__init__.py     | 10 ++++++
 blueprintcompiler/outputs/xml/xml_emitter.py  |  4 +++
 docs/examples.rst                             | 15 +++++++++
 tests/samples/list_factory.blp                | 11 +++++++
 tests/samples/list_factory.ui                 | 20 ++++++++++++
 tests/test_samples.py                         |  1 +
 9 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 blueprintcompiler/language/gtk_list_item_factory.py
 create mode 100644 tests/samples/list_factory.blp
 create mode 100644 tests/samples/list_factory.ui

diff --git a/.gitignore b/.gitignore
index 43e51bd..9aa4dd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,6 @@ coverage.xml
 /blueprint-regression-tests
 
 /corpus
-/crashes
\ No newline at end of file
+/crashes
+
+.vscode
\ No newline at end of file
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index a7334b1..d251fae 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,3 +1,4 @@
+from .gtk_list_item_factory import ListItemFactory
 from .adw_message_dialog import Responses
 from .attributes import BaseAttribute, BaseTypedAttribute
 from .binding import Binding
@@ -57,6 +58,7 @@ OBJECT_CONTENT_HOOKS.children = [
     Widgets,
     Items,
     Strings,
+    ListItemFactory,
     Responses,
     Child,
 ]
diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
new file mode 100644
index 0000000..d25b96d
--- /dev/null
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -0,0 +1,32 @@
+from .gobject_object import ObjectContent, validate_parent_type
+from ..parse_tree import Keyword
+from ..ast_utils import AstNode, validate
+
+
+class ListItemFactory(AstNode):
+    grammar = [Keyword("template"), ObjectContent]
+
+    @property
+    def gir_class(self):
+        return self.root.gir.get_type("ListItem", "Gtk")
+
+    @validate("template")
+    def container_is_builder_list(self):
+        validate_parent_type(
+            self,
+            "Gtk",
+            "BuilderListItemFactory",
+            "sub-templates",
+        )
+
+    @property
+    def content(self) -> ObjectContent:
+        return self.children[ObjectContent][0]
+
+    @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
+        """
+        return None
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index ad6e658..d6879fd 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -304,6 +304,16 @@ class XmlOutput(OutputFormat):
                     self._emit_value(value, xml)
                     xml.end_tag()
             xml.end_tag()
+        elif isinstance(extension, ListItemFactory):
+            child_xml = XmlEmitter()
+            child_xml.start_tag("interface")
+            child_xml.start_tag("template", **{"class": "GtkListItem"})
+            self._emit_object_or_template(extension, child_xml)
+            child_xml.end_tag()
+            child_xml.end_tag()
+            xml.start_tag("property", name="bytes")
+            xml.put_cdata(child_xml.result)
+            xml.end_tag()
 
         elif isinstance(extension, Styles):
             xml.start_tag("style")
diff --git a/blueprintcompiler/outputs/xml/xml_emitter.py b/blueprintcompiler/outputs/xml/xml_emitter.py
index 374b406..3dd09a0 100644
--- a/blueprintcompiler/outputs/xml/xml_emitter.py
+++ b/blueprintcompiler/outputs/xml/xml_emitter.py
@@ -62,6 +62,10 @@ class XmlEmitter:
         self.result += saxutils.escape(str(text))
         self._needs_newline = False
 
+    def put_cdata(self, text: str):
+        self.result += f"<![CDATA[{text}]]>"
+        self._needs_newline = False
+
     def _indent(self):
         if self.indent is not None:
             self.result += "\n" + " " * (self.indent * len(self._tag_stack))
diff --git a/docs/examples.rst b/docs/examples.rst
index 13b97a8..d1a9762 100644
--- a/docs/examples.rst
+++ b/docs/examples.rst
@@ -414,6 +414,21 @@ Gtk.SizeGroup
    Gtk.Label label1 {}
    Gtk.Label label2 {}
 
+Gtk.BuilderListItemFactory
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block::
+
+    Gtk.ListView {
+      factory: Gtk.BuilderListItemFactory {
+          template {
+              child: Label {
+                  label: "Hello";
+              };
+          }
+      };
+    }
+
 Gtk.StringList
 ~~~~~~~~~~~~~~
 
diff --git a/tests/samples/list_factory.blp b/tests/samples/list_factory.blp
new file mode 100644
index 0000000..ead74c3
--- /dev/null
+++ b/tests/samples/list_factory.blp
@@ -0,0 +1,11 @@
+using Gtk 4.0;
+
+Gtk.ListView {
+    factory: Gtk.BuilderListItemFactory list_item_factory {
+        template {
+            child: Label {
+                label: "Hello";
+            };
+        }
+    };
+}
\ No newline at end of file
diff --git a/tests/samples/list_factory.ui b/tests/samples/list_factory.ui
new file mode 100644
index 0000000..664de85
--- /dev/null
+++ b/tests/samples/list_factory.ui
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="GtkLabel">
+        <property name="label">Hello</property>
+      </object>
+    </property>
+  </template>
+</interface>]]></property>
+      </object>
+    </property>
+  </object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 9988bb6..823488b 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -169,6 +169,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("flags")
         self.assert_sample("id_prop")
         self.assert_sample("layout")
+        self.assert_sample("list_factory")
         self.assert_sample("menu")
         self.assert_sample("numbers")
         self.assert_sample("object_prop")

From 64879491a1143496453f069e493c4519cb00528b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 7 Apr 2023 20:35:14 -0500
Subject: [PATCH 089/290] Fix mypy error

---
 blueprintcompiler/outputs/xml/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index d6879fd..8a2bd6c 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -45,7 +45,9 @@ class XmlOutput(OutputFormat):
         self._emit_object_or_template(obj, xml)
         xml.end_tag()
 
-    def _emit_object_or_template(self, obj: T.Union[Object, Template], xml: XmlEmitter):
+    def _emit_object_or_template(
+        self, obj: T.Union[Object, Template, ListItemFactory], xml: XmlEmitter
+    ):
         for child in obj.content.children:
             if isinstance(child, Property):
                 self._emit_property(child, xml)

From 88f5b4f1c7282b29836861ebecfb945e32e71792 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 28 Mar 2023 10:41:42 -0500
Subject: [PATCH 090/290] Fix template types

---
 blueprintcompiler/completions.py              |  4 +-
 blueprintcompiler/gir.py                      | 64 ++++++++++++++++++-
 blueprintcompiler/language/common.py          |  2 +-
 blueprintcompiler/language/expression.py      |  2 +-
 .../language/gobject_property.py              |  4 +-
 blueprintcompiler/language/gobject_signal.py  |  4 +-
 .../language/gtkbuilder_template.py           |  7 +-
 .../language/property_binding.py              |  6 +-
 blueprintcompiler/language/types.py           |  6 +-
 tests/samples/template_binding.blp            |  5 ++
 tests/samples/template_binding.ui             | 13 ++++
 tests/samples/template_binding_extern.blp     |  5 ++
 tests/samples/template_binding_extern.ui      | 13 ++++
 tests/test_samples.py                         |  6 ++
 14 files changed, 120 insertions(+), 21 deletions(-)
 create mode 100644 tests/samples/template_binding.blp
 create mode 100644 tests/samples/template_binding.ui
 create mode 100644 tests/samples/template_binding_extern.blp
 create mode 100644 tests/samples/template_binding_extern.ui

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index 9940055..6a944dd 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -120,7 +120,7 @@ def gtk_object_completer(ast_node, match_variables):
     matches=new_statement_patterns,
 )
 def property_completer(ast_node, match_variables):
-    if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.UncheckedType):
+    if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.ExternType):
         for prop in ast_node.gir_class.properties:
             yield Completion(prop, CompletionItemKind.Property, snippet=f"{prop}: $0;")
 
@@ -144,7 +144,7 @@ def prop_value_completer(ast_node, match_variables):
     matches=new_statement_patterns,
 )
 def signal_completer(ast_node, match_variables):
-    if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.UncheckedType):
+    if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.ExternType):
         for signal in ast_node.gir_class.signals:
             if not isinstance(ast_node.parent, language.Object):
                 name = "on"
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index a8831af..fc415fd 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -114,8 +114,12 @@ class GirType:
         """The name of the type in the GObject type system, suitable to pass to `g_type_from_name()`."""
         raise NotImplementedError()
 
+    @property
+    def incomplete(self) -> bool:
+        return False
 
-class UncheckedType(GirType):
+
+class ExternType(GirType):
     def __init__(self, name: str) -> None:
         super().__init__()
         self._name = name
@@ -131,6 +135,10 @@ class UncheckedType(GirType):
     def glib_type_name(self) -> str:
         return self._name
 
+    @property
+    def incomplete(self) -> bool:
+        return True
+
 
 class ArrayType(GirType):
     def __init__(self, inner: GirType) -> None:
@@ -507,6 +515,60 @@ class Class(GirNode, GirType):
             yield from impl.signals.values()
 
 
+class TemplateType(GirType):
+    def __init__(self, name: str, parent: T.Optional[Class]):
+        self._name = name
+        self.parent = parent
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @property
+    def full_name(self) -> str:
+        return self._name
+
+    @property
+    def glib_type_name(self) -> str:
+        return self._name
+
+    @cached_property
+    def properties(self) -> T.Mapping[str, Property]:
+        if self.parent is None or isinstance(self.parent, ExternType):
+            return {}
+        else:
+            return self.parent.properties
+
+    @cached_property
+    def signals(self) -> T.Mapping[str, Signal]:
+        if self.parent is None or isinstance(self.parent, ExternType):
+            return {}
+        else:
+            return self.parent.signals
+
+    def assignable_to(self, other: "GirType") -> bool:
+        if self == other:
+            return True
+        elif isinstance(other, Interface):
+            # 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)
+        else:
+            return self.parent.assignable_to(other)
+
+    @cached_property
+    def signature(self) -> str:
+        if self.parent is None:
+            return f"template {self.name}"
+        else:
+            return f"template {self.name} : {self.parent.full_name}"
+
+    @property
+    def incomplete(self) -> bool:
+        return True
+
+
 class EnumMember(GirNode):
     def __init__(self, enum: "Enumeration", tl: typelib.Typelib) -> None:
         super().__init__(enum, tl)
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index 734e59b..082aaa4 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -37,7 +37,7 @@ from ..gir import (
     FloatType,
     GirType,
     Enumeration,
-    UncheckedType,
+    ExternType,
 )
 from ..lsp_utils import Completion, CompletionItemKind, SemanticToken, SemanticTokenType
 from ..parse_tree import *
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index fca7f0e..69323f4 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -141,7 +141,7 @@ class LookupOp(InfixExpr):
                 ],
             )
 
-        if isinstance(self.lhs.type, UncheckedType) or not self.lhs.type_complete:
+        if self.lhs.type.incomplete:
             return
 
         elif not isinstance(self.lhs.type, gir.Class) and not isinstance(
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index b57f3b0..18b91ae 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -46,7 +46,7 @@ class Property(AstNode):
 
     @property
     def gir_property(self):
-        if self.gir_class is not None and not isinstance(self.gir_class, UncheckedType):
+        if self.gir_class is not None and not isinstance(self.gir_class, ExternType):
             return self.gir_class.properties.get(self.tokens["name"])
 
     @context(ValueTypeCtx)
@@ -75,7 +75,7 @@ class Property(AstNode):
 
     @validate("name")
     def property_exists(self):
-        if self.gir_class is None or isinstance(self.gir_class, UncheckedType):
+        if self.gir_class is None or self.gir_class.incomplete:
             # Objects that we have no gir data on should not be validated
             # This happens for classes defined by the app itself
             return
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 0c649b7..25d789b 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -72,7 +72,7 @@ class Signal(AstNode):
 
     @property
     def gir_signal(self):
-        if self.gir_class is not None and not isinstance(self.gir_class, UncheckedType):
+        if self.gir_class is not None and not isinstance(self.gir_class, ExternType):
             return self.gir_class.signals.get(self.tokens["name"])
 
     @property
@@ -90,7 +90,7 @@ class Signal(AstNode):
 
     @validate("name")
     def signal_exists(self):
-        if self.gir_class is None or isinstance(self.gir_class, UncheckedType):
+        if self.gir_class is None or self.gir_class.incomplete:
             # Objects that we have no gir data on should not be validated
             # This happens for classes defined by the app itself
             return
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 40ac7f7..46ff6e6 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -50,11 +50,10 @@ class Template(Object):
 
     @property
     def gir_class(self):
-        # Templates might not have a parent class defined
-        if class_name := self.class_name:
-            return class_name.gir_type
+        if self.class_name is None:
+            return gir.TemplateType(self.id, None)
         else:
-            return gir.UncheckedType(self.id)
+            return gir.TemplateType(self.id, self.class_name.gir_type)
 
     @validate("id")
     def unique_in_parent(self):
diff --git a/blueprintcompiler/language/property_binding.py b/blueprintcompiler/language/property_binding.py
index 37a5c91..5314934 100644
--- a/blueprintcompiler/language/property_binding.py
+++ b/blueprintcompiler/language/property_binding.py
@@ -108,11 +108,7 @@ class PropertyBinding(AstNode):
 
         gir_class = self.source_obj.gir_class
 
-        if (
-            isinstance(self.source_obj, Template)
-            or gir_class is None
-            or isinstance(gir_class, UncheckedType)
-        ):
+        if gir_class is None or gir_class.incomplete:
             # Objects that we have no gir data on should not be validated
             # This happens for classes defined by the app itself
             return
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index 702ed32..510dbc7 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -20,7 +20,7 @@
 
 import typing as T
 from .common import *
-from ..gir import Class, Interface
+from ..gir import Class, ExternType, Interface
 
 
 class TypeName(AstNode):
@@ -70,7 +70,7 @@ class TypeName(AstNode):
                 self.tokens["class_name"], self.tokens["namespace"]
             )
 
-        return gir.UncheckedType(self.tokens["class_name"])
+        return gir.ExternType(self.tokens["class_name"])
 
     @property
     def glib_type_name(self) -> str:
@@ -95,7 +95,7 @@ class ClassName(TypeName):
     def gir_class_exists(self):
         if (
             self.gir_type is not None
-            and not isinstance(self.gir_type, UncheckedType)
+            and not isinstance(self.gir_type, ExternType)
             and not isinstance(self.gir_type, Class)
         ):
             if isinstance(self.gir_type, Interface):
diff --git a/tests/samples/template_binding.blp b/tests/samples/template_binding.blp
new file mode 100644
index 0000000..fa4d53e
--- /dev/null
+++ b/tests/samples/template_binding.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+template MyTemplate : Box {
+  prop1: bind MyTemplate.prop2 as ($MyObject).prop3;
+}
\ No newline at end of file
diff --git a/tests/samples/template_binding.ui b/tests/samples/template_binding.ui
new file mode 100644
index 0000000..7c8b49d
--- /dev/null
+++ b/tests/samples/template_binding.ui
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="MyTemplate" parent="GtkBox">
+    <binding name="prop1">
+      <lookup name="prop3" type="MyObject">
+        <lookup name="prop2" type="MyTemplate">
+          <constant>MyTemplate</constant>
+        </lookup>
+      </lookup>
+    </binding>
+  </template>
+</interface>
diff --git a/tests/samples/template_binding_extern.blp b/tests/samples/template_binding_extern.blp
new file mode 100644
index 0000000..a8a42c3
--- /dev/null
+++ b/tests/samples/template_binding_extern.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+template MyTemplate : $MyParentClass {
+  prop1: bind MyTemplate.prop2 as ($MyObject).prop3;
+}
\ No newline at end of file
diff --git a/tests/samples/template_binding_extern.ui b/tests/samples/template_binding_extern.ui
new file mode 100644
index 0000000..2bbc88f
--- /dev/null
+++ b/tests/samples/template_binding_extern.ui
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="MyTemplate" parent="MyParentClass">
+    <binding name="prop1">
+      <lookup name="prop3" type="MyObject">
+        <lookup name="prop2" type="MyTemplate">
+          <constant>MyTemplate</constant>
+        </lookup>
+      </lookup>
+    </binding>
+  </template>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 823488b..8ee9015 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -187,6 +187,12 @@ class TestSamples(unittest.TestCase):
         self.assert_sample(
             "template", skip_run=True
         )  # The template class doesn't exist
+        self.assert_sample(
+            "template_binding", skip_run=True
+        )  # The template class doesn't exist
+        self.assert_sample(
+            "template_binding_extern", skip_run=True
+        )  # The template class doesn't exist
         self.assert_sample(
             "template_no_parent", skip_run=True
         )  # The template class doesn't exist

From d6bd282e58341b5a131e7bfa21852ce239fb94a2 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 9 Apr 2023 16:50:36 -0500
Subject: [PATCH 091/290] errors: Report version in compiler bug message

---
 blueprintcompiler/errors.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 4a18589..3fc2666 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -170,8 +170,11 @@ def assert_true(truth: bool, message: T.Optional[str] = None):
 def report_bug():  # pragma: no cover
     """Report an error and ask people to report it."""
 
+    from . import main
+
     print(traceback.format_exc())
-    print(f"Arguments: {sys.argv}\n")
+    print(f"Arguments: {sys.argv}")
+    print(f"Version: {main.VERSION}\n")
     print(
         f"""{Colors.BOLD}{Colors.RED}***** COMPILER BUG *****
 The blueprint-compiler program has crashed. Please report the above stacktrace,

From 02796fd830a09156de6a4b4e3b42cbbf94185d94 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 10 Apr 2023 09:38:56 -0500
Subject: [PATCH 092/290] Use <> instead of () for casts & typeof

This makes it clearer that they aren't functions, and it eliminates
syntactic ambiguity with closure expressions.
---
 blueprintcompiler/language/expression.py  | 25 +++++++++++++++++++-
 blueprintcompiler/language/types.py       |  9 ++++++++
 blueprintcompiler/language/values.py      | 28 ++++++++++++++++++++---
 tests/sample_errors/warn_old_extern.err   |  1 +
 tests/samples/expr_closure.blp            |  2 +-
 tests/samples/expr_closure_args.blp       |  2 +-
 tests/samples/expr_lookup.blp             |  2 +-
 tests/samples/template_binding.blp        |  2 +-
 tests/samples/template_binding_extern.blp |  2 +-
 tests/samples/typeof.blp                  |  4 ++--
 10 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 69323f4..16ee33c 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -159,7 +159,17 @@ class LookupOp(InfixExpr):
 
 
 class CastExpr(InfixExpr):
-    grammar = ["as", "(", TypeName, ")"]
+    grammar = [
+        "as",
+        AnyOf(
+            ["<", TypeName, Match(">").expected()],
+            [
+                UseExact("lparen", "("),
+                TypeName,
+                UseExact("rparen", ")").expected("')'"),
+            ],
+        ),
+    ]
 
     @context(ValueTypeCtx)
     def value_type(self):
@@ -183,6 +193,19 @@ class CastExpr(InfixExpr):
                 f"Invalid cast. No instance of {self.lhs.type.full_name} can be an instance of {self.type.full_name}."
             )
 
+    @validate("lparen", "rparen")
+    def upgrade_to_angle_brackets(self):
+        if self.tokens["lparen"]:
+            raise UpgradeWarning(
+                "Use angle bracket syntax introduced in blueprint 0.8.0",
+                actions=[
+                    CodeAction(
+                        "Use <> instead of ()",
+                        f"<{self.children[TypeName][0].as_string}>",
+                    )
+                ],
+            )
+
 
 class ClosureArg(AstNode):
     grammar = ExprChain
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index 510dbc7..34e9558 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -89,6 +89,15 @@ class TypeName(AstNode):
         if self.gir_type:
             return self.gir_type.doc
 
+    @property
+    def as_string(self) -> str:
+        if self.tokens["extern"]:
+            return "$" + self.tokens["class_name"]
+        elif self.tokens["namespace"]:
+            return f"{self.tokens['namespace']}.{self.tokens['class_name']}"
+        else:
+            return self.tokens["class_name"]
+
 
 class ClassName(TypeName):
     @validate("namespace", "class_name")
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index e446b29..0141a2f 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -74,9 +74,18 @@ class Translated(AstNode):
 class TypeLiteral(AstNode):
     grammar = [
         "typeof",
-        "(",
-        to_parse_node(TypeName).expected("type name"),
-        Match(")").expected(),
+        AnyOf(
+            [
+                "<",
+                to_parse_node(TypeName).expected("type name"),
+                Match(">").expected(),
+            ],
+            [
+                UseExact("lparen", "("),
+                to_parse_node(TypeName).expected("type name"),
+                UseExact("rparen", ")").expected("')'"),
+            ],
+        ),
     ]
 
     @property
@@ -93,6 +102,19 @@ class TypeLiteral(AstNode):
         if expected_type is not None and not isinstance(expected_type, gir.TypeType):
             raise CompileError(f"Cannot convert GType to {expected_type.full_name}")
 
+    @validate("lparen", "rparen")
+    def upgrade_to_angle_brackets(self):
+        if self.tokens["lparen"]:
+            raise UpgradeWarning(
+                "Use angle bracket syntax introduced in blueprint 0.8.0",
+                actions=[
+                    CodeAction(
+                        "Use <> instead of ()",
+                        f"<{self.children[TypeName][0].as_string}>",
+                    )
+                ],
+            )
+
 
 class QuotedLiteral(AstNode):
     grammar = UseQuoted("value")
diff --git a/tests/sample_errors/warn_old_extern.err b/tests/sample_errors/warn_old_extern.err
index c3b3fe2..5adf398 100644
--- a/tests/sample_errors/warn_old_extern.err
+++ b/tests/sample_errors/warn_old_extern.err
@@ -1,3 +1,4 @@
 3,1,8,Use the '$' extern syntax introduced in blueprint 0.8.0
+4,15,15,Use angle bracket syntax introduced in blueprint 0.8.0
 4,16,13,Use the '$' extern syntax introduced in blueprint 0.8.0
 5,14,7,Use the '$' extern syntax introduced in blueprint 0.8.0
\ No newline at end of file
diff --git a/tests/samples/expr_closure.blp b/tests/samples/expr_closure.blp
index 99874e8..81c3f2c 100644
--- a/tests/samples/expr_closure.blp
+++ b/tests/samples/expr_closure.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 Label my-label {
-  label: bind ($my-closure(my-label.margin-bottom)) as (string);
+  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 d09c881..5699094 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);
+  label: bind $my-closure (true, 10, "Hello") as <string>;
 }
\ No newline at end of file
diff --git a/tests/samples/expr_lookup.blp b/tests/samples/expr_lookup.blp
index 2556f9a..12e2de1 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/template_binding.blp b/tests/samples/template_binding.blp
index fa4d53e..bbe6e8d 100644
--- a/tests/samples/template_binding.blp
+++ b/tests/samples/template_binding.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 template MyTemplate : Box {
-  prop1: bind MyTemplate.prop2 as ($MyObject).prop3;
+  prop1: bind MyTemplate.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 a8a42c3..2e4728e 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 {
-  prop1: bind MyTemplate.prop2 as ($MyObject).prop3;
+  prop1: bind MyTemplate.prop2 as <$MyObject>.prop3;
 }
\ No newline at end of file
diff --git a/tests/samples/typeof.blp b/tests/samples/typeof.blp
index cdc1b46..6f4bee9 100644
--- a/tests/samples/typeof.blp
+++ b/tests/samples/typeof.blp
@@ -3,9 +3,9 @@ using GObject 2.0;
 using Gio 2.0;
 
 Gio.ListStore {
-  item-type: typeof(GObject.Object);
+  item-type: typeof<GObject.Object>;
 }
 
 Gio.ListStore {
-  item-type: typeof($MyObject);
+  item-type: typeof<$MyObject>;
 }
\ No newline at end of file

From 5bfed72674a191acf1b97d75025bf8a3f5a7ab27 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 12 Apr 2023 10:32:25 -0500
Subject: [PATCH 093/290] Update regression tests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0295b09..7522ecb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ build:
     - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
-    - git checkout 59eecfbd73020889410da6cc9f5ce90e5b6f9e24
+    - git checkout 3077f669fc9c8e3ceb4da85e6bda680c297c58a2
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'

From ac2a7d9282580c08f97935b8ccad5078a3a30f3f Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 11 Apr 2023 21:26:37 -0500
Subject: [PATCH 094/290] Add StringValue

Makes the grammar more specific in a few places that take only a string
literal or translated string.
---
 blueprintcompiler/language/__init__.py        |  1 +
 .../language/adw_message_dialog.py            |  6 +--
 .../language/gtk_combo_box_text.py            | 12 ++----
 blueprintcompiler/language/gtk_menu.py        | 14 +++----
 blueprintcompiler/language/gtk_string_list.py | 11 +++--
 blueprintcompiler/language/values.py          | 21 ++++++++++
 blueprintcompiler/outputs/xml/__init__.py     | 41 +++++++++++--------
 tests/sample_errors/obj_in_string_list.err    |  2 +-
 8 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index d251fae..45e5361 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -37,6 +37,7 @@ from .values import (
     NumberLiteral,
     ObjectValue,
     QuotedLiteral,
+    StringValue,
     Translated,
     TranslatedWithContext,
     TranslatedWithoutContext,
diff --git a/blueprintcompiler/language/adw_message_dialog.py b/blueprintcompiler/language/adw_message_dialog.py
index 2911735..3aa1911 100644
--- a/blueprintcompiler/language/adw_message_dialog.py
+++ b/blueprintcompiler/language/adw_message_dialog.py
@@ -22,14 +22,14 @@ from ..decompiler import truthy, decompile_translatable
 from .common import *
 from .contexts import ValueTypeCtx
 from .gobject_object import ObjectContent, validate_parent_type
-from .values import QuotedLiteral, Translated
+from .values import StringValue
 
 
 class Response(AstNode):
     grammar = [
         UseIdent("id"),
         Match(":").expected(),
-        AnyOf(QuotedLiteral, Translated).expected("a value"),
+        to_parse_node(StringValue).expected("a string or translatable string"),
         ZeroOrMore(
             AnyOf(Keyword("destructive"), Keyword("suggested"), Keyword("disabled"))
         ),
@@ -52,7 +52,7 @@ class Response(AstNode):
         return "disabled" not in self.tokens
 
     @property
-    def value(self) -> T.Union[QuotedLiteral, Translated]:
+    def value(self) -> StringValue:
         return self.children[0]
 
     @context(ValueTypeCtx)
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index e1a8a12..b20eaf0 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -22,7 +22,7 @@ from .attributes import BaseTypedAttribute
 from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
 from .contexts import ValueTypeCtx
-from .values import Value
+from .values import StringValue
 
 
 class Item(AstNode):
@@ -31,12 +31,8 @@ class Item(AstNode):
         return self.tokens["name"]
 
     @property
-    def value(self) -> Value:
-        return self.children[Value][0]
-
-    @context(ValueTypeCtx)
-    def value_type(self) -> ValueTypeCtx:
-        return ValueTypeCtx(StringType())
+    def value(self) -> StringValue:
+        return self.children[StringValue][0]
 
 
 item = Group(
@@ -48,7 +44,7 @@ item = Group(
                 ":",
             ]
         ),
-        Value,
+        StringValue,
     ],
 )
 
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index df4b031..2d3b65b 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -19,7 +19,7 @@
 
 import typing as T
 
-from blueprintcompiler.language.values import Value
+from blueprintcompiler.language.values import StringValue
 
 from .attributes import BaseAttribute
 from .gobject_object import Object, ObjectContent
@@ -58,8 +58,8 @@ class MenuAttribute(AstNode):
         return self.tokens["name"]
 
     @property
-    def value(self) -> Value:
-        return self.children[Value][0]
+    def value(self) -> StringValue:
+        return self.children[StringValue][0]
 
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
@@ -85,7 +85,7 @@ menu_attribute = Group(
     [
         UseIdent("name"),
         ":",
-        Err(Value, "Expected a value"),
+        Err(StringValue, "Expected string or translated string"),
         Match(";").expected(),
     ],
 )
@@ -109,7 +109,7 @@ menu_item_shorthand = Group(
         "(",
         Group(
             MenuAttribute,
-            [UseLiteral("name", "label"), Value],
+            [UseLiteral("name", "label"), StringValue],
         ),
         Optional(
             [
@@ -118,14 +118,14 @@ menu_item_shorthand = Group(
                     [
                         Group(
                             MenuAttribute,
-                            [UseLiteral("name", "action"), Value],
+                            [UseLiteral("name", "action"), StringValue],
                         ),
                         Optional(
                             [
                                 ",",
                                 Group(
                                     MenuAttribute,
-                                    [UseLiteral("name", "icon"), Value],
+                                    [UseLiteral("name", "icon"), StringValue],
                                 ),
                             ]
                         ),
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index b07fa69..c6aed81 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -20,17 +20,16 @@
 
 from .attributes import BaseTypedAttribute
 from .gobject_object import ObjectContent, validate_parent_type
-from .values import Value, Translated
+from .values import StringValue
 from .common import *
-from .contexts import ValueTypeCtx
 
 
 class Item(AstNode):
-    grammar = Value
+    grammar = StringValue
 
-    @context(ValueTypeCtx)
-    def value_type(self) -> ValueTypeCtx:
-        return ValueTypeCtx(StringType())
+    @property
+    def child(self) -> StringValue:
+        return self.children[StringValue][0]
 
 
 class Strings(AstNode):
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 0141a2f..bfc17c6 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -368,3 +368,24 @@ class Value(AstNode):
         self,
     ) -> T.Union[PropertyBinding, Binding, Translated, ObjectValue, Flags, Literal]:
         return self.children[0]
+
+
+class StringValue(AstNode):
+    grammar = AnyOf(Translated, QuotedLiteral)
+
+    @property
+    def child(
+        self,
+    ) -> T.Union[Translated, QuotedLiteral]:
+        return self.children[0]
+
+    @property
+    def string(self) -> str:
+        if isinstance(self.child, Translated):
+            return self.child.child.string
+        else:
+            return self.child.value
+
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        return ValueTypeCtx(StringType())
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 8a2bd6c..0daae44 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -78,7 +78,13 @@ class XmlOutput(OutputFormat):
             if isinstance(child, Menu):
                 self._emit_menu(child, xml)
             elif isinstance(child, MenuAttribute):
-                self._emit_attribute("attribute", "name", child.name, child.value, xml)
+                xml.start_tag(
+                    "attribute",
+                    name=child.name,
+                    **self._translated_string_attrs(child.value.child),
+                )
+                xml.put_text(child.value.string)
+                xml.end_tag()
             else:
                 raise CompilerBugError()
         xml.end_tag()
@@ -235,7 +241,12 @@ class XmlOutput(OutputFormat):
         xml.end_tag()
 
     def _emit_attribute(
-        self, tag: str, attr: str, name: str, value: Value, xml: XmlEmitter
+        self,
+        tag: str,
+        attr: str,
+        name: str,
+        value: T.Union[Value, StringValue],
+        xml: XmlEmitter,
     ):
         attrs = {attr: name}
 
@@ -243,6 +254,10 @@ class XmlOutput(OutputFormat):
             xml.start_tag(tag, **attrs, **self._translated_string_attrs(value.child))
             xml.put_text(value.child.child.string)
             xml.end_tag()
+        elif isinstance(value.child, QuotedLiteral):
+            xml.start_tag(tag, **attrs)
+            xml.put_text(value.child.value)
+            xml.end_tag()
         else:
             xml.start_tag(tag, **attrs)
             self._emit_value(value, xml)
@@ -282,29 +297,21 @@ class XmlOutput(OutputFormat):
                 xml.start_tag(
                     "response",
                     id=response.id,
-                    **self._translated_string_attrs(response.value),
+                    **self._translated_string_attrs(response.value.child),
                     enabled=None if response.enabled else "false",
                     appearance=response.appearance,
                 )
-                if isinstance(response.value, Translated):
-                    xml.put_text(response.value.child.string)
-                else:
-                    xml.put_text(response.value.value)
+                xml.put_text(response.value.string)
                 xml.end_tag()
             xml.end_tag()
 
         elif isinstance(extension, Strings):
             xml.start_tag("items")
-            for prop in extension.children:
-                value = prop.children[Value][0]
-                if isinstance(value.child, Translated):
-                    xml.start_tag("item", **self._translated_string_attrs(value))
-                    xml.put_text(value.child.child.string)
-                    xml.end_tag()
-                else:
-                    xml.start_tag("item")
-                    self._emit_value(value, xml)
-                    xml.end_tag()
+            for string in extension.children:
+                value = string.child
+                xml.start_tag("item", **self._translated_string_attrs(value.child))
+                xml.put_text(value.string)
+                xml.end_tag()
             xml.end_tag()
         elif isinstance(extension, ListItemFactory):
             child_xml = XmlEmitter()
diff --git a/tests/sample_errors/obj_in_string_list.err b/tests/sample_errors/obj_in_string_list.err
index 67628a3..9988af9 100644
--- a/tests/sample_errors/obj_in_string_list.err
+++ b/tests/sample_errors/obj_in_string_list.err
@@ -1 +1 @@
-5,5,2,Cannot assign Gtk.Button to string
+4,3,22,Unexpected tokens

From 75055ac967a9824e186fa87903eb02866e0fd5cc Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 9 Apr 2023 18:18:01 -0500
Subject: [PATCH 095/290] Move bindings out of the Value syntax

They're only valid in properties, so they should just be there. Same
with object values.
---
 blueprintcompiler/language/binding.py         |  5 --
 blueprintcompiler/language/contexts.py        |  1 -
 .../language/gobject_property.py              | 25 +++++-----
 .../language/property_binding.py              |  5 --
 blueprintcompiler/language/values.py          |  4 +-
 blueprintcompiler/outputs/xml/__init__.py     | 50 +++++++++++--------
 tests/sample_errors/read_only_properties.err  |  2 +-
 7 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/blueprintcompiler/language/binding.py b/blueprintcompiler/language/binding.py
index ab544ca..b2dee10 100644
--- a/blueprintcompiler/language/binding.py
+++ b/blueprintcompiler/language/binding.py
@@ -47,11 +47,6 @@ class Binding(AstNode):
                     )
         return None
 
-    @validate("bind")
-    def not_bindable(self) -> None:
-        if binding_error := self.context[ValueTypeCtx].binding_error:
-            raise binding_error
-
 
 @dataclass
 class SimpleBinding:
diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
index f5b92c2..fec38f7 100644
--- a/blueprintcompiler/language/contexts.py
+++ b/blueprintcompiler/language/contexts.py
@@ -25,4 +25,3 @@ from .common import *
 @dataclass
 class ValueTypeCtx:
     value_type: T.Optional[GirType]
-    binding_error: T.Optional[CompileError] = None
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 18b91ae..6beb738 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -22,7 +22,7 @@ from dataclasses import dataclass
 from .expression import ExprChain
 from .gobject_object import Object
 from .gtkbuilder_template import Template
-from .values import Value, Translated
+from .values import Value, ObjectValue
 from .common import *
 from .contexts import ValueTypeCtx
 from .property_binding import PropertyBinding
@@ -30,14 +30,16 @@ from .binding import Binding
 
 
 class Property(AstNode):
-    grammar = Statement(UseIdent("name"), ":", Value)
+    grammar = Statement(
+        UseIdent("name"), ":", AnyOf(PropertyBinding, Binding, ObjectValue, Value)
+    )
 
     @property
     def name(self) -> str:
         return self.tokens["name"]
 
     @property
-    def value(self) -> Value:
+    def value(self) -> T.Union[PropertyBinding, Binding, ObjectValue, Value]:
         return self.children[0]
 
     @property
@@ -49,29 +51,26 @@ class Property(AstNode):
         if self.gir_class is not None and not isinstance(self.gir_class, ExternType):
             return self.gir_class.properties.get(self.tokens["name"])
 
-    @context(ValueTypeCtx)
-    def value_type(self) -> ValueTypeCtx:
+    @validate()
+    def binding_valid(self):
         if (
-            (
-                isinstance(self.value.child, PropertyBinding)
-                or isinstance(self.value.child, Binding)
-            )
+            (isinstance(self.value, PropertyBinding) or isinstance(self.value, Binding))
             and self.gir_property is not None
             and self.gir_property.construct_only
         ):
-            binding_error = CompileError(
+            raise CompileError(
                 f"{self.gir_property.full_name} can't be bound because it is construct-only",
                 hints=["construct-only properties may only be set to a static value"],
             )
-        else:
-            binding_error = None
 
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
         if self.gir_property is not None:
             type = self.gir_property.type
         else:
             type = None
 
-        return ValueTypeCtx(type, binding_error)
+        return ValueTypeCtx(type)
 
     @validate("name")
     def property_exists(self):
diff --git a/blueprintcompiler/language/property_binding.py b/blueprintcompiler/language/property_binding.py
index 5314934..ba8a29d 100644
--- a/blueprintcompiler/language/property_binding.py
+++ b/blueprintcompiler/language/property_binding.py
@@ -121,11 +121,6 @@ class PropertyBinding(AstNode):
                 f"{gir_class.full_name} does not have a property called {self.property_name}"
             )
 
-    @validate("bind-property")
-    def not_bindable(self) -> None:
-        if binding_error := self.context[ValueTypeCtx].binding_error:
-            raise binding_error
-
     @validate("bind")
     def old_bind(self):
         if self.tokens["bind"]:
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index bfc17c6..a1666cc 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -361,12 +361,12 @@ class ObjectValue(AstNode):
 
 
 class Value(AstNode):
-    grammar = AnyOf(PropertyBinding, Binding, Translated, ObjectValue, Flags, Literal)
+    grammar = AnyOf(Translated, Flags, Literal)
 
     @property
     def child(
         self,
-    ) -> T.Union[PropertyBinding, Binding, Translated, ObjectValue, Flags, Literal]:
+    ) -> T.Union[Translated, Flags, Literal]:
         return self.children[0]
 
 
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 0daae44..42d9b21 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -91,48 +91,58 @@ class XmlOutput(OutputFormat):
 
     def _emit_property(self, property: Property, xml: XmlEmitter):
         value = property.value
-        child = value.child
 
         props: T.Dict[str, T.Optional[str]] = {
             "name": property.name,
         }
 
-        if isinstance(child, Translated):
-            xml.start_tag("property", **props, **self._translated_string_attrs(child))
-            xml.put_text(child.child.string)
-            xml.end_tag()
-        elif isinstance(child, Object):
-            xml.start_tag("property", **props)
-            self._emit_object(child, xml)
-            xml.end_tag()
-        elif isinstance(child, Binding):
-            if simple := child.simple_binding:
+        if isinstance(value, Value):
+            child = value.child
+
+            if isinstance(child, Translated):
+                xml.start_tag(
+                    "property", **props, **self._translated_string_attrs(child)
+                )
+                xml.put_text(child.child.string)
+                xml.end_tag()
+            else:
+                xml.start_tag("property", **props)
+                self._emit_value(value, xml)
+                xml.end_tag()
+
+        elif isinstance(value, Binding):
+            if simple := value.simple_binding:
                 props["bind-source"] = simple.source
                 props["bind-property"] = simple.property_name
                 props["bind-flags"] = "sync-create"
                 xml.put_self_closing("property", **props)
             else:
                 xml.start_tag("binding", **props)
-                self._emit_expression(child.expression, xml)
+                self._emit_expression(value.expression, xml)
                 xml.end_tag()
-        elif isinstance(child, PropertyBinding):
+
+        elif isinstance(value, PropertyBinding):
             bind_flags = []
-            if not child.no_sync_create:
+            if not value.no_sync_create:
                 bind_flags.append("sync-create")
-            if child.inverted:
+            if value.inverted:
                 bind_flags.append("invert-boolean")
-            if child.bidirectional:
+            if value.bidirectional:
                 bind_flags.append("bidirectional")
 
-            props["bind-source"] = child.source
-            props["bind-property"] = child.property_name
+            props["bind-source"] = value.source
+            props["bind-property"] = value.property_name
             props["bind-flags"] = "|".join(bind_flags) or None
             xml.put_self_closing("property", **props)
-        else:
+
+        elif isinstance(value, ObjectValue):
             xml.start_tag("property", **props)
-            self._emit_value(value, xml)
+            self._emit_object(value.object, xml)
             xml.end_tag()
 
+        else:
+            raise CompilerBugError()
+
     def _translated_string_attrs(
         self, translated: T.Union[QuotedLiteral, Translated]
     ) -> T.Dict[str, T.Optional[str]]:
diff --git a/tests/sample_errors/read_only_properties.err b/tests/sample_errors/read_only_properties.err
index dc03297..e30e801 100644
--- a/tests/sample_errors/read_only_properties.err
+++ b/tests/sample_errors/read_only_properties.err
@@ -1,2 +1,2 @@
-4,14,4,ComboBox.has-entry can't be bound because it is construct-only
+4,3,34,ComboBox.has-entry can't be bound because it is construct-only
 5,3,12,Widget.scale-factor is not writable

From dd3c75d2c772bb6c6d3b7fc60370d2dd16002a4c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 9 Apr 2023 15:26:07 -0500
Subject: [PATCH 096/290] Update menu syntax

Sections and submenus can have IDs. Also, change the code to better
reflect the documented grammar.
---
 blueprintcompiler/language/gtk_menu.py        | 65 +++++++++++--------
 .../sample_errors/menu_toplevel_attribute.blp |  2 +-
 .../sample_errors/menu_toplevel_attribute.err |  4 +-
 tests/samples/menu.blp                        |  2 +-
 tests/samples/menu.ui                         |  2 +-
 tests/samples/menu_dec.blp                    |  2 +-
 6 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 2d3b65b..83b5e63 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -24,6 +24,7 @@ from blueprintcompiler.language.values import StringValue
 from .attributes import BaseAttribute
 from .gobject_object import Object, ObjectContent
 from .common import *
+from .values import Translated, QuotedLiteral
 from .contexts import ValueTypeCtx
 
 
@@ -50,6 +51,14 @@ class Menu(AstNode):
             raise CompileError("Menu requires an ID")
 
 
+class MenuValue(AstNode):
+    grammar = AnyOf(QuotedLiteral, Translated)
+
+    @property
+    def child(self) -> T.Union[QuotedLiteral, Translated]:
+        return self.children[0]
+
+
 class MenuAttribute(AstNode):
     tag_name = "attribute"
 
@@ -63,22 +72,10 @@ class MenuAttribute(AstNode):
 
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
-        return ValueTypeCtx(
-            None, binding_error=CompileError("Bindings are not permitted in menus")
-        )
+        return ValueTypeCtx(None)
 
 
-menu_contents = Sequence()
-
-menu_section = Group(
-    Menu,
-    ["section", UseLiteral("tag", "section"), Optional(UseIdent("id")), menu_contents],
-)
-
-menu_submenu = Group(
-    Menu,
-    ["submenu", UseLiteral("tag", "submenu"), Optional(UseIdent("id")), menu_contents],
-)
+menu_child = AnyOf()
 
 menu_attribute = Group(
     MenuAttribute,
@@ -90,12 +87,33 @@ menu_attribute = Group(
     ],
 )
 
+menu_section = Group(
+    Menu,
+    [
+        "section",
+        UseLiteral("tag", "section"),
+        Optional(UseIdent("id")),
+        Match("{").expected(),
+        Until(AnyOf(menu_child, menu_attribute), "}"),
+    ],
+)
+
+menu_submenu = Group(
+    Menu,
+    [
+        "submenu",
+        UseLiteral("tag", "submenu"),
+        Optional(UseIdent("id")),
+        Match("{").expected(),
+        Until(AnyOf(menu_child, menu_attribute), "}"),
+    ],
+)
+
 menu_item = Group(
     Menu,
     [
         "item",
         UseLiteral("tag", "item"),
-        Optional(UseIdent("id")),
         Match("{").expected(),
         Until(menu_attribute, "}"),
     ],
@@ -137,18 +155,11 @@ menu_item_shorthand = Group(
     ],
 )
 
-menu_contents.children = [
-    Match("{"),
-    Until(
-        AnyOf(
-            menu_section,
-            menu_submenu,
-            menu_item_shorthand,
-            menu_item,
-            menu_attribute,
-        ),
-        "}",
-    ),
+menu_child.children = [
+    menu_section,
+    menu_submenu,
+    menu_item_shorthand,
+    menu_item,
 ]
 
 menu: Group = Group(
diff --git a/tests/sample_errors/menu_toplevel_attribute.blp b/tests/sample_errors/menu_toplevel_attribute.blp
index e9923c2..05ae13e 100644
--- a/tests/sample_errors/menu_toplevel_attribute.blp
+++ b/tests/sample_errors/menu_toplevel_attribute.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 menu menu {
-    not-allowed: true;
+    not-allowed: "true";
 }
\ No newline at end of file
diff --git a/tests/sample_errors/menu_toplevel_attribute.err b/tests/sample_errors/menu_toplevel_attribute.err
index 45713cf..8f3ef26 100644
--- a/tests/sample_errors/menu_toplevel_attribute.err
+++ b/tests/sample_errors/menu_toplevel_attribute.err
@@ -1,2 +1,2 @@
-4,5,19,Attributes are not permitted at the top level of a menu
-4,16,8,Unexpected tokens
\ No newline at end of file
+4,5,21,Attributes are not permitted at the top level of a menu
+4,16,10,Unexpected tokens
\ No newline at end of file
diff --git a/tests/samples/menu.blp b/tests/samples/menu.blp
index 4c52bab..4d4b14d 100644
--- a/tests/samples/menu.blp
+++ b/tests/samples/menu.blp
@@ -7,7 +7,7 @@ menu my-menu {
     }
 
     item {
-      label: "test item";
+      label: C_("context", "test translated item");
     }
 
     item ("test item shorthand 1")
diff --git a/tests/samples/menu.ui b/tests/samples/menu.ui
index 3ba1fed..3b19896 100644
--- a/tests/samples/menu.ui
+++ b/tests/samples/menu.ui
@@ -7,7 +7,7 @@
         <attribute name="label">test section</attribute>
       </section>
       <item>
-        <attribute name="label">test item</attribute>
+        <attribute name="label" translatable="true" context="context">test translated item</attribute>
       </item>
       <item>
         <attribute name="label">test item shorthand 1</attribute>
diff --git a/tests/samples/menu_dec.blp b/tests/samples/menu_dec.blp
index 64a6021..14b4df3 100644
--- a/tests/samples/menu_dec.blp
+++ b/tests/samples/menu_dec.blp
@@ -7,7 +7,7 @@ menu my-menu {
     }
 
     item {
-      label: "test item";
+      label: C_("context", "test translated item");
     }
 
     item {

From ff5fff7f4ba900aa51fd55d71e4093f40fa51d13 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 12 Apr 2023 10:36:19 -0500
Subject: [PATCH 097/290] Fix crash

---
 blueprintcompiler/ast_utils.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 73ffe62..ab692bc 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -46,7 +46,10 @@ class Children:
 
     def __getitem__(self, key):
         if isinstance(key, int):
-            return self._children[key]
+            if key >= len(self._children):
+                return None
+            else:
+                return self._children[key]
         else:
             return [child for child in self._children if isinstance(child, key)]
 

From ec844b10cae20870189b81e3236952a8b2a8de17 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 28 Apr 2023 20:16:27 -0500
Subject: [PATCH 098/290] Add ScopeCtx instead of root.objects_by_id

This allows us to introduce new scopes, such as in
GtkBuilderListItemFactory templates.
---
 blueprintcompiler/ast_utils.py                | 14 ++++----
 blueprintcompiler/language/contexts.py        | 35 +++++++++++++++++++
 blueprintcompiler/language/expression.py      |  6 ++--
 blueprintcompiler/language/gobject_signal.py  |  3 +-
 blueprintcompiler/language/gtk_size_group.py  |  8 +++--
 .../language/property_binding.py              |  6 ++--
 blueprintcompiler/language/ui.py              | 25 +++----------
 blueprintcompiler/language/values.py          |  8 ++---
 8 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index ab692bc..5019098 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -33,7 +33,7 @@ class Children:
     def __init__(self, children):
         self._children = children
 
-    def __iter__(self):
+    def __iter__(self) -> T.Iterator["AstNode"]:
         return iter(self._children)
 
     @T.overload
@@ -175,11 +175,6 @@ class AstNode:
         for child in self.children:
             yield from child.get_semantic_tokens()
 
-    def iterate_children_recursive(self) -> T.Iterator["AstNode"]:
-        yield self
-        for child in self.children:
-            yield from child.iterate_children_recursive()
-
     def validate_unique_in_parent(self, error, check=None):
         for child in self.parent.children:
             if child is self:
@@ -270,7 +265,12 @@ class Context:
     def __get__(self, instance, owner):
         if instance is None:
             return self
-        return self.func(instance)
+        if ctx := getattr(instance, "_context_" + self.type.__name__, None):
+            return ctx
+        else:
+            ctx = self.func(instance)
+            setattr(instance, "_context_" + self.type.__name__, ctx)
+            return ctx
 
 
 def context(type: T.Type[TCtx]):
diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
index fec38f7..49b7b40 100644
--- a/blueprintcompiler/language/contexts.py
+++ b/blueprintcompiler/language/contexts.py
@@ -19,9 +19,44 @@
 
 import typing as T
 from dataclasses import dataclass
+from functools import cached_property
+
 from .common import *
+from .gobject_object import Object
 
 
 @dataclass
 class ValueTypeCtx:
     value_type: T.Optional[GirType]
+
+
+@dataclass
+class ScopeCtx:
+    node: AstNode
+
+    @cached_property
+    def objects(self) -> T.Dict[str, Object]:
+        return {
+            obj.tokens["id"]: obj
+            for obj in self._iter_recursive(self.node)
+            if obj.tokens["id"] is not None
+        }
+
+    def validate_unique_ids(self) -> None:
+        passed = {}
+        for obj in self._iter_recursive(self.node):
+            if obj.tokens["id"] is None:
+                continue
+
+            if obj.tokens["id"] in passed:
+                token = obj.group.tokens["id"]
+                raise CompileError(
+                    f"Duplicate object ID '{obj.tokens['id']}'", token.start, token.end
+                )
+            passed[obj.tokens["id"]] = obj
+
+    def _iter_recursive(self, node: AstNode):
+        yield node
+        for child in node.children:
+            if child.context[ScopeCtx] is self:
+                yield from self._iter_recursive(child)
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 16ee33c..0cf41b0 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -19,7 +19,7 @@
 
 
 from .common import *
-from .contexts import ValueTypeCtx
+from .contexts import ScopeCtx, ValueTypeCtx
 from .types import TypeName
 from .gtkbuilder_template import Template
 
@@ -87,7 +87,7 @@ class LiteralExpr(Expr):
 
         return (
             isinstance(self.literal.value, IdentLiteral)
-            and self.literal.value.ident in self.root.objects_by_id
+            and self.literal.value.ident in self.context[ScopeCtx].objects
         )
 
     @property
@@ -105,7 +105,7 @@ class LiteralExpr(Expr):
         from .values import IdentLiteral
 
         if isinstance(self.literal.value, IdentLiteral):
-            if object := self.root.objects_by_id.get(self.literal.value.ident):
+            if object := self.context[ScopeCtx].objects.get(self.literal.value.ident):
                 return not isinstance(object, Template)
         return True
 
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 25d789b..e5c71c6 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -20,6 +20,7 @@
 import typing as T
 
 from .gtkbuilder_template import Template
+from .contexts import ScopeCtx
 from .common import *
 
 
@@ -112,7 +113,7 @@ class Signal(AstNode):
         if object_id is None:
             return
 
-        if self.root.objects_by_id.get(object_id) is None:
+        if self.context[ScopeCtx].objects.get(object_id) is None:
             raise CompileError(f"Could not find object with ID '{object_id}'")
 
     @docs("name")
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index 80c47af..6a3ecb1 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -20,6 +20,7 @@
 
 from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
+from .contexts import ScopeCtx
 
 
 class Widget(AstNode):
@@ -27,12 +28,15 @@ class Widget(AstNode):
 
     @validate("name")
     def obj_widget(self):
-        object = self.root.objects_by_id.get(self.tokens["name"])
+        object = self.context[ScopeCtx].objects.get(self.tokens["name"])
         type = self.root.gir.get_type("Widget", "Gtk")
         if object is None:
             raise CompileError(
                 f"Could not find object with ID {self.tokens['name']}",
-                did_you_mean=(self.tokens["name"], self.root.objects_by_id.keys()),
+                did_you_mean=(
+                    self.tokens["name"],
+                    self.context[ScopeCtx].objects.keys(),
+                ),
             )
         elif object.gir_class and not object.gir_class.assignable_to(type):
             raise CompileError(
diff --git a/blueprintcompiler/language/property_binding.py b/blueprintcompiler/language/property_binding.py
index ba8a29d..101bef5 100644
--- a/blueprintcompiler/language/property_binding.py
+++ b/blueprintcompiler/language/property_binding.py
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 from .common import *
-from .contexts import ValueTypeCtx
+from .contexts import ScopeCtx
 from .gobject_object import Object
 from .gtkbuilder_template import Template
 
@@ -71,7 +71,7 @@ class PropertyBinding(AstNode):
 
     @property
     def source_obj(self) -> T.Optional[Object]:
-        return self.root.objects_by_id.get(self.source)
+        return self.context[ScopeCtx].objects.get(self.source)
 
     @property
     def property_name(self) -> str:
@@ -98,7 +98,7 @@ class PropertyBinding(AstNode):
         if self.source_obj is None:
             raise CompileError(
                 f"Could not find object with ID {self.source}",
-                did_you_mean=(self.source, self.root.objects_by_id.keys()),
+                did_you_mean=(self.source, self.context[ScopeCtx].objects.keys()),
             )
 
     @validate("property")
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index 8d27c0e..ea2dac8 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -17,14 +17,13 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-from functools import cached_property
-
 from .. import gir
 from .imports import GtkDirective, Import
 from .gtkbuilder_template import Template
 from .gobject_object import Object
 from .gtk_menu import menu, Menu
 from .common import *
+from .contexts import ScopeCtx
 
 
 class UI(AstNode):
@@ -85,13 +84,9 @@ class UI(AstNode):
             or isinstance(child, Menu)
         ]
 
-    @cached_property
-    def objects_by_id(self):
-        return {
-            obj.tokens["id"]: obj
-            for obj in self.iterate_children_recursive()
-            if obj.tokens["id"] is not None
-        }
+    @context(ScopeCtx)
+    def scope_ctx(self) -> ScopeCtx:
+        return ScopeCtx(node=self)
 
     @validate()
     def gir_errors(self):
@@ -102,14 +97,4 @@ class UI(AstNode):
 
     @validate()
     def unique_ids(self):
-        passed = {}
-        for obj in self.iterate_children_recursive():
-            if obj.tokens["id"] is None:
-                continue
-
-            if obj.tokens["id"] in passed:
-                token = obj.group.tokens["id"]
-                raise CompileError(
-                    f"Duplicate object ID '{obj.tokens['id']}'", token.start, token.end
-                )
-            passed[obj.tokens["id"]] = obj
+        self.context[ScopeCtx].validate_unique_ids()
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index a1666cc..596823d 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -24,7 +24,7 @@ from .types import TypeName
 from .property_binding import PropertyBinding
 from .binding import Binding
 from .gobject_object import Object
-from .contexts import ValueTypeCtx
+from .contexts import ScopeCtx, ValueTypeCtx
 
 
 class TranslatedWithoutContext(AstNode):
@@ -274,7 +274,7 @@ class IdentLiteral(AstNode):
             return expected_type
         elif self.ident in ["true", "false"]:
             return gir.BoolType()
-        elif object := self.root.objects_by_id.get(self.ident):
+        elif object := self.context[ScopeCtx].objects.get(self.ident):
             return object.gir_class
         else:
             return None
@@ -294,11 +294,11 @@ class IdentLiteral(AstNode):
                 )
 
         elif expected_type is not None:
-            object = self.root.objects_by_id.get(self.ident)
+            object = self.context[ScopeCtx].objects.get(self.ident)
             if object is None:
                 raise CompileError(
                     f"Could not find object with ID {self.ident}",
-                    did_you_mean=(self.ident, self.root.objects_by_id.keys()),
+                    did_you_mean=(self.ident, self.context[ScopeCtx].objects.keys()),
                 )
             elif object.gir_class and not object.gir_class.assignable_to(expected_type):
                 raise CompileError(

From a2eaaa26feac2d42a7d61d5190039fdedf518989 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 28 Apr 2023 20:41:25 -0500
Subject: [PATCH 099/290] Rename property to avoid conflict

TranslatedWithContext.context conflicted with AstNode.context
---
 blueprintcompiler/language/values.py      | 2 +-
 blueprintcompiler/outputs/xml/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 596823d..b9eb877 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -51,7 +51,7 @@ class TranslatedWithContext(AstNode):
         return self.tokens["string"]
 
     @property
-    def context(self) -> str:
+    def translate_context(self) -> str:
         return self.tokens["context"]
 
 
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 42d9b21..607cc36 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -151,7 +151,7 @@ class XmlOutput(OutputFormat):
         else:
             return {
                 "translatable": "true",
-                "context": translated.child.context
+                "context": translated.child.translate_context
                 if isinstance(translated.child, TranslatedWithContext)
                 else None,
             }

From 9dcd06de5189152abe14dcd6d5ff3f6d1eb25032 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 28 Apr 2023 20:42:46 -0500
Subject: [PATCH 100/290] Make builder template factories use a subscope

---
 .../language/gtk_list_item_factory.py             | 10 ++++++++++
 tests/sample_errors/subscope.blp                  |  9 +++++++++
 tests/sample_errors/subscope.err                  |  1 +
 tests/samples/subscope.blp                        |  9 +++++++++
 tests/samples/subscope.ui                         | 15 +++++++++++++++
 tests/test_samples.py                             |  2 ++
 6 files changed, 46 insertions(+)
 create mode 100644 tests/sample_errors/subscope.blp
 create mode 100644 tests/sample_errors/subscope.err
 create mode 100644 tests/samples/subscope.blp
 create mode 100644 tests/samples/subscope.ui

diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index d25b96d..ae9d019 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -1,6 +1,8 @@
 from .gobject_object import ObjectContent, validate_parent_type
 from ..parse_tree import Keyword
 from ..ast_utils import AstNode, validate
+from .common import *
+from .contexts import ScopeCtx
 
 
 class ListItemFactory(AstNode):
@@ -19,6 +21,14 @@ class ListItemFactory(AstNode):
             "sub-templates",
         )
 
+    @context(ScopeCtx)
+    def scope_ctx(self) -> ScopeCtx:
+        return ScopeCtx(node=self)
+
+    @validate()
+    def unique_ids(self):
+        self.context[ScopeCtx].validate_unique_ids()
+
     @property
     def content(self) -> ObjectContent:
         return self.children[ObjectContent][0]
diff --git a/tests/sample_errors/subscope.blp b/tests/sample_errors/subscope.blp
new file mode 100644
index 0000000..59d3a9f
--- /dev/null
+++ b/tests/sample_errors/subscope.blp
@@ -0,0 +1,9 @@
+using Gtk 4.0;
+
+BuilderListItemFactory {
+  template {
+    child: label;
+  }
+}
+
+Label label {}
\ No newline at end of file
diff --git a/tests/sample_errors/subscope.err b/tests/sample_errors/subscope.err
new file mode 100644
index 0000000..454e292
--- /dev/null
+++ b/tests/sample_errors/subscope.err
@@ -0,0 +1 @@
+5,12,5,Could not find object with ID label
\ No newline at end of file
diff --git a/tests/samples/subscope.blp b/tests/samples/subscope.blp
new file mode 100644
index 0000000..a14591b
--- /dev/null
+++ b/tests/samples/subscope.blp
@@ -0,0 +1,9 @@
+using Gtk 4.0;
+
+Gtk.BuilderListItemFactory {
+  template {
+    child: Gtk.Label label {};
+  }
+}
+
+Gtk.Label label {}
\ No newline at end of file
diff --git a/tests/samples/subscope.ui b/tests/samples/subscope.ui
new file mode 100644
index 0000000..61bdc18
--- /dev/null
+++ b/tests/samples/subscope.ui
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkBuilderListItemFactory">
+    <property name="bytes"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkLabel" id="label"></object>
+    </property>
+  </template>
+</interface>]]></property>
+  </object>
+  <object class="GtkLabel" id="label"></object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 8ee9015..7af9e1b 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -184,6 +184,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("string_list")
         self.assert_sample("strings")
         self.assert_sample("style")
+        self.assert_sample("subscope")
         self.assert_sample(
             "template", skip_run=True
         )  # The template class doesn't exist
@@ -258,6 +259,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("size_group_obj_dne")
         self.assert_sample_error("strv")
         self.assert_sample_error("styles_in_non_widget")
+        self.assert_sample_error("subscope")
         self.assert_sample_error("two_templates")
         self.assert_sample_error("uint")
         self.assert_sample_error("using_invalid_namespace")

From 71f52d350a47bf549cba685a45b852e2cde4dca9 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 29 Apr 2023 21:16:14 -0500
Subject: [PATCH 101/290] Refactor child types

Didn't change the actual syntax, but changed the rules around to be less
confusing.
---
 blueprintcompiler/ast_utils.py                |  4 +-
 blueprintcompiler/language/__init__.py        |  2 +-
 blueprintcompiler/language/gobject_object.py  |  6 +-
 .../language/gtkbuilder_child.py              | 61 ++++++++++++++-----
 blueprintcompiler/language/response_id.py     | 27 +++-----
 blueprintcompiler/outputs/xml/__init__.py     | 15 +++--
 .../action_widget_have_no_id.err              |  2 +-
 .../action_widget_in_invalid_container.err    |  2 +-
 .../action_widget_not_action.blp              |  8 ---
 .../action_widget_not_action.err              |  1 -
 tests/test_samples.py                         |  1 -
 11 files changed, 74 insertions(+), 55 deletions(-)
 delete mode 100644 tests/sample_errors/action_widget_not_action.blp
 delete mode 100644 tests/sample_errors/action_widget_not_action.err

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 5019098..7bfacfb 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -109,9 +109,9 @@ class AstNode:
         else:
             return self.parent.root
 
-    def parent_by_type(self, type):
+    def parent_by_type(self, type: T.Type[TType]) -> TType:
         if self.parent is None:
-            return None
+            raise CompilerBugError()
         elif isinstance(self.parent, type):
             return self.parent
         else:
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 45e5361..571f09b 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -23,7 +23,7 @@ from .gtk_menu import menu, Menu, MenuAttribute
 from .gtk_size_group import Widgets
 from .gtk_string_list import Strings
 from .gtk_styles import Styles
-from .gtkbuilder_child import Child
+from .gtkbuilder_child import Child, ChildType, ChildInternal, ChildExtension
 from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
 from .property_binding import PropertyBinding
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index a66ffe6..1dbbce5 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -22,7 +22,7 @@ import typing as T
 from functools import cached_property
 
 from .common import *
-from .response_id import ResponseId
+from .response_id import ExtResponse
 from .types import ClassName, ConcreteClassName
 
 
@@ -60,7 +60,7 @@ class Object(AstNode):
         return self.class_name.gir_type
 
     @cached_property
-    def action_widgets(self) -> T.List[ResponseId]:
+    def action_widgets(self) -> T.List[ExtResponse]:
         """Get list of widget's action widgets.
 
         Empty if object doesn't have action widgets.
@@ -69,7 +69,7 @@ class Object(AstNode):
 
         return [
             child.response_id
-            for child in self.children[ObjectContent][0].children[Child]
+            for child in self.content.children[Child]
             if child.response_id
         ]
 
diff --git a/blueprintcompiler/language/gtkbuilder_child.py b/blueprintcompiler/language/gtkbuilder_child.py
index 45b2074..c3e1c47 100644
--- a/blueprintcompiler/language/gtkbuilder_child.py
+++ b/blueprintcompiler/language/gtkbuilder_child.py
@@ -21,7 +21,7 @@
 from functools import cached_property
 
 from .gobject_object import Object
-from .response_id import ResponseId
+from .response_id import ExtResponse
 from .common import *
 
 ALLOWED_PARENTS: T.List[T.Tuple[str, str]] = [
@@ -30,20 +30,49 @@ ALLOWED_PARENTS: T.List[T.Tuple[str, str]] = [
 ]
 
 
+class ChildInternal(AstNode):
+    grammar = ["internal-child", UseIdent("internal_child")]
+
+    @property
+    def internal_child(self) -> str:
+        return self.tokens["internal_child"]
+
+
+class ChildType(AstNode):
+    grammar = UseIdent("child_type").expected("a child type")
+
+    @property
+    def child_type(self) -> str:
+        return self.tokens["child_type"]
+
+
+class ChildExtension(AstNode):
+    grammar = ExtResponse
+
+    @property
+    def child(self) -> ExtResponse:
+        return self.children[0]
+
+
+class ChildAnnotation(AstNode):
+    grammar = ["[", AnyOf(ChildInternal, ChildExtension, ChildType), "]"]
+
+    @property
+    def child(self) -> T.Union[ChildInternal, ChildExtension, ChildType]:
+        return self.children[0]
+
+
 class Child(AstNode):
     grammar = [
-        Optional(
-            [
-                "[",
-                Optional(["internal-child", UseLiteral("internal_child", True)]),
-                UseIdent("child_type").expected("a child type"),
-                Optional(ResponseId),
-                "]",
-            ]
-        ),
+        Optional(ChildAnnotation),
         Object,
     ]
 
+    @property
+    def annotation(self) -> T.Optional[ChildAnnotation]:
+        annotations = self.children[ChildAnnotation]
+        return annotations[0] if len(annotations) else None
+
     @property
     def object(self) -> Object:
         return self.children[Object][0]
@@ -69,15 +98,17 @@ class Child(AstNode):
                 )
 
     @cached_property
-    def response_id(self) -> T.Optional[ResponseId]:
+    def response_id(self) -> T.Optional[ExtResponse]:
         """Get action widget's response ID.
 
         If child is not action widget, returns `None`.
         """
-        response_ids = self.children[ResponseId]
-
-        if response_ids:
-            return response_ids[0]
+        if (
+            self.annotation is not None
+            and isinstance(self.annotation.child, ChildExtension)
+            and isinstance(self.annotation.child.child, ExtResponse)
+        ):
+            return self.annotation.child.child
         else:
             return None
 
diff --git a/blueprintcompiler/language/response_id.py b/blueprintcompiler/language/response_id.py
index e3b44a9..7de197c 100644
--- a/blueprintcompiler/language/response_id.py
+++ b/blueprintcompiler/language/response_id.py
@@ -23,12 +23,13 @@ import typing as T
 from .common import *
 
 
-class ResponseId(AstNode):
+class ExtResponse(AstNode):
     """Response ID of action widget."""
 
     ALLOWED_PARENTS: T.List[T.Tuple[str, str]] = [("Gtk", "Dialog"), ("Gtk", "InfoBar")]
 
     grammar = [
+        Keyword("action"),
         Keyword("response"),
         "=",
         AnyOf(
@@ -41,13 +42,6 @@ class ResponseId(AstNode):
         Optional([Keyword("default"), UseLiteral("is_default", True)]),
     ]
 
-    @validate()
-    def child_type_is_action(self) -> None:
-        """Check that child type is "action"."""
-        child_type = self.parent.tokens["child_type"]
-        if child_type != "action":
-            raise CompileError(f"Only action widget can have response ID")
-
     @validate()
     def parent_has_action_widgets(self) -> None:
         """Chech that parent widget has allowed type."""
@@ -59,7 +53,7 @@ class ResponseId(AstNode):
 
         gir = self.root.gir
 
-        for namespace, name in ResponseId.ALLOWED_PARENTS:
+        for namespace, name in ExtResponse.ALLOWED_PARENTS:
             parent_type = gir.get_type(name, namespace)
             if container_type.assignable_to(parent_type):
                 break
@@ -71,10 +65,10 @@ class ResponseId(AstNode):
     @validate()
     def widget_have_id(self) -> None:
         """Check that action widget have ID."""
-        from .gobject_object import Object
+        from .gtkbuilder_child import Child
 
-        _object = self.parent.children[Object][0]
-        if _object.tokens["id"] is None:
+        object = self.parent_by_type(Child).object
+        if object.id is None:
             raise CompileError(f"Action widget must have ID")
 
     @validate("response_id")
@@ -102,10 +96,9 @@ class ResponseId(AstNode):
     @validate("default")
     def no_multiple_default(self) -> None:
         """Only one action widget in dialog can be default."""
-        from .gtkbuilder_child import Child
         from .gobject_object import Object
 
-        if not self.tokens["is_default"]:
+        if not self.is_default:
             return
 
         action_widgets = self.parent_by_type(Object).action_widgets
@@ -126,7 +119,7 @@ class ResponseId(AstNode):
     @property
     def widget_id(self) -> str:
         """Get action widget ID."""
-        from .gobject_object import Object
+        from .gtkbuilder_child import Child
 
-        _object: Object = self.parent.children[Object][0]
-        return _object.tokens["id"]
+        object = self.parent_by_type(Child).object
+        return object.id
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 607cc36..8332cee 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -170,11 +170,16 @@ class XmlOutput(OutputFormat):
 
     def _emit_child(self, child: Child, xml: XmlEmitter):
         child_type = internal_child = None
-
-        if child.tokens["internal_child"]:
-            internal_child = child.tokens["child_type"]
-        else:
-            child_type = child.tokens["child_type"]
+        if child.annotation is not None:
+            annotation = child.annotation.child
+            if isinstance(annotation, ChildType):
+                child_type = annotation.child_type
+            elif isinstance(annotation, ChildInternal):
+                internal_child = annotation.internal_child
+            elif isinstance(annotation, ChildExtension):
+                child_type = "action"
+            else:
+                raise CompilerBugError()
 
         xml.start_tag("child", type=child_type, internal_child=internal_child)
         self._emit_object(child.object, xml)
diff --git a/tests/sample_errors/action_widget_have_no_id.err b/tests/sample_errors/action_widget_have_no_id.err
index 74ff665..b239d77 100644
--- a/tests/sample_errors/action_widget_have_no_id.err
+++ b/tests/sample_errors/action_widget_have_no_id.err
@@ -1 +1 @@
-4,13,15,Action widget must have ID
+4,6,22,Action widget must have ID
diff --git a/tests/sample_errors/action_widget_in_invalid_container.err b/tests/sample_errors/action_widget_in_invalid_container.err
index 20950a1..ef3296c 100644
--- a/tests/sample_errors/action_widget_in_invalid_container.err
+++ b/tests/sample_errors/action_widget_in_invalid_container.err
@@ -1 +1 @@
-4,13,11,Gtk.Box doesn't have action widgets
+4,6,18,Gtk.Box doesn't have action widgets
diff --git a/tests/sample_errors/action_widget_not_action.blp b/tests/sample_errors/action_widget_not_action.blp
deleted file mode 100644
index cd760e5..0000000
--- a/tests/sample_errors/action_widget_not_action.blp
+++ /dev/null
@@ -1,8 +0,0 @@
-using Gtk 4.0;
-
-Dialog {
-    [some_type response=ok]
-    Button ok_button {
-
-    }
-}
diff --git a/tests/sample_errors/action_widget_not_action.err b/tests/sample_errors/action_widget_not_action.err
deleted file mode 100644
index 95699ff..0000000
--- a/tests/sample_errors/action_widget_not_action.err
+++ /dev/null
@@ -1 +0,0 @@
-4,16,11,Only action widget can have response ID
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 7af9e1b..88cecdf 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -216,7 +216,6 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("action_widget_float_response")
         self.assert_sample_error("action_widget_have_no_id")
         self.assert_sample_error("action_widget_multiple_default")
-        self.assert_sample_error("action_widget_not_action")
         self.assert_sample_error("action_widget_in_invalid_container")
         self.assert_sample_error("action_widget_response_dne")
         self.assert_sample_error("action_widget_negative_response")

From 779e27d7acd9654c92730a2a3b9f6cb2f6aeaffb Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 29 Apr 2023 21:37:13 -0500
Subject: [PATCH 102/290] menus: Simplify grammar a bit

Again no syntax changes, just refactoring the rules.
---
 blueprintcompiler/language/gtk_menu.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 83b5e63..7569d67 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -172,10 +172,7 @@ menu: Group = Group(
             Match("{"),
             Until(
                 AnyOf(
-                    menu_section,
-                    menu_submenu,
-                    menu_item_shorthand,
-                    menu_item,
+                    menu_child,
                     Fail(
                         menu_attribute,
                         "Attributes are not permitted at the top level of a menu",

From 3c1941a17e550debb6c220c5c1a4b3ce05ae2d44 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 29 Apr 2023 21:48:02 -0500
Subject: [PATCH 103/290] Simplify Translated

Remove the TranslatedWithContext and TranslatedWithoutContext rules and
just use Translated.
---
 blueprintcompiler/language/__init__.py    |  2 -
 blueprintcompiler/language/values.py      | 51 +++++++++--------------
 blueprintcompiler/outputs/xml/__init__.py | 12 ++----
 3 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 571f09b..c48ae35 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -39,8 +39,6 @@ from .values import (
     QuotedLiteral,
     StringValue,
     Translated,
-    TranslatedWithContext,
-    TranslatedWithoutContext,
     TypeLiteral,
     Value,
 )
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index b9eb877..f0cc068 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -27,40 +27,27 @@ from .gobject_object import Object
 from .contexts import ScopeCtx, ValueTypeCtx
 
 
-class TranslatedWithoutContext(AstNode):
-    grammar = ["_", "(", UseQuoted("string"), Optional(","), ")"]
-
-    @property
-    def string(self) -> str:
-        return self.tokens["string"]
-
-
-class TranslatedWithContext(AstNode):
-    grammar = [
-        "C_",
-        "(",
-        UseQuoted("context"),
-        ",",
-        UseQuoted("string"),
-        Optional(","),
-        ")",
-    ]
-
-    @property
-    def string(self) -> str:
-        return self.tokens["string"]
-
-    @property
-    def translate_context(self) -> str:
-        return self.tokens["context"]
-
-
 class Translated(AstNode):
-    grammar = AnyOf(TranslatedWithoutContext, TranslatedWithContext)
+    grammar = AnyOf(
+        ["_", "(", UseQuoted("string"), Optional(","), ")"],
+        [
+            "C_",
+            "(",
+            UseQuoted("context"),
+            ",",
+            UseQuoted("string"),
+            Optional(","),
+            ")",
+        ],
+    )
 
     @property
-    def child(self) -> T.Union[TranslatedWithContext, TranslatedWithoutContext]:
-        return self.children[0]
+    def string(self) -> str:
+        return self.tokens["string"]
+
+    @property
+    def translate_context(self) -> T.Optional[str]:
+        return self.tokens["context"]
 
     @validate()
     def validate_for_type(self) -> None:
@@ -382,7 +369,7 @@ class StringValue(AstNode):
     @property
     def string(self) -> str:
         if isinstance(self.child, Translated):
-            return self.child.child.string
+            return self.child.string
         else:
             return self.child.value
 
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 8332cee..ed13610 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -103,7 +103,7 @@ class XmlOutput(OutputFormat):
                 xml.start_tag(
                     "property", **props, **self._translated_string_attrs(child)
                 )
-                xml.put_text(child.child.string)
+                xml.put_text(child.string)
                 xml.end_tag()
             else:
                 xml.start_tag("property", **props)
@@ -149,12 +149,7 @@ class XmlOutput(OutputFormat):
         if isinstance(translated, QuotedLiteral):
             return {}
         else:
-            return {
-                "translatable": "true",
-                "context": translated.child.translate_context
-                if isinstance(translated.child, TranslatedWithContext)
-                else None,
-            }
+            return {"translatable": "true", "context": translated.translate_context}
 
     def _emit_signal(self, signal: Signal, xml: XmlEmitter):
         name = signal.name
@@ -267,7 +262,7 @@ class XmlOutput(OutputFormat):
 
         if isinstance(value.child, Translated):
             xml.start_tag(tag, **attrs, **self._translated_string_attrs(value.child))
-            xml.put_text(value.child.child.string)
+            xml.put_text(value.child.string)
             xml.end_tag()
         elif isinstance(value.child, QuotedLiteral):
             xml.start_tag(tag, **attrs)
@@ -308,7 +303,6 @@ class XmlOutput(OutputFormat):
         elif isinstance(extension, Responses):
             xml.start_tag("responses")
             for response in extension.responses:
-                # todo: translated
                 xml.start_tag(
                     "response",
                     id=response.id,

From ef39b5d7db396607f1ad39b45bd8aceb4802bd31 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 11 Mar 2023 18:43:32 -0600
Subject: [PATCH 104/290] docs: Add syntax specification

Formally document the language syntax and provide examples and detailed
descriptions of how things work.
---
 docs/_static/styles.css          |  18 +-
 docs/conf.py                     |   4 +-
 docs/index.rst                   |   1 +
 docs/reference/diagnostics.rst   | 188 +++++++++++++++++++
 docs/reference/document_root.rst |  74 ++++++++
 docs/reference/expressions.rst   |  87 +++++++++
 docs/reference/extensions.rst    | 303 +++++++++++++++++++++++++++++++
 docs/reference/gir-namespace.png | Bin 0 -> 4700 bytes
 docs/reference/index.rst         |  50 +++++
 docs/reference/menus.rst         |  62 +++++++
 docs/reference/objects.rst       | 189 +++++++++++++++++++
 docs/reference/templates.rst     |  82 +++++++++
 docs/reference/values.rst        | 168 +++++++++++++++++
 13 files changed, 1223 insertions(+), 3 deletions(-)
 create mode 100644 docs/reference/diagnostics.rst
 create mode 100644 docs/reference/document_root.rst
 create mode 100644 docs/reference/expressions.rst
 create mode 100644 docs/reference/extensions.rst
 create mode 100644 docs/reference/gir-namespace.png
 create mode 100644 docs/reference/index.rst
 create mode 100644 docs/reference/menus.rst
 create mode 100644 docs/reference/objects.rst
 create mode 100644 docs/reference/templates.rst
 create mode 100644 docs/reference/values.rst

diff --git a/docs/_static/styles.css b/docs/_static/styles.css
index 914861d..cbe003c 100644
--- a/docs/_static/styles.css
+++ b/docs/_static/styles.css
@@ -5,4 +5,20 @@
 
 .experimental-admonition img {
   width: 64px;
-}
\ No newline at end of file
+}
+
+p.grammar-block {
+  font-family: var(--font-stack--monospace);
+  white-space: pre;
+  overflow: auto;
+  font-size: var(--code-font-size);
+  padding: .625rem .875rem;
+  line-height: 1.5;
+  background: #f8f8f8;
+  border-radius: .2rem;
+}
+
+body:not([data-theme="light"]) .grammar-block {
+  background: #202020;
+  color: #d0d0d0;
+}
diff --git a/docs/conf.py b/docs/conf.py
index b9d6d07..b5676c2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Blueprint'
-copyright = '2021, James Westman'
+copyright = '2021-2023, James Westman'
 author = 'James Westman'
 
 
@@ -51,4 +51,4 @@ html_theme = 'furo'
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
-html_css_files = ['styles.css']
\ No newline at end of file
+html_css_files = ['styles.css']
diff --git a/docs/index.rst b/docs/index.rst
index dcde058..2a345bc 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -18,6 +18,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
    setup
    translations
    flatpak
+   reference/index
    examples
    packaging
 
diff --git a/docs/reference/diagnostics.rst b/docs/reference/diagnostics.rst
new file mode 100644
index 0000000..b8fee83
--- /dev/null
+++ b/docs/reference/diagnostics.rst
@@ -0,0 +1,188 @@
+===========
+Diagnostics
+===========
+
+
+.. _Diagnostic abstract_class:
+
+abstract_class
+--------------
+Objects can't be created from abstract classes. Abstract classes are used as base classes for other classes, but they don't have functionality on their own. You may want to use a non-abstract subclass instead.
+
+
+.. _Diagnostic bad_syntax:
+
+bad_syntax
+----------
+The tokenizer encountered an unexpected sequence of characters that aren't part of any known blueprint syntax.
+
+
+.. _Diagnostic child_not_accepted:
+
+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.
+
+
+.. _Diagnostic conversion_error:
+
+conversion_error
+----------------
+The value's type cannot be converted to the target type.
+
+Subclasses may be converted to their superclasses, but not vice versa. A type that implements an interface can be converted to that interface's type. Many boxed types can be parsed from strings in a type-specific way.
+
+
+.. _Diagnostic expected_bool:
+
+expected_bool
+-------------
+A boolean value was expected, but the value is not ``true`` or ``false``.
+
+
+.. _Diagnostic extension_not_repeatable:
+
+extension_not_repeatable
+------------------------
+This extension can't be used more than once in an object.
+
+
+.. _Diagnostic extension_wrong_parent_type:
+
+extension_wrong_parent_type
+---------------------------
+No extension with the given name exists for this object's class (or, for a :ref:`child extension<Syntax ChildExtension>`, the parent class).
+
+
+.. _Diagnostic invalid_number_literal:
+
+invalid_number_literal
+----------------------
+The tokenizer encountered what it thought was a number, but it couldn't parse it as a number.
+
+
+.. _Diagnostic member_dne:
+
+member_dne
+----------
+The value is being interpreted as a member of an enum or flag type, but that type doesn't have a member with the given name.
+
+
+.. _Diagnostic missing_gtk_declaration:
+
+missing_gtk_declaration
+-----------------------
+All blueprint files must start with a GTK declaration, e.g. ``using Gtk 4.0;``.
+
+
+.. _Diagnostic multiple_templates:
+
+multiple_templates
+------------------
+Only one :ref:`template<Syntax Template>` is allowed per blueprint file, but there are multiple. The template keyword indicates which object is the one being instantiated.
+
+
+.. _Diagnostic namespace_not_found:
+
+namespace_not_found
+--------------------
+The ``.typelib`` files for the given namespace could not be found. There are several possibilities:
+
+* There is a typo in the namespace name, e.g. ``Adwaita`` instead of ``Adw``
+
+* The version number is incorrect, e.g. ``Adw 1.0`` instead of ``Adw 1``. The library's documentation will tell you the correct version number to use.
+
+* The packages for the library are not installed. On some distributions, the ``.typelib`` file is in a separate package from the main library, such as a ``-devel`` package.
+
+* There is an issue with the path to the typelib file. The ``GI_TYPELIB_PATH`` environment variable can be used to add additional paths to search.
+
+
+.. _Diagnostic namespace_not_imported:
+
+namespace_not_imported
+----------------------
+The given namespace was not imported at the top of the file. Importing the namespace is necessary because it tells blueprint-compiler which version of the library to use.
+
+
+.. _Diagnostic object_dne:
+
+object_dne
+----------
+No object with the given ID exists in the current scope.
+
+
+.. _Diagnostic property_dne:
+
+property_dne
+------------
+The class or interface doesn't have a property with the given name.
+
+
+.. _Diagnostic property_convert_error:
+
+property_convert_error
+----------------------
+The value given for the property can't be converted to the property's type.
+
+
+.. _Diagnostic property_construct_only:
+
+property_construct_only
+-----------------------
+The property can't be bound because it is a construct-only property, meaning it can only be set once when the object is first constructed. Binding it to an expression could cause its value to change later.
+
+
+.. _Diagnostic property_read_only:
+
+property_read_only
+------------------
+This property can't be set because it is marked as read-only.
+
+
+.. _Diagnostic signal_dne:
+
+signal_dne
+----------
+The class or interface doesn't have a signal with the given name.
+
+
+.. _Diagnostic type_dne:
+
+type_dne
+--------
+The given type doesn't exist in the namespace.
+
+
+.. _Diagnostic type_not_a_class:
+
+type_not_a_class
+----------------
+The given type exists in the namespace, but it isn't a class. An object's type must be a concrete (not abstract) class, not an interface or boxed type.
+
+
+.. _Diagnostic version_conflict:
+
+version_conflict
+----------------
+This error occurs when two versions of a namespace are imported (possibly transitively) in the same file. For example, this will cause a version conflict:
+
+.. code-block:: blueprintui
+
+   using Gtk 4.0;
+   using Gtk 3.0;
+
+But so will this:
+
+.. code-block:: blueprintui
+
+   using Gtk 4.0;
+   using Handy 1;
+
+because libhandy imports ``Gtk 3.0``.
+
+
+.. _Diagnostic wrong_compiler_version:
+
+wrong_compiler_version
+----------------------
+This version of blueprint-compiler is for GTK 4 blueprints only. Future GTK versions will use different versions of blueprint-compiler.
diff --git a/docs/reference/document_root.rst b/docs/reference/document_root.rst
new file mode 100644
index 0000000..af5357d
--- /dev/null
+++ b/docs/reference/document_root.rst
@@ -0,0 +1,74 @@
+=======================
+Document Root & Imports
+=======================
+
+
+.. _Syntax Root:
+
+Document Root
+-------------
+
+.. rst-class:: grammar-block
+
+   Root = :ref:`GtkDecl<Syntax GtkDecl>` (:ref:`Using<Syntax Using>`)* ( :ref:`Template<Syntax Template>` | :ref:`Menu<Syntax Menu>` | :ref:`Object<Syntax Object>` )* EOF
+
+A blueprint document consists of a :ref:`GTK declaration<Syntax GtkDecl>`, one sor more :ref:`imports<Syntax Using>`, and a list of :ref:`objects<Syntax Object>` and/or a :ref:`template<Syntax Template>`.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   // Gtk Declaration
+   using Gtk 4.0;
+
+   // Import Statement
+   using Adw 1;
+
+   // Object
+   Window my_window {}
+
+
+.. _Syntax GtkDecl:
+
+GTK Declaration
+---------------
+
+.. rst-class:: grammar-block
+
+   GtkDecl = 'using' 'Gtk' '4.0' ';'
+
+Every blueprint file begins with the line ``using Gtk 4.0;``, which declares the target GTK version for the file. Tools that read blueprint files should verify that they support the declared version.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   using Gtk 4.0;
+
+
+.. _Syntax Using:
+
+GObject Introspection Imports
+-----------------------------
+
+.. rst-class:: grammar-block
+
+   Using = 'using' <namespace::ref:`IDENT<Syntax IDENT>`> <version::ref:`NUMBER<Syntax NUMBER>`> ';'
+
+To use classes and types from namespaces other than GTK itself, those namespaces must be imported at the top of the file. This tells the compiler what version of the namespace to import.
+
+You'll need the GIR name and version, not the package name and not the exact version number. These are listed at the top of each library's documentation homepage:
+
+.. image:: gir-namespace.png
+
+The compiler requires typelib files for these libraries to be installed. They are usually installed with the library, but on some distros, you may need to install the package that provides ``{namespace}-{version}.typelib`` (e.g. ``Adw-1.typelib``).
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   // Import libadwaita
+   using Adw 1;
diff --git a/docs/reference/expressions.rst b/docs/reference/expressions.rst
new file mode 100644
index 0000000..042aec7
--- /dev/null
+++ b/docs/reference/expressions.rst
@@ -0,0 +1,87 @@
+===========
+Expressions
+===========
+
+Expressions make your user interface code *reactive*. This means when your
+application's data changes, the user interface reacts to the change
+automatically.
+
+.. code-block:: blueprintui
+
+   label: bind MyAppWindow.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
+    */
+
+When a value is bound to an expression using the ``bind`` keyword, the binding
+monitors all the object properties that are inputs to the expression, and
+reevaluates it if any of them change.
+
+This is a powerful tool for ensuring consistency and simplifying your code.
+Rather than pushing changes to the user interface wherever they may occur,
+you can define your data model with GObject and let GTK take care of the rest.
+
+.. _Syntax Expression:
+
+Expressions
+-----------
+
+.. rst-class:: grammar-block
+
+   Expression = ( :ref:`ClosureExpression<Syntax ClosureExpression>` | :ref:`Literal<Syntax Literal>` | ( '(' Expression ')' ) ) ( :ref:`LookupExpression<Syntax LookupExpression>` | :ref:`CastExpression<Syntax CastExpression>` )*
+
+.. note::
+
+   The grammar above is designed to eliminate `left recursion <https://en.wikipedia.org/wiki/Left_recursion>`_, which can make parsing more complex. In this format, an expression consists of a prefix (such as a literal value or closure invocation) followed by zero or more infix or suffix operators.
+
+Expressions are composed of property lookups and/or closures. Property lookups are the inputs to the expression, and closures provided in application code can perform additional calculations on those inputs.
+
+
+.. _Syntax LookupExpression:
+
+Lookup Expressions
+------------------
+
+.. rst-class:: grammar-block
+
+   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>`_
+
+The type of a property expression is the type of the property it refers to.
+
+
+.. _Syntax ClosureExpression:
+
+Closure Expressions
+-------------------
+
+.. rst-class:: grammar-block
+
+   ClosureExpression = '$' <name::ref:`IDENT<Syntax IDENT>`> '(' ( :ref:`Expression<Syntax Expression>` ),* ')'
+
+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.
+
+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>`.
+
+
+.. _Syntax CastExpression:
+
+Cast Expressions
+----------------
+
+.. rst-class:: grammar-block
+
+   CastExpression = 'as' '<' :ref:`TypeName<Syntax TypeName>` '>'
+
+Cast expressions allow Blueprint to know the type of an expression when it can't otherwise determine it.
+
+.. code-block:: blueprintui
+
+   // 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
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
new file mode 100644
index 0000000..a29938b
--- /dev/null
+++ b/docs/reference/extensions.rst
@@ -0,0 +1,303 @@
+==========
+Extensions
+==========
+
+.. _Syntax Extension:
+
+Properties are the main way to set values on objects, but they are limited by the GObject type system in what values they can accept. Some classes, therefore, have specialized syntax for certain features.
+
+.. note::
+
+   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>`_.
+
+.. rst-class:: grammar-block
+
+   Extension = :ref:`ExtAccessibility<Syntax ExtAccessibility>`
+   | :ref:`ExtAdwMessageDialog<Syntax ExtAdwMessageDialog>`
+   | :ref:`ExtComboBoxItems<Syntax ExtComboBoxItems>`
+   | :ref:`ExtFileFilterMimeTypes<Syntax ExtFileFilter>`
+   | :ref:`ExtFileFilterPatterns<Syntax ExtFileFilter>`
+   | :ref:`ExtFileFilterSuffixes<Syntax ExtFileFilter>`
+   | :ref:`ExtLayout<Syntax ExtLayout>`
+   | :ref:`ExtListItemFactory<Syntax ExtListItemFactory>`
+   | :ref:`ExtSizeGroupWidgets<Syntax ExtSizeGroupWidgets>`
+   | :ref:`ExtStringListStrings<Syntax ExtStringListStrings>`
+   | :ref:`ExtStyles<Syntax ExtStyles>`
+
+
+.. _Syntax ExtAccessibility:
+
+Accessibility Properties
+------------------------
+
+.. rst-class:: grammar-block
+
+   ExtAccessibility = 'accessibility' '{' ExtAccessibilityProp* '}'
+   ExtAccessibilityProp = <name::ref:`IDENT<Syntax IDENT>`> ':' :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.
+
+
+.. _Syntax ExtAdwMessageDialog:
+
+Adw.MessageDialog Responses
+----------------------------
+
+.. rst-class:: grammar-block
+
+   ExtAdwMessageDialog = 'responses' '[' (ExtAdwMessageDialogResponse),* ']'
+   ExtAdwMessageDialogResponse = <id::ref:`IDENT<Syntax IDENT>`> ':' :ref:`StringValue<Syntax StringValue>` ExtAdwMessageDialogFlag*
+   ExtAdwMessageDialogFlag = 'destructive' | 'suggested' | 'disabled'
+
+Valid in `Adw.MessageDialog <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1-latest/class.MessageDialog.html>`_.
+
+The ``responses`` block defines the buttons that will be added to the dialog. The ``destructive`` or ``suggested`` flag sets the appearance of the button, and the ``disabled`` flag can be used to disable the button.
+
+.. code-block:: blueprintui
+
+   using Adw 1;
+
+   Adw.MessageDialog {
+     responses [
+       cancel: _("Cancel"),
+       delete: _("Delete") destructive,
+       save: "Save" suggested,
+       wipeHardDrive: "Wipe Hard Drive" destructive disabled,
+     ]
+   }
+
+
+.. _Syntax ExtComboBoxItems:
+
+Gtk.ComboBoxText Items
+----------------------
+
+.. rst-class:: grammar-block
+
+   ExtComboBoxItems = 'items' '[' (ExtComboBoxItem),* ']'
+   ExtComboBoxItem = ( <id::ref:`IDENT<Syntax IDENT>`> ':' )? :ref:`StringValue<Syntax StringValue>`
+
+Valid in `Gtk.ComboBoxText <https://docs.gtk.org/gtk4/class.ComboBoxText.html>`_, which is deprecated as of Gtk 4.10.
+
+The ``items`` block defines the items that will be added to the combo box. The optional ID can be used to refer to the item rather than its label.
+
+.. code-block:: blueprintui
+
+   ComboBoxText {
+     items [
+       item1: "Item 1",
+       item2: "Item 2",
+       item3: "Item 3",
+     ]
+   }
+
+
+.. _Syntax ExtFileFilter:
+
+Gtk.FileFilter Filters
+----------------------
+
+.. rst-class:: grammar-block
+
+   ExtFileFilterMimeTypes = 'mime-types' '[' (ExtFileFilterItem),* ']'
+   ExtFileFilterPatterns = 'patterns' '[' (ExtFileFilterItem),* ']'
+   ExtFileFilterSuffixes = 'suffixes' '[' (ExtFileFilterItem),* ']'
+   ExtFileFilterItem = <item::ref:`QUOTED<Syntax QUOTED>`>
+
+Valid in `Gtk.FileFilter <https://docs.gtk.org/gtk4/class.FileFilter.html>`_.
+
+The ``mime-types``, ``patterns``, and ``suffixes`` blocks define the items that will be added to the file filter. The ``mime-types`` block accepts mime types (including wildcards for subtypes, such as ``image/*``). The ``patterns`` block accepts glob patterns, and the ``suffixes`` block accepts file extensions.
+
+.. code-block:: blueprintui
+
+   FileFilter {
+     mime-types [ "text/plain", "image/*" ]
+     patterns [ "*.txt" ]
+     suffixes [ "png", "jpg" ]
+   }
+
+
+.. _Syntax ExtLayout:
+
+Widget Layouts
+--------------
+
+.. rst-class:: grammar-block
+
+   ExtLayout = 'layout' '{' ExtLayoutProp* '}'
+   ExtLayoutProp = <name::ref:`IDENT<Syntax IDENT>`> ':' :ref:`Value<Syntax Value>` ';'
+
+Valid in `Gtk.Widget <https://docs.gtk.org/gtk4/class.Widget.html>`_.
+
+The ``layout`` block describes how the widget should be positioned within its parent. The available properties depend on the parent widget's layout manager.
+
+.. code-block:: blueprintui
+
+   Grid {
+     Button {
+       layout {
+         column: 0;
+         row: 0;
+       }
+     }
+     Button {
+       layout {
+         column: 1;
+         row: 0;
+       }
+     }
+     Button {
+       layout {
+         column: 0;
+         row: 1;
+         row-span: 2;
+       }
+     }
+   }
+
+
+.. _Syntax ExtListItemFactory:
+
+Gtk.BuilderListItemFactory Templates
+------------------------------------
+
+.. rst-class:: grammar-block
+
+   ExtListItemFactory = 'template' :ref:`ObjectContent<Syntax Object>`
+
+Valid in `Gtk.BuilderListItemFactory <https://docs.gtk.org/gtk4/class.BuilderListItemFactory.html>`_.
+
+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 the list items. The sub-blueprint may not reference objects in the main blueprint or vice versa.
+
+The template type is `Gtk.ListItem <https://docs.gtk.org/gtk4/class.ListItem.html>`_, and the template should have a ``child`` property.
+
+.. code-block:: blueprintui
+
+   ListBox {
+     factory: ListItemFactory {
+       template {
+         child: Label {
+           label: bind item.string;
+         }
+       }
+     }
+
+     model: StringList {
+       strings [ "Item 1", "Item 2", "Item 3" ]
+     }
+   }
+
+
+.. _Syntax ExtSizeGroupWidgets:
+
+Gtk.SizeGroup Widgets
+---------------------
+
+.. rst-class:: grammar-block
+
+   ExtSizeGroupWidgets = 'widgets' '[' (ExtSizeGroupWidget),* ']'
+   ExtSizeGroupWidget = <id::ref:`IDENT<Syntax IDENT>`>
+
+Valid in `Gtk.SizeGroup <https://docs.gtk.org/gtk4/class.SizeGroup.html>`_.
+
+The ``widgets`` block defines the widgets that will be added to the size group.
+
+.. code-block:: blueprintui
+
+   Box {
+     Button button1 {}
+     Button button2 {}
+   }
+
+   SizeGroup {
+     widgets [button1, button2]
+   }
+
+
+.. _Syntax ExtStringListStrings:
+
+Gtk.StringList Strings
+----------------------
+
+.. rst-class:: grammar-block
+
+   ExtStringListStrings = 'strings' '[' (ExtStringListItem),* ']'
+   ExtStringListItem = :ref:`StringValue<Syntax StringValue>`
+
+Valid in `Gtk.StringList <https://docs.gtk.org/gtk4/class.StringList.html>`_.
+
+The ``strings`` block defines the strings in the string list.
+
+.. code-block:: blueprintui
+
+   StringList {
+     strings ["violin", "guitar", _("harp")]
+   }
+
+
+.. _Syntax ExtStyles:
+
+CSS Styles
+----------
+
+.. rst-class:: grammar-block
+
+   ExtStyles = 'styles' '[' ExtStylesProp* ']'
+   ExtStylesClass = <name::ref:`QUOTED<Syntax QUOTED>`>
+
+Valid in any `Gtk.Widget <https://docs.gtk.org/gtk4/class.Widget.html>`_.
+
+The ``styles`` block defines CSS classes that will be added to the widget.
+
+.. code-block:: blueprintui
+
+   Button {
+     styles ["suggested-action"]
+   }
+
+
+.. _Syntax ChildExtension:
+
+Child Extensions
+----------------
+
+.. rst-class:: grammar-block
+
+   ChildExtension = :ref:`ExtResponse<Syntax ExtResponse>`
+
+Child extensions are similar to regular extensions, but they apply to a child of the object rather than the object itself. They are used to add properties to child widgets of a container, such as the buttons in a `Gtk.Dialog <https://docs.gtk.org/gtk4/class.Dialog.html>`_. The child extension takes the place of a child type inside the square brackets.
+
+Currently, the only child extension is :ref:`ExtResponse<Syntax ExtResponse>`.
+
+
+.. _Syntax ExtResponse:
+
+Dialog & InfoBar Responses
+--------------------------
+
+.. rst-class:: grammar-block
+
+   ExtResponse = 'action' 'response' '=' ( <name::ref:`IDENT<Syntax IDENT>`> | <id::ref:`NUMBER<Syntax NUMBER>`> ) 'default'?
+
+Valid as a child extension for children of `Gtk.Dialog <https://docs.gtk.org/gtk4/class.Dialog.html>`_ or `Gtk.InfoBar <https://docs.gtk.org/gtk4/class.InfoBar.html>`_, which are both deprecated as of Gtk 4.10.
+
+The ``action response`` extension sets the ``action`` child type for the child and sets the child's integer response type. The response type may be either a member of the `Gtk.ResponseType <https://docs.gtk.org/gtk4/enum.ResponseType.html>`_ enum or a positive, application-defined integer.
+
+No more than one child of a dialog or infobar may have the ``default`` flag.
+
+.. code-block:: blueprintui
+
+   Dialog {
+    [action response=ok default]
+    Button {}
+
+    [action response=cancel]
+    Button {}
+
+    [action response=1]
+    Button {}
+   }
diff --git a/docs/reference/gir-namespace.png b/docs/reference/gir-namespace.png
new file mode 100644
index 0000000000000000000000000000000000000000..05eaca0472fcbcbdcf8ffeb61da96be171e2cca0
GIT binary patch
literal 4700
zcmb_gS5y<-+KzNVkPxIv2L%;A5CRBN6haAIdXp*`YQO-2&_s$s1P@K53n=B#OX$r+
zMM@MzN<_d|=vAuJv$_8-&ROf9i<C7pd+&Mo)80uiHP&Ti=3|CHAgo9|gc$^Kh75i?
zGckbAsM;%8;EN8UiL_t>M>x|xJowKWsBIHyj`j$|x;$`)-1kHKx=Ul+9=N;vVNmG6
zHQH`<aFO)sMOqKsT>?GPe!>=>zU~n7AU|PQxUjjqzp$LFoSd+%yvlVs6?sKrQzKz5
zgat$S<p&T5lz>Fswg|~xnX)(J9H(ViM`LZP2O{3M|2C_3yiJ$kEiFl?dyg_BSPpf;
z6(Y)z-q~Mw3eOXeX-#!TjmR8D&+NnP=&y>Sd%}&(OiVnlzNIJDK7i5Daoeo6pD@<L
z;wf<(M6>x_gY4y8WqC}n-XZQ|u6)J%=4Qh~JRZ;W%3+a#9SW7^K4&B<Dw@TUjX)se
zuEP`X_<OD>4k)zm?U1;rXlg<s5`hqhX{F)udY9ubL!l{#|IH0)Bd&QNq<GeeT9=sG
zyH-~52fJ$qi=jB2>+b3lF&K$FtD>U9RbdMzH6gpGk>9>Wpx}JEca!n>`Bsb#N<~>&
zL_y(#{w3Ym1UxGA0qW7;y*=lV5~Jh}aVT^c(}4N}Ur9(#)-f?T-`3W~Rar5NV&~v^
z)YEe-BrJ?Xq40V%@M>vkp}f7d%*|ng9`cZ$$;pc~9e<wq`(QBgs%mP~pFe2{cC5w2
z_^{no>U3uq6Em}BU?BYP@bINsxig$^cwz#znRN{^zl}ra=n%)pxxEN{Vq#+R^YgdB
znD2XgwS&}DRcnJ+>?-XD%zl1;kcTNL(5;;vqO<JF?rtFn`-KZ}v9Wa2mil_R*vF4a
zU<LZGIY=ZD%GX!h+xuEcX=%ZJ*Wm2RO49s1ijIMSNG7wIo14!sEom7Tun4M#2>*L&
zaq$T_S?SoxCnzZRA~*MKPY)zJJ9}tqs`L9yG9GowZ13-1TdtpPF%mRn#p~CjE39jX
z_v9#fOs~e5Qu6cF*AxWR!|_C-<_oe167^MHRu<yq<dk!;`mHr4JDbnNzTCofX{?Hg
zg{8rE=AIn&ebPl9ettUHk+hG4gRyp1O<_m<{rYevB?HZoeBEb)g=J-WOmh;QGFB-m
zDH9!`4O7&OrY6Po%uJGxqL{ESq`bV`KOmsawz;kjYH4Z7(v*isy$<-WUir@T&H8$6
z?aK1<(_g=Sg%+TLu~^bQIda%E*f#)$i7B*V&UIzwD_3&_Ucg|mq6qKt>bT6z%vu3%
zZi%yll-s{nSChYdvACg34xCUzPfO9w?(N-ZYi}POAD7^lS5-Y1^G0?Jn>|^vwYjO~
z<#m;lnf_sEy9};VFd-pfa~hpz%!tKeLqbA?rKOEHUtlIVVX&C8va-<0TZl#uWuK6y
z#zxMY*j3JB>X;W{q9s7g&fea4Oeu$4R$U!mQzHZR<YDhKAvZ5C=HugIJtL#Ih6Z_v
zu%sjtnM_Xo$;v?MH`PYpKzR!GeOTj9XJ@D6l`C(+A_2*2-3PcJ4>b#Kp-_@u-rj`(
zvM`t!|H#AyzO7Bg(8x#x41+`>O)Ex+P;mT{C&a0Ctah}6sj2YRtx+!pB8dc^^Kp6k
zm7JO8)>hu_?QNcm7h@hjX5@gu3P%=zsGT{(#Kxu*7It7hmASVULRA?V87Zr%(6YAX
zc5ra0jXc8b9UK(b*0KW->gnrqe7vrr@+38tV{3PpG&*|W?Af#6eg+5?t)yg{fVYx+
zY(&S$!*eSrh)_1Tzx*j5?DLngG1u^L{>aEkAeB866Fj)EusD^mxp+)aa4@r42Y8g>
zuKavKmzIXtueG-vK9fka5Wr2*bR!cJHyn-+?CCpzG3wgdv%*3VmncvTh_jE6p`?L{
zN$*&deVqrH4@I!!Ime)i+xoDIttu~vCJXWM-UgT|(^YQoJrLj3t{8ptd><_3$LdtO
zEML<6%8Is&i^!kN&5ikCG06=5;ax#KzDJHVx;{QqMa9L}<>W+{F~Pz4yJ+3hjSdtw
zb#oJ=p`|SxUy7^$>oM~F?OW%mwxHmGsy+p5eR5FQh!<E=OT7MT8rjXy^w%=<<ARpP
zC~DmbD0@3Qc5ZG)XODSBRaJ*Fw>q1l;o)dN5oDN8R(`&YwRPr@R{m7JM5_#D{C!h%
zb7GS;7t2!}v4>eN^VDK5^6=mR+$nRHMeP>&yHNE-MKs05#l$9sSF=wN5^jfwAIdY9
zh?R|cNpdp7;qaGjZC^bk0g_{5V}-9=LGFb5PUYP1l;IlK%-MApcz;QBzs7$rHEm-f
z;9Ey1jF*=;RdB|qA<R=vO${KM9Tz*<<ZHiGc-wo8<;B_Tjt*5S@9*%{>CVLXc!s^b
zy`F&qmg(u~p@qQpjg2$1@>Ct;@5(oCCgOgLQNIJ0H%K_2ktcmjN=hn{Q&LiTnw$*O
z#RZ46V_Hg1W=l^`mzuB=EjoE}DOAk_jg|qbB9G3a3@Gj&9Jt73IRiqgs9g09*|a4P
z2xmLx;xwbTwgTq^Rmv=`0?GHG)YE&9Ri-qC9_*~xbm9~k7#Rajjw39rt&1xw2UoET
z`uh5hy1O+1eA(IAA3lA0?oNx{_`lQ_A{N%xxasdZIONJ2*i?*)s;LRs+S&r*)Y?b^
z*@rEHk;Ftq&aAGko)T(l`@@G1wFmrJK#MRTCL{l@u4X%>3lmdqYm~n~JGczuarvAl
zoX^nEu&1||(XJ|Zc=EnnmjB#Gfl8-t!Ja|+{*}pQgT?YuF91B67q$<IMiyR<EXV@Q
zee>ovP*=b$mhB{+Vw7f5hGPx)w$%Nwz4gL%jss9eu0(pEg~YGMugwx#T5eD&6{7|+
zow0|9;b1V$nsJtBfeRNd**ey{^|Enta_Zsg5QuA2shvz?u65sM$vLTnR4Y(H;-7P1
zfT1B%gtoS_xNOzp;^NSkFK~38Wrfx4Dl0%@OB+#|!E-eX3=Ep3BWF8F2?=M@GcweM
zG4GC#Bh#NhXYN%cM=UHZYP!3>CO6aB24S&ouCAvLl$4aL<z2R_29-Iw$qqfTm$Eg1
zy|87padh<CWL1iZiTUv9(<z~7XlPC?QZ8#~bd+93Muv`_UK)2G#l_+`)0G530qjz<
zVw4C3B`qxtcuDLVXZH922?>dS-~AV2<Kw~Ol0b#QL}0IEvkd2#ml0Z8F;j)VqmKVF
ziin61r6@oes0z3S(yHg00Wj?S{r%YSdE0JXCnq7`eux3fQ=n`wT7tPm;c!mijiy&K
zPRCkUxDBWsmW9|VXhhWv7yl(kBu%e%pZpUV28BY8+SjpdApiVdAxDA+T+sJ6|G!Q-
z|3fV5^DMvkory1r0gzG4!h%y&ObkpGJv@Ae|7NgHd5#VOG4LTZ)&m5P>bvb8n3>Xo
z$R`Dn`wOj(GRn%l8YhPhWtAl*v#pM9t@xxQZDV7$owb?s;DGdOFO8?9r8T^j78Bjy
zwND)avRO72p{%U@NezCoqzWPmdPbdJ4aZqmS7$KAFIwb2KrLLDosFkuWSf{05)erG
z_3Iwcj*;jpyH@psWqE$p5O%&KkMbN%MB}n@xaiRF(E;`MZv}MT^0E&j!Q*$>3Spe*
z1p@IYfuv>r@mG$uQ^W;e2y7@;5D>%JSjk2?ipczOpc!va@F)F%yZ-Y-B9u8+W@chv
znnb|D=SyG4$4MY2m6R~Fwzh^WRW*NKSn%AP7_G1dNYvVzd8TnJS<VfGij+4;okSu#
z&#Uj<GLyM}{mu^7R_b!vS?+%vdd_Pc)_yS(5w&aL-!~kwlG*IfxCS7QO39&6D0{~T
zYc6#*vubmb=<X!*QsXxiimk=!(o$l2I_IlbubgqXud5q*d3mQ{EF`4G^m%$ZU7V&!
z+s=SYx0JHtwQDR<hZ~Q}q=4o&`oj6{SXwHqVQmb9f`VEC7dRphR+P@2Kd&)-@{}E#
z@`9u}0(2B;SX%nr?5t~Gpan-Zl}gn!Fd!veRPxC;DYy9XtrauTj$L~+ZdGovxhiw@
zDo0!ih!n1_u0umZ!s+hr?#Sc;5V=4`)TF$7N1vmF<{G^sEuE*-$UXTchB0&bE6{`_
zQvCh%0xERY*4B4yfv-PFObl2WlLmI#cYRaZNICS+tID4AVi3~Ip6BLDh41|NLj<mR
zDX62fQ~USE#s<h{(9tVWQsMvjii;M#o~s>dyzsF5c>mgIO8)-iU1I7{d+^F5tBQ>D
z-gob)Zxdjte?aDN=nCf*ir9i0=iZ2}>Dt%-V&7QW(qi-Zq9GCqRlo1yLG0@bE)Adi
zm`9vz)oOUSa_h2a(eFMHQiG?bC;sWv^wYvH7sxnv;CE-DgqY(rCCw{FLw+VH`R^>-
z4hMi##XU;vkuNa&>(|TrdNYgTmFAfrKc8v5zq!`o)*PWz3{_B2z(0G&-S4pr_hlu2
zoZkIAS3nDC@}0c=b(}&;c>bKLy_e=8&>YE^1r|X;3W6GuhhKVOr;t2rWDk3I_3G83
zuV1hFG!qDg9UTsz?FT-7e2<-pkl50@z#LbGy}#WjQJ_Zyg8(V(@9&>wHF7S|y>Syx
zu#*OSb&=)yS5}tiZVQOxv2k&Q#l^JtO+G2P7!lwdE&f#EqwQtokab~w1A~J75YRiJ
zhqdHE90tWqO`qwG5(?W{hGr0&n+-JO#l`6+o6)_1xn~BYpjquUAO$f2@tcz;G?bMw
zt#ut#mq`KM+f{L?tE+2LK<3xc(P8K3mpX+>VNsFh=YQD99MCGMM8Ry`Wd3Nos^{rK
zH~gKa#}~-K%M;f{;8ilb1y!Y`b6NMxrrUy80IU2l7+8O5TG|GYMFzikw>_8@bVwna
zWTm+J%1Wueb9WQpxngH!KvQUvr~=h{ZKjrK{bS`@D@-Mi4I-<mDn+RoSy(pylHv{g
z0xYAb9x$nIa}WeN5e*F|3qT-oUb$)zH>09X<O!gaJig0CC~XCfHov`pU;UZ>Ya*5O
zIAC^=H!vv31%=YvdM=ct6BBW;L&=Rk5cm7m5)J&_#UA*U3o8Uf*Otg56~oJEW!8(J
zWoT@K54ZkeBl9Kc44Z;g9)(GJnQVq0f7nbB(>?X0Ivby3uDOMg(n}52(OH?o9eY0#
z>#OTbho-tBF4EG{@(2kz`Ojy3k_X8)Uwg?jJ}xc+=WFE@b)@hS^vG*<LXmrg_son<
zP1!*Sqd`(STqm6el&wKg5=u)Y9$+x1j>E~#?G_Tk<Kp51PRSG%72PAWc6A9J9UZOj
z?l!lc)N~(nL^N%CsX@Smx}l-1mEIiC;XidKH8POTKD&NErd*Av$Tx1E3N+B0c@1OS
z;ue;c$T2?}c~T1yi1*+THpogd-#d4w(*$1h5Yw>7#|LQY<}xI&0;EMZH@Es417H}W
zqS%teL>9-Wqab9cqoW`WhvQQ1>g*Jtr>9T-14>E#JCo@YnQ+azS~bjVu9iFdG!s@-
zz?y_W8?(QU%L!738z36xr1ep&l!o3}_BomEL(v2NlY^NPad)6Y09t1tAldM1MDja@
zZ_t+j3sSRob1Pn6`Wj|kS(X2~bGoFeM*=V%eMfU-EX;$Ifds3v9~>AUkshDF^!xF7
zA+G0{Hd0)<YGGWbkZ;AzncCYYf=1cU*tn>@{bHt!lTL83qH&(erGvJy0_Gg=ouSH%
zsv&+J9`<cL(Ea~51r09wBqjrNh;%*C-48Soh{kXKZ?7u;2NPd7!4F`cu?h>&fHyx7
Nq_#1lTGRQ_e*haG+N=No

literal 0
HcmV?d00001

diff --git a/docs/reference/index.rst b/docs/reference/index.rst
new file mode 100644
index 0000000..7670ba5
--- /dev/null
+++ b/docs/reference/index.rst
@@ -0,0 +1,50 @@
+================
+Syntax Reference
+================
+
+This is the official specification of the blueprint format.
+
+The grammar is expressed as a `parsing expression grammar <https://en.wikipedia.org/wiki/Parsing_expression_grammar>`_. This has two important implications: the parser will never backtrack, and alternation (e.g. a ``|`` in the specification) will always take the *first* branch that matches, even if that causes an error later. These properties make PEGs both unambiguous and simple to implement in code.
+
+Blueprint uses C-style line comments (``// comment for the rest of the line``) and block comments (``/* multiline comment... */``).
+
+Wherever commas are used as delimiters in repetition (expressed in this reference as ``( <rule> ),*``), the trailing comma is permitted and optional.
+
+.. toctree::
+   :maxdepth: 1
+
+   document_root
+   objects
+   templates
+   values
+   expressions
+   menus
+   extensions
+   diagnostics
+
+
+Tokens
+------
+
+.. _Syntax IDENT:
+
+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.
+
+.. _Syntax NUMBER:
+
+NUMBER
+~~~~~~
+
+Numbers begin with an ASCII digit and consist of ASCII digits, underscores, dots ``.``, and letters (for radix pre-/suffixes). More than one dot in a number is not allowed. Underscores are permitted for increased readability, and are ignored.
+
+Hexadecimal numbers may be specified using the ``0x`` prefix and may use uppercase or lowercase letters, or a mix. Hexadecimal values may not have a fractional part. They are generally converted to decimal in the output.
+
+.. _Syntax QUOTED:
+
+QUOTED
+~~~~~~
+
+Quotes begin with an ASCII single quote ``'`` or double quote ``"`` and end with the same character they started with. An ASCII backslash ``\`` begins an escape sequence; this allows newlines ``\n``, tabs ``\t``, and quotes ``\'``, ``\"`` to be inserted. It also allows multiline strings by escaping a newline character, which will be ignored.
diff --git a/docs/reference/menus.rst b/docs/reference/menus.rst
new file mode 100644
index 0000000..525458b
--- /dev/null
+++ b/docs/reference/menus.rst
@@ -0,0 +1,62 @@
+=====
+Menus
+=====
+
+.. _Syntax Menu:
+
+Menus
+-----
+
+.. rst-class:: grammar-block
+
+   Menu = 'menu' <id::ref:`IDENT<Syntax IDENT>`>? '{' MenuChild* '}'
+   MenuChild = ( MenuSection | MenuSubmenu | :ref:`MenuItemShorthand<Syntax MenuItemShorthand>` | MenuItem )
+   MenuSection = 'section' <id::ref:`IDENT<Syntax IDENT>`>? '{' ( MenuChild | MenuAttribute )* '}'
+   MenuSubmenu = 'submenu' <id::ref:`IDENT<Syntax IDENT>`>? '{' ( MenuChild | MenuAttribute )* '}'
+   MenuItem = 'item' '{' MenuAttribute* '}'
+   MenuAttribute = <name::ref:`IDENT<Syntax IDENT>`> ':' :ref:`StringValue<Syntax StringValue>` ';'
+
+Menus, such as the application menu, are defined using the ``menu`` keyword. Menus have the type `Gio.MenuModel <https://docs.gtk.org/gio/class.MenuModel.html>`_ and can be referenced by ID. They cannot be defined inline.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   menu my_menu {
+     submenu {
+       label: _("File");
+       item {
+         label: _("New");
+         action: "app.new";
+         icon: "document-new-symbolic";
+       }
+     }
+   }
+
+   MenuButton {
+     menu-model: my_menu;
+   }
+
+
+.. _Syntax MenuItemShorthand:
+
+Item Shorthand
+--------------
+
+.. rst-class:: grammar-block
+
+   MenuItemShorthand = 'item' '(' :ref:`StringValue<Syntax StringValue>` ( ',' ( :ref:`StringValue<Syntax StringValue>` ( ',' :ref:`StringValue<Syntax StringValue>`? )? )? )? ')'
+
+The most common menu attributes are ``label``, ``action``, and ``icon``. Because they're so common, Blueprint provides a shorter syntax for menu items with just these properties.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   menu {
+     item ("label")
+     item ("label", "action")
+     item ("label", "action", "icon")
+   }
diff --git a/docs/reference/objects.rst b/docs/reference/objects.rst
new file mode 100644
index 0000000..4b53980
--- /dev/null
+++ b/docs/reference/objects.rst
@@ -0,0 +1,189 @@
+=======
+Objects
+=======
+
+
+.. _Syntax Object:
+
+Objects
+-------
+
+.. rst-class:: grammar-block
+
+   Object = :ref:`TypeName<Syntax TypeName>` <id::ref:`IDENT<Syntax IDENT>`>? ObjectContent
+   ObjectContent = '{' (:ref:`Signal<Syntax Signal>` | :ref:`Property<Syntax Property>` | :ref:`Extension<Syntax Extension>` | :ref:`Child<Syntax Child>`)* '}'
+
+Objects are the basic building blocks of a GTK user interface. Your widgets are all objects, as are some other features such as list models.
+
+Optionally, objects may have an ID to provide a handle for other parts of the blueprint and your code to access objects.
+
+.. note::
+
+   Object IDs must be unique within their scope. The document root is a scope, but :ref:`sub-templates<Syntax ExtListItemFactory>` have their own, isolated scope.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   Label label1 {
+     label: "Hello, world!";
+   }
+   Label label2 {
+     label: bind-property file.name;
+   }
+
+
+.. _Syntax TypeName:
+
+Type Names
+----------
+
+.. rst-class:: grammar-block
+
+   TypeName = TypeNameFull | TypeNameExternal | TypeNameShort
+   TypeNameFull = <namespace::ref:`IDENT<Syntax IDENT>`> '.' <name::ref:`IDENT<Syntax IDENT>`>
+   TypeNameExternal = '$' <name::ref:`IDENT<Syntax IDENT>`>
+   TypeNameShort = <name::ref:`IDENT<Syntax IDENT>`>
+
+There are three forms of type names: full, short, and external. Full type names take the form ``{namespace}.{name}``, e.g. ``Gtk.ApplicationWindow`` or ``Adw.Leaflet``. Because GTK types are so common, the Gtk namespace may be omitted, shortening ``Gtk.ApplicationWindow`` to just ``ApplicationWindow``.
+
+External type names refer to types defined in your application. They are prefixed with ``$`` and do not have a dot between the namespace and class name. In fact, anywhere a ``$`` is used in a blueprint, it refers to something that must be defined in your application code.
+
+
+.. _Syntax Property:
+
+Properties
+----------
+
+.. rst-class:: grammar-block
+
+   Property = <name::ref:`IDENT<Syntax IDENT>`> ':' ( :ref:`PropertyBinding<Syntax PropertyBinding>` | :ref:`Binding<Syntax Binding>` | :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.
+
+Most properties are static and directly specified in the blueprint, but properties can also be bound to a data model using the ``bind`` or ``bind-property`` keywords.
+
+A property's value can be another object, either inline or referenced by ID.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   Label {
+     label: "text";
+   }
+
+   Button {
+     /* Inline object value. Notice the semicolon after the object. */
+     child: Image {
+       /* ... */
+     };
+   }
+
+
+.. _Syntax Signal:
+
+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'
+
+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>`_).
+
+Signals provide a handle for your code to listen to events in the UI. The handler name is prefixed with ``$`` to indicate that it's an external symbol which needs to be provided by your code; if it isn't, things might not work correctly, or at all.
+
+Optionally, you can provide an object ID to use when connecting the signal.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   Button {
+     clicked => $on_button_clicked();
+   }
+
+
+.. _Syntax Child:
+
+Children
+--------
+
+.. rst-class:: grammar-block
+
+   Child = ChildAnnotation? :ref:`Object<Syntax Object>`
+   ChildAnnotation = '[' ( ChildInternal | :ref:`ChildExtension<Syntax ChildExtension>` | ChildType ) ']'
+   ChildInternal = 'internal-child' <internal-child::ref:`IDENT<Syntax IDENT>`>
+   ChildType = <child_type::ref:`IDENT<Syntax IDENT>`>
+
+Some objects can have children. This defines the hierarchical structure of a user interface: containers contain widgets, which can be other containers, and so on.
+
+Child annotations are defined by the parent widget. Some widgets, such as `HeaderBar <https://docs.gtk.org/gtk4/class.HeaderBar.html>`_, have "child types" which allow different child objects to be treated in different ways. Some, such as `Dialog <https://docs.gtk.org/gtk4/class.Dialog.html>`_ and `InfoBar <https://docs.gtk.org/gtk4/class.InfoBar.html>`_, define child :ref:`extensions<Syntax ChildExtension>`, which provide more detailed information about the child.
+
+Internal children are a special case. Rather than creating a new object, children marked with ``[internal-child <name>]`` modify an existing object provided by the parent. This is used, for example, for the ``content_area`` of a `Dialog <https://docs.gtk.org/gtk4/class.Dialog.html>`_.
+
+.. note::
+
+   The objects at the root of a blueprint cannot have child annotations, since there is no root widget for them to be a child of.
+
+.. note::
+
+   Some widgets, like `Button <https://docs.gtk.org/gtk4/class.Button.html>`_, use a property to set their child instead. Widgets added in this way don't have child annotations.
+
+Examples
+~~~~~~~~
+
+Add children to a container
++++++++++++++++++++++++++++
+
+.. code-block:: blueprintui
+
+   Button {
+     Image {}
+   }
+
+Child types
++++++++++++
+
+.. code-block:: blueprintui
+
+   HeaderBar {
+     [start]
+     Label {
+     }
+
+     [end]
+     Button {
+     }
+   }
+
+Child extensions
+++++++++++++++++
+
+.. code-block:: blueprintui
+
+   Dialog {
+     // Here, a child extension annotation defines the button's response.
+     [action response=cancel]
+     Button {}
+   }
+
+Internal children
+++++++++++++++++
+
+.. code-block:: blueprintui
+
+   Dialog {
+     [internal-child content_area]
+     Box {
+       // Unlike most objects in a blueprint, this internal-child widget
+       // represents the properties, signal handlers, children, and extensions
+       // of an existing Box created by the Dialog, not a new Box created by
+       // the blueprint.
+     }
+   }
diff --git a/docs/reference/templates.rst b/docs/reference/templates.rst
new file mode 100644
index 0000000..be799be
--- /dev/null
+++ b/docs/reference/templates.rst
@@ -0,0 +1,82 @@
+===================
+Composite Templates
+===================
+
+.. _Syntax Template:
+
+Composite Templates
+-------------------
+
+.. rst-class:: grammar-block
+
+   Template = 'template' <id::ref:`IDENT<Syntax IDENT>`> ( ':' :ref:`TypeName<Syntax TypeName>` )? :ref:`ObjectContent<Syntax Object>`
+
+Widget subclassing is one of the primary techniques for structuring an application. For example, a maps app might have a `Gtk.ApplicationWindow <https://docs.gtk.org/gtk4/class.ApplicationWindow.html>`_ subclass, ``MapsApplicationWindow``, that implements the functionality of its main window. But a maps app has a lot of functionality, so the headerbar might be split into its own `Gtk.HeaderBar <https://docs.gtk.org/gtk4/class.HeaderBar.html>`_ subclass, ``MapsHeaderBar``, for the sake of organization.
+
+You could implement this with the following blueprint:
+
+.. code-block:: blueprintui
+
+   using Gtk 4.0;
+
+   $MapsApplicationWindow window {
+     $MapsHeaderBar {
+       /* probably a lot of buttons ... */
+     }
+
+     $MapsMainView {
+       /* a lot more UI definitions ... */
+     }
+   }
+
+There are two problems with this approach:
+
+1. The widget code may be organized neatly into different files, but the UI is not. This blueprint contains the entire UI definition for the app.
+
+2. Widgets aren't in control of their own contents. It shouldn't be up to the caller to construct a widget using the correct blueprint--that's an implementation detail of the widget.
+
+We can solve these problems by giving each widget its own blueprint file, which we reference in the widget's constructor. Then, whenever the widget is instantiated (by another blueprint, or by the application), it will get all the children and properties defined in its blueprint.
+
+For this to work, we need to specify in the blueprint which object is the one being instantiated. We do this with a template block:
+
+.. code-block:: blueprintui
+
+   using Gtk 4.0;
+
+   template MapsHeaderBar : Gtk.HeaderBar {
+     /* probably a lot of buttons ... */
+   }
+
+   Gio.ListStore bookmarked_places_store {
+     /* This isn't the object being instantiated, just an auxillary object. GTK knows this because it isn't the
+        one marked with 'template'. */
+   }
+
+This blueprint can only be used by the ``MapsHeaderBar`` constructor. Instantiating it with ``Gtk.Builder`` won't work since it needs an existing, under-construction ``MapsHeaderBar`` to use for the template object. The ``template`` block must be at the top level of the file (not nested within another object) and only one is allowed per file.
+
+This ``MapsHeaderBar`` class, along with its blueprint template, can then be referenced in another blueprint:
+
+.. code-block:: blueprintui
+
+   using Gtk 4.0;
+
+   ApplicationWindow {
+     $MapsHeaderBar {
+       /* Nothing needed here, the widgets are in the MapsHeaderBar template. */
+     }
+   }
+
+ID & Parent Parameters
+~~~~~~~~~~~~~~~~~~~~~~
+
+The ID of a template must match the full class name in your application code. The ID can be used elsewhere in the blueprint to reference the template object, just like any other object ID.
+
+The parent type is optional and enables type checking for the template object.
+
+
+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
diff --git a/docs/reference/values.rst b/docs/reference/values.rst
new file mode 100644
index 0000000..6a0499c
--- /dev/null
+++ b/docs/reference/values.rst
@@ -0,0 +1,168 @@
+======
+Values
+======
+
+
+.. _Syntax Value:
+
+Values
+------
+
+.. rst-class:: grammar-block
+
+   Value = :ref:`Translated<Syntax Translated>` | :ref:`Flags<Syntax Flags>` | :ref:`Literal<Syntax Literal>`
+
+
+.. _Syntax Literal:
+
+Literals
+--------
+
+.. rst-class:: grammar-block
+
+   Literal = :ref:`TypeLiteral<Syntax TypeLiteral>` | QuotedLiteral | NumberLiteral | IdentLiteral
+   QuotedLiteral = <value::ref:`QUOTED<Syntax QUOTED>`>
+   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.
+
+
+.. _Syntax TypeLiteral:
+
+Type Literals
+-------------
+
+.. rst-class:: grammar-block
+
+   TypeLiteral = 'typeof' '<' :ref:`TypeName<Syntax TypeName>` '>'
+
+Sometimes, you need to specify a type as a value. For example, when creating a list store, you may need to specify the type of the items in the list store. This is done using a ``typeof<>`` literal.
+
+The type of a ``typeof<>`` literal is `GType <https://docs.gtk.org/gobject/alias.Type.html>`_, GObject's "meta-type" for type information.
+
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   Gio.ListStore {
+     item-type: typeof<GObject.Object>;
+   }
+
+
+.. _Syntax Flags:
+
+Flags
+-----
+
+.. rst-class:: grammar-block
+
+   Flags = <first::ref:`IDENT<Syntax IDENT>`> '|' ( <rest::ref:`IDENT<Syntax IDENT>`> )|+
+
+Flags are used to specify a set of options. One or more of the available flag values may be specified, and they are combined using ``|``.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   Adw.TabView {
+     shortcuts: control_tab | control_shift_tab;
+   }
+
+
+.. _Syntax Translated:
+
+Translated Strings
+------------------
+
+.. rst-class:: grammar-block
+
+   Translated = ( '_' '(' <string::ref:`QUOTED<Syntax QUOTED>`> ','? ')' ) | ( '\C_' '(' <context::ref:`QUOTED<Syntax QUOTED>`> ',' <string::ref:`QUOTED<Syntax QUOTED>`> ','? ')' )
+
+
+Use ``_("...")`` to mark strings as translatable. You can put a comment for translators on the line above if needed.
+
+.. code-block::
+
+   Gtk.Label label {
+     /* Translators: This is the main text of the welcome screen */
+     label: _("Hello, world!");
+   }
+
+Use ``C_("context", "...")`` to add a *message context* to a string to disambiguate it, in case the same string appears in different places. Remember, two strings might be the same in one language but different in another depending on context.
+
+.. code-block::
+
+   Gtk.Label label {
+     /* Translators: This is a section in the preferences window */
+     label: C_("preferences window", "Hello, world!");
+   }
+
+
+.. _Syntax PropertyBinding:
+
+Property Bindings
+-----------------
+
+.. rst-class:: grammar-block
+
+   PropertyBinding = 'bind-property' <source::ref:`IDENT<Syntax IDENT>`> '.' <property::ref:`IDENT<Syntax IDENT>`> (PropertyBindingFlag)*
+   PropertyBindingFlag = 'inverted' | 'bidirectional' | 'no-sync-create'
+
+Bindings keep a property updated as another property changes. They can be used to keep the UI in sync with application data, or to connect two parts of the UI.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   /* Use property bindings to show a label when a switch
+    * is active, without any application code */
+
+   Switch advanced_feature {}
+
+   Label warning {
+     visible: bind-property advanced_feature.active;
+     label: _("This is an advanced feature. Use with caution!");
+   }
+
+
+.. _Syntax Binding:
+
+Expression Bindings
+-------------------
+
+.. rst-class:: grammar-block
+
+   Binding = 'bind' :ref:`Expression<Syntax Expression>`
+
+Expression bindings serve the same purpose as property bindings, but are more powerful. They can call application code to compute the value of a property, and they can do multi-step property lookups. See :ref:`the expressions page<Syntax Expression>`.
+
+
+.. _Syntax ObjectValue:
+
+Object Values
+-------------
+
+.. rst-class:: grammar-block
+
+   ObjectValue = :ref:`Object<Syntax Object>`
+
+The value of a property can be an object, specified inline. This is particularly useful for widgets that use a ``child`` property rather than a list of child widgets. Objects constructed in this way can even have IDs and be referenced in other places in the blueprint.
+
+Such objects cannot have child annotations because they aren't, as far as blueprint is concerned, children of another object.
+
+
+.. _Syntax StringValue:
+
+String Values
+-------------
+
+.. rst-class:: grammar-block
+
+   StringValue = :ref:`Translated<Syntax Translated>` | :ref:`QuotedLiteral<Syntax Literal>`
+
+Menus, as well as some :ref:`extensions<Syntax Extensions>`, have properties that can only be string literals or translated strings.

From 9e82a2fb2a33781285432111f22c0d7e8493a24a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 9 Apr 2023 14:46:29 -0500
Subject: [PATCH 105/290] language: Rename expression classes

Rename the expression classes to match the documentation.
---
 blueprintcompiler/language/__init__.py        |  4 +--
 blueprintcompiler/language/binding.py         |  8 +++---
 blueprintcompiler/language/expression.py      | 26 +++++++++----------
 .../language/gobject_property.py              |  2 +-
 blueprintcompiler/outputs/xml/__init__.py     |  6 ++---
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index c48ae35..99521a3 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -7,8 +7,8 @@ from .expression import (
     CastExpr,
     ClosureArg,
     ClosureExpr,
-    Expr,
-    ExprChain,
+    ExprBase,
+    Expression,
     LiteralExpr,
     LookupOp,
 )
diff --git a/blueprintcompiler/language/binding.py b/blueprintcompiler/language/binding.py
index b2dee10..88105fc 100644
--- a/blueprintcompiler/language/binding.py
+++ b/blueprintcompiler/language/binding.py
@@ -20,19 +20,19 @@
 from dataclasses import dataclass
 
 from .common import *
-from .expression import ExprChain, LookupOp, LiteralExpr
+from .expression import Expression, LookupOp, LiteralExpr
 from .contexts import ValueTypeCtx
 
 
 class Binding(AstNode):
     grammar = [
         Keyword("bind"),
-        ExprChain,
+        Expression,
     ]
 
     @property
-    def expression(self) -> ExprChain:
-        return self.children[ExprChain][0]
+    def expression(self) -> Expression:
+        return self.children[Expression][0]
 
     @property
     def simple_binding(self) -> T.Optional["SimpleBinding"]:
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 0cf41b0..dd8db60 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -27,7 +27,7 @@ from .gtkbuilder_template import Template
 expr = Sequence()
 
 
-class Expr(AstNode):
+class ExprBase(AstNode):
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
         if rhs := self.rhs:
@@ -44,8 +44,8 @@ class Expr(AstNode):
         return True
 
     @property
-    def rhs(self) -> T.Optional["Expr"]:
-        if isinstance(self.parent, ExprChain):
+    def rhs(self) -> T.Optional["ExprBase"]:
+        if isinstance(self.parent, Expression):
             children = list(self.parent.children)
             if children.index(self) + 1 < len(children):
                 return children[children.index(self) + 1]
@@ -55,11 +55,11 @@ class Expr(AstNode):
             return None
 
 
-class ExprChain(Expr):
+class Expression(ExprBase):
     grammar = expr
 
     @property
-    def last(self) -> Expr:
+    def last(self) -> ExprBase:
         return self.children[-1]
 
     @property
@@ -71,14 +71,14 @@ class ExprChain(Expr):
         return self.last.type_complete
 
 
-class InfixExpr(Expr):
+class InfixExpr(ExprBase):
     @property
     def lhs(self):
-        children = list(self.parent_by_type(ExprChain).children)
+        children = list(self.parent_by_type(Expression).children)
         return children[children.index(self) - 1]
 
 
-class LiteralExpr(Expr):
+class LiteralExpr(ExprBase):
     grammar = LITERAL
 
     @property
@@ -208,18 +208,18 @@ class CastExpr(InfixExpr):
 
 
 class ClosureArg(AstNode):
-    grammar = ExprChain
+    grammar = Expression
 
     @property
-    def expr(self) -> ExprChain:
-        return self.children[ExprChain][0]
+    def expr(self) -> Expression:
+        return self.children[Expression][0]
 
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
         return ValueTypeCtx(None)
 
 
-class ClosureExpr(Expr):
+class ClosureExpr(ExprBase):
     grammar = [
         Optional(["$", UseLiteral("extern", True)]),
         UseIdent("name"),
@@ -257,6 +257,6 @@ class ClosureExpr(Expr):
 
 
 expr.children = [
-    AnyOf(ClosureExpr, LiteralExpr, ["(", ExprChain, ")"]),
+    AnyOf(ClosureExpr, LiteralExpr, ["(", Expression, ")"]),
     ZeroOrMore(AnyOf(LookupOp, CastExpr)),
 ]
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 6beb738..b52feb9 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -19,7 +19,7 @@
 
 from dataclasses import dataclass
 
-from .expression import ExprChain
+from .expression import Expression
 from .gobject_object import Object
 from .gtkbuilder_template import Template
 from .values import Value, ObjectValue
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index ed13610..852a81b 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -211,15 +211,15 @@ class XmlOutput(OutputFormat):
         else:
             raise CompilerBugError()
 
-    def _emit_expression(self, expression: ExprChain, xml: XmlEmitter):
+    def _emit_expression(self, expression: Expression, xml: XmlEmitter):
         self._emit_expression_part(expression.last, xml)
 
-    def _emit_expression_part(self, expression: Expr, xml: XmlEmitter):
+    def _emit_expression_part(self, expression: ExprBase, xml: XmlEmitter):
         if isinstance(expression, LiteralExpr):
             self._emit_literal_expr(expression, xml)
         elif isinstance(expression, LookupOp):
             self._emit_lookup_op(expression, xml)
-        elif isinstance(expression, ExprChain):
+        elif isinstance(expression, Expression):
             self._emit_expression(expression, xml)
         elif isinstance(expression, CastExpr):
             self._emit_cast_expr(expression, xml)

From 10806bce1ed9fd60457f506c23144e41190a0bf5 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 9 Apr 2023 16:33:10 -0500
Subject: [PATCH 106/290] language: Rename extension classes

Rename extension classes to match the syntax reference.
---
 blueprintcompiler/language/__init__.py        | 45 ++++++++++---------
 .../language/adw_message_dialog.py            |  2 +-
 blueprintcompiler/language/gtk_a11y.py        |  4 +-
 .../language/gtk_combo_box_text.py            |  2 +-
 blueprintcompiler/language/gtk_file_filter.py |  6 +--
 blueprintcompiler/language/gtk_layout.py      |  2 +-
 .../language/gtk_list_item_factory.py         |  2 +-
 blueprintcompiler/language/gtk_size_group.py  |  2 +-
 blueprintcompiler/language/gtk_string_list.py |  2 +-
 blueprintcompiler/language/gtk_styles.py      |  2 +-
 blueprintcompiler/outputs/xml/__init__.py     | 18 ++++----
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 99521a3..f544204 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,5 +1,5 @@
-from .gtk_list_item_factory import ListItemFactory
-from .adw_message_dialog import Responses
+from .gtk_list_item_factory import ExtListItemFactory
+from .adw_message_dialog import ExtAdwMessageDialog
 from .attributes import BaseAttribute, BaseTypedAttribute
 from .binding import Binding
 from .contexts import ValueTypeCtx
@@ -15,14 +15,19 @@ from .expression import (
 from .gobject_object import Object, ObjectContent
 from .gobject_property import Property
 from .gobject_signal import Signal
-from .gtk_a11y import A11y
-from .gtk_combo_box_text import Items
-from .gtk_file_filter import mime_types, patterns, suffixes, Filters
-from .gtk_layout import Layout
+from .gtk_a11y import ExtAccessibility
+from .gtk_combo_box_text import ExtComboBoxItems
+from .gtk_file_filter import (
+    ext_file_filter_mime_types,
+    ext_file_filter_patterns,
+    ext_file_filter_suffixes,
+    Filters,
+)
+from .gtk_layout import ExtLayout
 from .gtk_menu import menu, Menu, MenuAttribute
-from .gtk_size_group import Widgets
-from .gtk_string_list import Strings
-from .gtk_styles import Styles
+from .gtk_size_group import ExtSizeGroupWidgets
+from .gtk_string_list import ExtStringListStrings
+from .gtk_styles import ExtStyles
 from .gtkbuilder_child import Child, ChildType, ChildInternal, ChildExtension
 from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
@@ -48,17 +53,17 @@ from .common import *
 OBJECT_CONTENT_HOOKS.children = [
     Signal,
     Property,
-    A11y,
-    Styles,
-    Layout,
-    mime_types,
-    patterns,
-    suffixes,
-    Widgets,
-    Items,
-    Strings,
-    ListItemFactory,
-    Responses,
+    ExtAccessibility,
+    ExtAdwMessageDialog,
+    ExtComboBoxItems,
+    ext_file_filter_mime_types,
+    ext_file_filter_patterns,
+    ext_file_filter_suffixes,
+    ExtLayout,
+    ExtListItemFactory,
+    ExtSizeGroupWidgets,
+    ExtStringListStrings,
+    ExtStyles,
     Child,
 ]
 
diff --git a/blueprintcompiler/language/adw_message_dialog.py b/blueprintcompiler/language/adw_message_dialog.py
index 3aa1911..3cbd3e2 100644
--- a/blueprintcompiler/language/adw_message_dialog.py
+++ b/blueprintcompiler/language/adw_message_dialog.py
@@ -67,7 +67,7 @@ class Response(AstNode):
         )
 
 
-class Responses(AstNode):
+class ExtAdwMessageDialog(AstNode):
     grammar = [
         Keyword("responses"),
         Match("[").expected(),
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index a3e1888..930606c 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -159,7 +159,7 @@ class A11yProperty(BaseTypedAttribute):
             return _get_docs(self.root.gir, self.tokens["name"])
 
 
-class A11y(AstNode):
+class ExtAccessibility(AstNode):
     grammar = [
         Keyword("accessibility"),
         "{",
@@ -190,7 +190,7 @@ def a11y_completer(ast_node, match_variables):
 
 
 @completer(
-    applies_in=[A11y],
+    applies_in=[ExtAccessibility],
     matches=new_statement_patterns,
 )
 def a11y_name_completer(ast_node, match_variables):
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index b20eaf0..527ff50 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -49,7 +49,7 @@ item = Group(
 )
 
 
-class Items(AstNode):
+class ExtComboBoxItems(AstNode):
     grammar = [
         Keyword("items"),
         "[",
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 9625094..668568e 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -67,9 +67,9 @@ def create_node(tag_name: str, singular: str):
     )
 
 
-mime_types = create_node("mime-types", "mime-type")
-patterns = create_node("patterns", "pattern")
-suffixes = create_node("suffixes", "suffix")
+ext_file_filter_mime_types = create_node("mime-types", "mime-type")
+ext_file_filter_patterns = create_node("patterns", "pattern")
+ext_file_filter_suffixes = create_node("suffixes", "suffix")
 
 
 @completer(
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index 4862148..83a5fcc 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -55,7 +55,7 @@ layout_prop = Group(
 )
 
 
-class Layout(AstNode):
+class ExtLayout(AstNode):
     grammar = Sequence(
         Keyword("layout"),
         "{",
diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index ae9d019..9aab904 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -5,7 +5,7 @@ from .common import *
 from .contexts import ScopeCtx
 
 
-class ListItemFactory(AstNode):
+class ExtListItemFactory(AstNode):
     grammar = [Keyword("template"), ObjectContent]
 
     @property
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index 6a3ecb1..9e45768 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -44,7 +44,7 @@ class Widget(AstNode):
             )
 
 
-class Widgets(AstNode):
+class ExtSizeGroupWidgets(AstNode):
     grammar = [
         Keyword("widgets"),
         "[",
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index c6aed81..73a8b8d 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -32,7 +32,7 @@ class Item(AstNode):
         return self.children[StringValue][0]
 
 
-class Strings(AstNode):
+class ExtStringListStrings(AstNode):
     grammar = [
         Keyword("strings"),
         "[",
diff --git a/blueprintcompiler/language/gtk_styles.py b/blueprintcompiler/language/gtk_styles.py
index 1005568..46e9a23 100644
--- a/blueprintcompiler/language/gtk_styles.py
+++ b/blueprintcompiler/language/gtk_styles.py
@@ -26,7 +26,7 @@ class StyleClass(AstNode):
     grammar = UseQuoted("name")
 
 
-class Styles(AstNode):
+class ExtStyles(AstNode):
     grammar = [
         Keyword("styles"),
         "[",
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 852a81b..db53030 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -46,7 +46,7 @@ class XmlOutput(OutputFormat):
         xml.end_tag()
 
     def _emit_object_or_template(
-        self, obj: T.Union[Object, Template, ListItemFactory], xml: XmlEmitter
+        self, obj: T.Union[Object, Template, ExtListItemFactory], xml: XmlEmitter
     ):
         for child in obj.content.children:
             if isinstance(child, Property):
@@ -274,7 +274,7 @@ class XmlOutput(OutputFormat):
             xml.end_tag()
 
     def _emit_extensions(self, extension, xml: XmlEmitter):
-        if isinstance(extension, A11y):
+        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)
@@ -288,19 +288,19 @@ class XmlOutput(OutputFormat):
                 xml.end_tag()
             xml.end_tag()
 
-        elif isinstance(extension, Items):
+        elif isinstance(extension, ExtComboBoxItems):
             xml.start_tag("items")
             for prop in extension.children:
                 self._emit_attribute("item", "id", prop.name, prop.value, xml)
             xml.end_tag()
 
-        elif isinstance(extension, Layout):
+        elif isinstance(extension, ExtLayout):
             xml.start_tag("layout")
             for prop in extension.children:
                 self._emit_attribute("property", "name", prop.name, prop.value, xml)
             xml.end_tag()
 
-        elif isinstance(extension, Responses):
+        elif isinstance(extension, ExtAdwMessageDialog):
             xml.start_tag("responses")
             for response in extension.responses:
                 xml.start_tag(
@@ -314,7 +314,7 @@ class XmlOutput(OutputFormat):
                 xml.end_tag()
             xml.end_tag()
 
-        elif isinstance(extension, Strings):
+        elif isinstance(extension, ExtStringListStrings):
             xml.start_tag("items")
             for string in extension.children:
                 value = string.child
@@ -322,7 +322,7 @@ class XmlOutput(OutputFormat):
                 xml.put_text(value.string)
                 xml.end_tag()
             xml.end_tag()
-        elif isinstance(extension, ListItemFactory):
+        elif isinstance(extension, ExtListItemFactory):
             child_xml = XmlEmitter()
             child_xml.start_tag("interface")
             child_xml.start_tag("template", **{"class": "GtkListItem"})
@@ -333,13 +333,13 @@ class XmlOutput(OutputFormat):
             xml.put_cdata(child_xml.result)
             xml.end_tag()
 
-        elif isinstance(extension, Styles):
+        elif isinstance(extension, ExtStyles):
             xml.start_tag("style")
             for prop in extension.children:
                 xml.put_self_closing("class", name=prop.tokens["name"])
             xml.end_tag()
 
-        elif isinstance(extension, Widgets):
+        elif isinstance(extension, ExtSizeGroupWidgets):
             xml.start_tag("widgets")
             for prop in extension.children:
                 xml.put_self_closing("widget", name=prop.tokens["name"])

From a9f6bf8d89400b2fa0d5dc7a4e734d0ea278cce1 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 11 Apr 2023 21:26:37 -0500
Subject: [PATCH 107/290] Remove unused imports and code

---
 blueprintcompiler/completions.py                 |  2 +-
 blueprintcompiler/language/__init__.py           |  2 +-
 blueprintcompiler/language/attributes.py         |  6 ------
 blueprintcompiler/language/binding.py            |  1 -
 blueprintcompiler/language/gobject_property.py   |  3 ---
 blueprintcompiler/language/gtk_a11y.py           |  7 ++++---
 blueprintcompiler/language/gtk_combo_box_text.py |  1 -
 blueprintcompiler/language/gtk_layout.py         |  1 -
 blueprintcompiler/language/gtk_menu.py           | 11 -----------
 blueprintcompiler/language/gtk_string_list.py    |  1 -
 blueprintcompiler/language/gtk_styles.py         |  4 ++++
 blueprintcompiler/language/property_binding.py   |  1 -
 blueprintcompiler/language/types.py              |  1 -
 blueprintcompiler/language/values.py             |  2 --
 blueprintcompiler/outputs/xml/__init__.py        |  4 ++--
 15 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index 6a944dd..fc6eeee 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -126,7 +126,7 @@ def property_completer(ast_node, match_variables):
 
 
 @completer(
-    applies_in=[language.Property, language.BaseTypedAttribute],
+    applies_in=[language.Property, language.BaseAttribute],
     matches=[[(TokenType.IDENT, None), (TokenType.OP, ":")]],
 )
 def prop_value_completer(ast_node, match_variables):
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index f544204..b5e2f04 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,6 +1,6 @@
 from .gtk_list_item_factory import ExtListItemFactory
 from .adw_message_dialog import ExtAdwMessageDialog
-from .attributes import BaseAttribute, BaseTypedAttribute
+from .attributes import BaseAttribute
 from .binding import Binding
 from .contexts import ValueTypeCtx
 from .expression import (
diff --git a/blueprintcompiler/language/attributes.py b/blueprintcompiler/language/attributes.py
index c713917..8ff1f0b 100644
--- a/blueprintcompiler/language/attributes.py
+++ b/blueprintcompiler/language/attributes.py
@@ -18,7 +18,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .values import Value, Translated
 from .common import *
 
 
@@ -31,8 +30,3 @@ class BaseAttribute(AstNode):
     @property
     def name(self):
         return self.tokens["name"]
-
-
-class BaseTypedAttribute(BaseAttribute):
-    """A BaseAttribute whose parent has a value_type property that can assist
-    in validation."""
diff --git a/blueprintcompiler/language/binding.py b/blueprintcompiler/language/binding.py
index 88105fc..b13d5da 100644
--- a/blueprintcompiler/language/binding.py
+++ b/blueprintcompiler/language/binding.py
@@ -21,7 +21,6 @@ from dataclasses import dataclass
 
 from .common import *
 from .expression import Expression, LookupOp, LiteralExpr
-from .contexts import ValueTypeCtx
 
 
 class Binding(AstNode):
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index b52feb9..31ff40d 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -17,10 +17,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-from dataclasses import dataclass
 
-from .expression import Expression
-from .gobject_object import Object
 from .gtkbuilder_template import Template
 from .values import Value, ObjectValue
 from .common import *
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index 930606c..c378927 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -18,10 +18,11 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 from .gobject_object import ObjectContent, validate_parent_type
-from .attributes import BaseTypedAttribute
+from .attributes import BaseAttribute
 from .values import Value
 from .common import *
 from .contexts import ValueTypeCtx
+from ..decompiler import escape_quote
 
 
 def get_property_types(gir):
@@ -105,7 +106,7 @@ def _get_docs(gir, name):
         return gir_type.doc
 
 
-class A11yProperty(BaseTypedAttribute):
+class A11yProperty(BaseAttribute):
     grammar = Statement(
         UseIdent("name"),
         ":",
@@ -208,7 +209,7 @@ def decompile_relation(ctx, gir, name, cdata):
 @decompiler("state", cdata=True)
 def decompile_state(ctx, gir, name, cdata, translatable="false"):
     if decompile.truthy(translatable):
-        ctx.print(f'{name}: _("{_escape_quote(cdata)}");')
+        ctx.print(f'{name}: _("{escape_quote(cdata)}");')
     else:
         ctx.print_attribute(name, cdata, get_types(ctx.gir).get(name))
 
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index 527ff50..d55481d 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -18,7 +18,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .attributes import BaseTypedAttribute
 from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
 from .contexts import ValueTypeCtx
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index 83a5fcc..7616e57 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -18,7 +18,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .attributes import BaseAttribute
 from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
 from .contexts import ValueTypeCtx
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 7569d67..707b072 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -21,10 +21,7 @@ import typing as T
 
 from blueprintcompiler.language.values import StringValue
 
-from .attributes import BaseAttribute
-from .gobject_object import Object, ObjectContent
 from .common import *
-from .values import Translated, QuotedLiteral
 from .contexts import ValueTypeCtx
 
 
@@ -51,14 +48,6 @@ class Menu(AstNode):
             raise CompileError("Menu requires an ID")
 
 
-class MenuValue(AstNode):
-    grammar = AnyOf(QuotedLiteral, Translated)
-
-    @property
-    def child(self) -> T.Union[QuotedLiteral, Translated]:
-        return self.children[0]
-
-
 class MenuAttribute(AstNode):
     tag_name = "attribute"
 
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index 73a8b8d..78d9c67 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -18,7 +18,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .attributes import BaseTypedAttribute
 from .gobject_object import ObjectContent, validate_parent_type
 from .values import StringValue
 from .common import *
diff --git a/blueprintcompiler/language/gtk_styles.py b/blueprintcompiler/language/gtk_styles.py
index 46e9a23..798773c 100644
--- a/blueprintcompiler/language/gtk_styles.py
+++ b/blueprintcompiler/language/gtk_styles.py
@@ -25,6 +25,10 @@ from .common import *
 class StyleClass(AstNode):
     grammar = UseQuoted("name")
 
+    @property
+    def name(self) -> str:
+        return self.tokens["name"]
+
 
 class ExtStyles(AstNode):
     grammar = [
diff --git a/blueprintcompiler/language/property_binding.py b/blueprintcompiler/language/property_binding.py
index 101bef5..200b271 100644
--- a/blueprintcompiler/language/property_binding.py
+++ b/blueprintcompiler/language/property_binding.py
@@ -20,7 +20,6 @@
 from .common import *
 from .contexts import ScopeCtx
 from .gobject_object import Object
-from .gtkbuilder_template import Template
 
 
 class PropertyBindingFlag(AstNode):
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index 34e9558..165f6b2 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -18,7 +18,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-import typing as T
 from .common import *
 from ..gir import Class, ExternType, Interface
 
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index f0cc068..3204694 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -21,8 +21,6 @@ import typing as T
 
 from .common import *
 from .types import TypeName
-from .property_binding import PropertyBinding
-from .binding import Binding
 from .gobject_object import Object
 from .contexts import ScopeCtx, ValueTypeCtx
 
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index db53030..bd70e85 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -335,8 +335,8 @@ class XmlOutput(OutputFormat):
 
         elif isinstance(extension, ExtStyles):
             xml.start_tag("style")
-            for prop in extension.children:
-                xml.put_self_closing("class", name=prop.tokens["name"])
+            for style in extension.children:
+                xml.put_self_closing("class", name=style.name)
             xml.end_tag()
 
         elif isinstance(extension, ExtSizeGroupWidgets):

From 4d62df0068d1d48e33b5f296c2a252d905e3af20 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 14 Apr 2023 14:09:30 -0500
Subject: [PATCH 108/290] docs: Remove the examples page

It has been replaced with the new syntax reference, and it was out of
date anyway.
---
 docs/examples.rst | 478 ----------------------------------------------
 docs/index.rst    |   1 -
 2 files changed, 479 deletions(-)
 delete mode 100644 docs/examples.rst

diff --git a/docs/examples.rst b/docs/examples.rst
deleted file mode 100644
index d1a9762..0000000
--- a/docs/examples.rst
+++ /dev/null
@@ -1,478 +0,0 @@
-========
-Examples
-========
-
-
-Namespaces and libraries
-------------------------
-
-GTK declaration
-~~~~~~~~~~~~~~~
-
-.. code-block::
-
-   // Required in every blueprint file. Defines the major version
-   // of GTK the file is designed for.
-   using Gtk 4.0;
-
-Importing libraries
-~~~~~~~~~~~~~~~~~~~
-
-.. code-block::
-
-   // Import Adwaita 1. The name given here is the GIR namespace name, which
-   // might not match the library name or C prefix.
-   using Adw 1;
-
-
-Objects
--------
-
-Defining objects with properties
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.Box {
-     orientation: vertical;
-
-     Gtk.Label {
-       label: "Hello, world!";
-     }
-   }
-
-Referencing an object in code
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block::
-
-   // Your code can reference the object by `my_window`
-   Gtk.Window my_window {
-     title: "My window";
-   }
-
-Using classes defined by your app
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Use a leading ``.`` to tell the compiler that the class is defined in your
-app, not in the GIR, so it should skip validation.
-
-.. code-block::
-
-   .MyAppCustomWidget my_widget {
-     my-custom-property: 3.14;
-   }
-
-
-Templates
----------
-
-Defining a template
-~~~~~~~~~~~~~~~~~~~
-
-Many language bindings have a way to create subclasses that are defined both
-in code and in the blueprint file. Check your language's documentation on
-how to use this feature.
-
-In this example, we create a class called ``MyAppWindow`` that inherits from
-``Gtk.ApplicationWindow``.
-
-.. code-block::
-
-   template MyAppWindow : Gtk.ApplicationWindow {
-     my-custom-property: 3.14;
-   }
-
-Referencing a template object
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you want to use a template object elsewhere in your blueprint, you can use
-the template class name as the object ID:
-
-.. code-block::
-
-   template MyAppWindow : ApplicationWindow { }
-
-   Gtk.Label {
-     visible: bind MyAppWindow.visible;
-   }
-
-
-Properties
-----------
-
-Translations
-~~~~~~~~~~~~
-
-Use ``_("...")`` to mark strings as translatable. You can put a comment for
-translators on the line above if needed.
-
-.. code-block::
-
-   Gtk.Label label {
-     /* Translators: This is the main text of the welcome screen */
-     label: _("Hello, world!");
-   }
-
-Use ``C_("context", "...")`` to add a *message context* to a string to
-disambiguate it, in case the same string appears in different places. Remember,
-two strings might be the same in one language but different in another depending
-on context.
-
-.. code-block::
-
-   Gtk.Label label {
-     /* Translators: This is a section in the preferences window */
-     label: C_("preferences window", "Hello, world!");
-   }
-
-Referencing objects by ID
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.Range range1 {
-     adjustment: my_adjustment;
-   }
-   Gtk.Range range2 {
-     adjustment: my_adjustment;
-   }
-
-   Gtk.Adjustment my_adjustment {
-   }
-
-Defining object properties inline
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.Range  {
-     adjustment: Gtk.Adjustment my_adjustment {
-       value: 10;
-     };
-   }
-
-   Gtk.Range range1 {
-     // You can even still reference the object by ID
-     adjustment: my_adjustment;
-   }
-
-.. note::
-   Note the semicolon after the closing brace of the ``Gtk.Adjustment``. It is
-   required.
-
-Type Literals
-~~~~~~~~~~~~~
-
-Some properties have the type `GObject.Type <https://docs.gtk.org/gobject/alias.Type.html>`_, that is, their value is
-itself a description of a type in the GObject type system. An example is
-`Gio.ListStore:item-type <https://docs.gtk.org/gio/property.ListStore.item-type.html>`_. Such properties can be
-specified with the ``typeof()`` operator:
-
-.. code-block::
-
-   Gio.ListStore {
-     item-type: typeof(.MyDataModel);
-   }
-
-.. note::
-
-   Though it looks like a function, ``typeof()`` is actually a special operator. This is an important syntactic
-   distinction because the argument to ``typeof()`` is interpreted at the grammar level as a type, not a value or
-   expression.
-
-Bindings
-~~~~~~~~
-
-Use the ``bind`` keyword to bind a property to another object's property in
-the same file.
-
-.. code-block::
-
-   Gtk.ProgressBar bar1 {
-   }
-
-   Gtk.ProgressBar bar2 {
-     value: bind bar1.value;
-   }
-
-Binding Flags
-~~~~~~~~~~~~~
-
-Use the ``no-sync-create`` keyword to only update the target value when the
-source value changes, not when the binding is first created.
-
-.. code-block::
-
-   Gtk.ProgressBar bar1 {
-     value: 10;
-   }
-
-   Gtk.ProgressBar bar2 {
-     value: bind bar1.value no-sync-create;
-   }
-
-Use the ``bidirectional`` keyword to bind properties in both directions.
-
-.. code-block::
-
-   // Text of entry1 is bound to text
-   // of entry2 and vice versa
-
-   Gtk.Entry entry1 {
-     text: bind entry2.text bidirectional;
-   }
-
-   Gtk.Entry entry2 {
-
-   }
-
-Use the ``inverted`` keyword to invert to bind a boolean property
-to inverted value of another one.
-
-.. code-block::
-
-   // When switch1 is on, switch2 will be off
-   Gtk.Switch switch1 {
-     active: bind switch2.active inverted bidirectional;
-   }
-
-   // When switch2 is on, switch1 will be off
-   Gtk.Switch switch2 {
-
-   }
-
-
-Signals
--------
-
-Basic Usage
-~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.Button {
-     // on_button_clicked is defined in your application
-     clicked => on_button_clicked();
-   }
-
-Flags
-~~~~~
-
-.. code-block::
-
-   Gtk.Button {
-     clicked => on_button_clicked() swapped;
-   }
-
-Object
-~~~~~~
-
-By default the widget is passed to callback as first argument. However,
-you can specify another object to use as first argument of callback.
-
-.. code-block::
-
-   Gtk.Entry {
-     activate => grab_focus(another_entry);
-   }
-
-   Gtk.Entry another_entry {
-
-   }
-
-
-CSS Styles
-----------
-
-Basic Usage
-~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.Label {
-     styles ["dim-label", "title"]
-   }
-
-
-Menus
------
-
-Basic Usage
-~~~~~~~~~~~
-
-.. code-block::
-
-   menu my_menu {
-     section {
-       label: _("File");
-       item {
-         label: _("Open");
-         action: "win.open";
-       }
-       item {
-         label: _("Save");
-         action: "win.save";
-       }
-       submenu {
-         label: _("Save As");
-         item {
-           label: _("PDF");
-           action: "win.save_as_pdf";
-         }
-       }
-     }
-   }
-
-Item Shorthand
-~~~~~~~~~~~~~~
-
-For menu items with only a label, action, and/or icon, you can define all three
-on one line. The action and icon are optional.
-
-.. code-block::
-
-   menu {
-     item (_("Copy"), "app.copy", "copy-symbolic")
-   }
-
-
-Layout Properties
------------------
-
-Basic Usage
-~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.Grid {
-     Gtk.Label {
-       layout {
-         row: 0;
-         column: 1;
-       }
-     }
-   }
-
-
-Accessibility Properties
-------------------------
-
-Basic Usage
-~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.Widget {
-     accessibility {
-       orientation: vertical;
-       labelled-by: my_label;
-       checked: true;
-     }
-   }
-
-   Gtk.Label my_label {}
-
-
-Widget-Specific Items
----------------------
-
-Gtk.ComboBoxText
-~~~~~~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.ComboBoxText {
-     items [
-       item1: "Item 1",
-       item2: _("Items can be translated"),
-       "The item ID is not required",
-     ]
-   }
-
-Gtk.FileFilter
-~~~~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.FileFilter {
-     mime-types ["image/jpeg", "video/webm"]
-     patterns ["*.txt"]
-     suffixes ["png"]
-   }
-
-Gtk.SizeGroup
-~~~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.SizeGroup {
-     mode: both;
-     widgets [label1, label2]
-   }
-
-   Gtk.Label label1 {}
-   Gtk.Label label2 {}
-
-Gtk.BuilderListItemFactory
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block::
-
-    Gtk.ListView {
-      factory: Gtk.BuilderListItemFactory {
-          template {
-              child: Label {
-                  label: "Hello";
-              };
-          }
-      };
-    }
-
-Gtk.StringList
-~~~~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.StringList {
-     strings ["Hello, world!", _("Translated string")]
-   }
-
-Gtk.Dialog and Gtk.InfoBar
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block::
-
-   Gtk.Dialog {
-     [action response=ok]
-     Gtk.Button ok_response {}
-
-     [action response=cancel]
-     Gtk.Button cancel_response {}
-
-     [action response=9]
-     Gtk.Button app_defined_response {}
-   }
-
-Gtk.Label
-~~~~~~~~~
-
-Blueprint does not have syntax for `attributes` on `Gtk.Label`.
-
-Instead, you should use `platform classes <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/style-classes.html>`_, `CSS <https://docs.gtk.org/gtk4/css-properties.html>`_, `Pango Markup <https://docs.gtk.org/Pango/pango_markup.html>`_ or `Gtk.Label.set_attributes <https://docs.gtk.org/gtk4/method.Label.set_attributes.html>`_.
-
-Examples
-
-.. code-block::
-
-   Gtk.Label {
-     label: "Hello, World!";
-     styles ["title-1"]
-   }
-
-.. code-block::
-
-   Gtk.Label {
-     label: "<b>Hello, World!</b>";
-     use-markup: true;
-   }
diff --git a/docs/index.rst b/docs/index.rst
index 2a345bc..7ba6d80 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,7 +19,6 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
    translations
    flatpak
    reference/index
-   examples
    packaging
 
 

From 5b50090b65ada2ec718b0bacfeebef2a023e771a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 2 May 2023 09:28:42 -0500
Subject: [PATCH 109/290] Minor code cleanup

---
 .../language/gtk_combo_box_text.py            | 21 ++++++-------------
 blueprintcompiler/language/gtk_file_filter.py |  4 +++-
 blueprintcompiler/language/gtk_layout.py      |  9 ++------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index d55481d..5725041 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -25,6 +25,11 @@ from .values import StringValue
 
 
 class Item(AstNode):
+    grammar = [
+        Optional([UseIdent("name"), ":"]),
+        StringValue,
+    ]
+
     @property
     def name(self) -> str:
         return self.tokens["name"]
@@ -34,25 +39,11 @@ class Item(AstNode):
         return self.children[StringValue][0]
 
 
-item = Group(
-    Item,
-    [
-        Optional(
-            [
-                UseIdent("name"),
-                ":",
-            ]
-        ),
-        StringValue,
-    ],
-)
-
-
 class ExtComboBoxItems(AstNode):
     grammar = [
         Keyword("items"),
         "[",
-        Delimited(item, ","),
+        Delimited(Item, ","),
         "]",
     ]
 
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 668568e..daf0679 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -42,7 +42,9 @@ class Filters(AstNode):
 
 
 class FilterString(AstNode):
-    pass
+    @property
+    def item(self) -> str:
+        return self.tokens["name"]
 
 
 def create_node(tag_name: str, singular: str):
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index 7616e57..cceb6c6 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -25,6 +25,7 @@ from .values import Value
 
 
 class LayoutProperty(AstNode):
+    grammar = Statement(UseIdent("name"), ":", Err(Value, "Expected a value"))
     tag_name = "property"
 
     @property
@@ -48,17 +49,11 @@ class LayoutProperty(AstNode):
         )
 
 
-layout_prop = Group(
-    LayoutProperty,
-    Statement(UseIdent("name"), ":", Err(Value, "Expected a value")),
-)
-
-
 class ExtLayout(AstNode):
     grammar = Sequence(
         Keyword("layout"),
         "{",
-        Until(layout_prop, "}"),
+        Until(LayoutProperty, "}"),
     )
 
     @validate("layout")

From b08a0c06658e91cbefef48e44db3b21dce39b7f9 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 2 May 2023 09:29:07 -0500
Subject: [PATCH 110/290] Remove .vscode

---
 .vscode/settings.json | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index de288e1..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "python.formatting.provider": "black"
-}
\ No newline at end of file

From d4c2bb34ebc8de7685f5b45352ca2d6f559d76d4 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 2 May 2023 09:35:38 -0500
Subject: [PATCH 111/290] Remove trailing commas in Translated

---
 blueprintcompiler/language/values.py | 3 +--
 docs/reference/values.rst            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 3204694..626a337 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -27,14 +27,13 @@ from .contexts import ScopeCtx, ValueTypeCtx
 
 class Translated(AstNode):
     grammar = AnyOf(
-        ["_", "(", UseQuoted("string"), Optional(","), ")"],
+        ["_", "(", UseQuoted("string"), ")"],
         [
             "C_",
             "(",
             UseQuoted("context"),
             ",",
             UseQuoted("string"),
-            Optional(","),
             ")",
         ],
     )
diff --git a/docs/reference/values.rst b/docs/reference/values.rst
index 6a0499c..180baf3 100644
--- a/docs/reference/values.rst
+++ b/docs/reference/values.rst
@@ -80,7 +80,7 @@ Translated Strings
 
 .. rst-class:: grammar-block
 
-   Translated = ( '_' '(' <string::ref:`QUOTED<Syntax QUOTED>`> ','? ')' ) | ( '\C_' '(' <context::ref:`QUOTED<Syntax QUOTED>`> ',' <string::ref:`QUOTED<Syntax QUOTED>`> ','? ')' )
+   Translated = ( '_' '(' <string::ref:`QUOTED<Syntax QUOTED>`> ')' ) | ( '\C_' '(' <context::ref:`QUOTED<Syntax QUOTED>`> ',' <string::ref:`QUOTED<Syntax QUOTED>`> ')' )
 
 
 Use ``_("...")`` to mark strings as translatable. You can put a comment for translators on the line above if needed.

From fc0358ef0177d7cce3d8991e0b392032f4a88107 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sun, 7 May 2023 02:48:02 +0200
Subject: [PATCH 112/290] cli: Ignore hidden folders in interactive port

Resolves #112 and resolves #57
---
 blueprintcompiler/interactive_port.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index ffc4292..1286f0b 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -89,6 +89,8 @@ def listdir_recursive(subdir):
     for file in files:
         if file in ["_build", "build"]:
             continue
+        if file.startswith("."):
+            continue
         full = os.path.join(subdir, file)
         if full == "./subprojects":
             # skip the subprojects directory

From aafebf0dfb1cfcad4cec17e421b34e401f92e7d3 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 27 Apr 2023 17:52:51 -0500
Subject: [PATCH 113/290] ci: Use libadwaita from git

---
 build-aux/Dockerfile      | 11 ++++++++---
 build-aux/install_deps.sh | 26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100755 build-aux/install_deps.sh

diff --git a/build-aux/Dockerfile b/build-aux/Dockerfile
index c7841d9..b060765 100644
--- a/build-aux/Dockerfile
+++ b/build-aux/Dockerfile
@@ -1,8 +1,13 @@
 FROM fedora:latest
 
-RUN dnf install -y meson python3-pip gtk4-devel gobject-introspection-devel \
-	libadwaita-devel python3-devel python3-gobject git diffutils xorg-x11-server-Xvfb
+RUN dnf install -y meson gcc g++ python3-pip gobject-introspection-devel \
+	python3-devel python3-gobject git diffutils xorg-x11-server-Xvfb \
+    appstream-devel "dnf-command(builddep)"
+RUN dnf build-dep -y gtk4 libadwaita
 RUN pip3 install furo mypy sphinx coverage black
 
+COPY install_deps.sh .
+RUN ./install_deps.sh
+
 # The version on PyPI is very old and doesn't install. Use the upstream package registry instead.
-RUN pip install pythonfuzz --extra-index-url https://gitlab.com/api/v4/projects/19904939/packages/pypi/simple
\ No newline at end of file
+RUN pip install pythonfuzz --extra-index-url https://gitlab.com/api/v4/projects/19904939/packages/pypi/simple
diff --git a/build-aux/install_deps.sh b/build-aux/install_deps.sh
new file mode 100755
index 0000000..381a57a
--- /dev/null
+++ b/build-aux/install_deps.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+echo "===== Install GTK ====="
+git clone --depth=1 https://gitlab.gnome.org/GNOME/gtk.git
+cd gtk
+meson setup builddir \
+  --prefix=/usr \
+  -Dgtk_doc=true \
+  -Ddemos=false \
+  -Dbuild-examples=false \
+  -Dbuild-tests=false \
+  -Dbuild-testsuite=false
+ninja -C builddir install
+cd -
+rm -rf gtk
+
+echo "===== Install libadwaita ====="
+git clone --depth=1 https://gitlab.gnome.org/GNOME/libadwaita.git
+cd libadwaita
+meson builddir \
+  --prefix=/usr
+ninja -C builddir install
+cd -
+rm -rf libadwaita

From 8fcd08c8352e3420f0c45058971749119f5a8683 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 25 Apr 2023 19:43:22 -0500
Subject: [PATCH 114/290] Add Adw.Breakpoint custom syntax

---
 blueprintcompiler/language/__init__.py        |   9 +-
 blueprintcompiler/language/adw_breakpoint.py  | 127 ++++++++++++++++++
 blueprintcompiler/language/contexts.py        |   1 +
 .../language/gobject_property.py              |   5 -
 blueprintcompiler/language/values.py          |  15 ++-
 blueprintcompiler/outputs/xml/__init__.py     |  31 +++++
 docs/reference/extensions.rst                 |  20 +++
 tests/sample_errors/adw_breakpoint.blp        |  12 ++
 tests/sample_errors/adw_breakpoint.err        |   4 +
 tests/samples/adw_breakpoint.blp              |  13 ++
 tests/samples/adw_breakpoint.ui               |  11 ++
 tests/test_samples.py                         |  27 +++-
 12 files changed, 264 insertions(+), 11 deletions(-)
 create mode 100644 blueprintcompiler/language/adw_breakpoint.py
 create mode 100644 tests/sample_errors/adw_breakpoint.blp
 create mode 100644 tests/sample_errors/adw_breakpoint.err
 create mode 100644 tests/samples/adw_breakpoint.blp
 create mode 100644 tests/samples/adw_breakpoint.ui

diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index b5e2f04..8cfd1bd 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,8 +1,13 @@
 from .gtk_list_item_factory import ExtListItemFactory
 from .adw_message_dialog import ExtAdwMessageDialog
 from .attributes import BaseAttribute
+from .adw_breakpoint import (
+    AdwBreakpointSetters,
+    AdwBreakpointSetter,
+    AdwBreakpointCondition,
+)
 from .binding import Binding
-from .contexts import ValueTypeCtx
+from .contexts import ScopeCtx, ValueTypeCtx
 from .expression import (
     CastExpr,
     ClosureArg,
@@ -53,6 +58,8 @@ from .common import *
 OBJECT_CONTENT_HOOKS.children = [
     Signal,
     Property,
+    AdwBreakpointCondition,
+    AdwBreakpointSetters,
     ExtAccessibility,
     ExtAdwMessageDialog,
     ExtComboBoxItems,
diff --git a/blueprintcompiler/language/adw_breakpoint.py b/blueprintcompiler/language/adw_breakpoint.py
new file mode 100644
index 0000000..20d0b89
--- /dev/null
+++ b/blueprintcompiler/language/adw_breakpoint.py
@@ -0,0 +1,127 @@
+# adw_breakpoint.py
+#
+# Copyright 2023 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 *
+from .contexts import ScopeCtx, ValueTypeCtx
+from .gobject_object import Object, validate_parent_type
+from .values import Value
+
+
+class AdwBreakpointCondition(AstNode):
+    grammar = ["condition", "(", UseQuoted("condition"), Match(")").expected()]
+
+    @property
+    def condition(self) -> str:
+        return self.tokens["condition"]
+
+    @validate()
+    def unique(self):
+        self.validate_unique_in_parent("Duplicate condition statement")
+
+
+class AdwBreakpointSetter(AstNode):
+    grammar = Statement(
+        UseIdent("object"),
+        Match(".").expected(),
+        UseIdent("property"),
+        Match(":").expected(),
+        Value,
+    )
+
+    @property
+    def object_id(self) -> str:
+        return self.tokens["object"]
+
+    @property
+    def object(self) -> T.Optional[Object]:
+        return self.context[ScopeCtx].objects.get(self.object_id)
+
+    @property
+    def property_name(self) -> T.Optional[str]:
+        return self.tokens["property"]
+
+    @property
+    def value(self) -> Value:
+        return self.children[Value][0]
+
+    @property
+    def gir_class(self) -> T.Optional[GirType]:
+        if self.object is not None:
+            return self.object.gir_class
+        else:
+            return None
+
+    @property
+    def gir_property(self):
+        if self.gir_class is not None and not isinstance(self.gir_class, ExternType):
+            return self.gir_class.properties.get(self.property_name)
+
+    @context(ValueTypeCtx)
+    def value_type(self) -> ValueTypeCtx:
+        if self.gir_property is not None:
+            type = self.gir_property.type
+        else:
+            type = None
+
+        return ValueTypeCtx(type, allow_null=True)
+
+    @validate("object")
+    def object_exists(self):
+        if self.object is None:
+            raise CompileError(
+                f"Could not find object with ID {self.object_id}",
+                did_you_mean=(self.object_id, self.context[ScopeCtx].objects.keys()),
+            )
+
+    @validate("property")
+    def property_exists(self):
+        if self.gir_class is None or self.gir_class.incomplete:
+            # Objects that we have no gir data on should not be validated
+            # This happens for classes defined by the app itself
+            return
+
+        if self.gir_property is None:
+            raise CompileError(
+                f"Class {self.gir_class.full_name} does not have a property called {self.property_name}",
+                did_you_mean=(self.property_name, self.gir_class.properties.keys()),
+            )
+
+    @validate()
+    def unique(self):
+        self.validate_unique_in_parent(
+            f"Duplicate setter for {self.object_id}.{self.property_name}",
+            lambda x: x.object_id == self.object_id
+            and x.property_name == self.property_name,
+        )
+
+
+class AdwBreakpointSetters(AstNode):
+    grammar = ["setters", Match("{").expected(), Until(AdwBreakpointSetter, "}")]
+
+    @property
+    def setters(self) -> T.List[AdwBreakpointSetter]:
+        return self.children[AdwBreakpointSetter]
+
+    @validate()
+    def container_is_breakpoint(self):
+        validate_parent_type(self, "Adw", "Breakpoint", "breakpoint setters")
+
+    @validate()
+    def unique(self):
+        self.validate_unique_in_parent("Duplicate setters block")
diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
index 49b7b40..1709918 100644
--- a/blueprintcompiler/language/contexts.py
+++ b/blueprintcompiler/language/contexts.py
@@ -28,6 +28,7 @@ from .gobject_object import Object
 @dataclass
 class ValueTypeCtx:
     value_type: T.Optional[GirType]
+    allow_null: bool = False
 
 
 @dataclass
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 31ff40d..09873bc 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -76,11 +76,6 @@ class Property(AstNode):
             # This happens for classes defined by the app itself
             return
 
-        if isinstance(self.parent.parent, Template):
-            # If the property is part of a template, it might be defined by
-            # the application and thus not in gir
-            return
-
         if self.gir_property is None:
             raise CompileError(
                 f"Class {self.gir_class.full_name} does not have a property called {self.tokens['name']}",
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 626a337..676de37 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -280,10 +280,17 @@ class IdentLiteral(AstNode):
         elif expected_type is not None:
             object = self.context[ScopeCtx].objects.get(self.ident)
             if object is None:
-                raise CompileError(
-                    f"Could not find object with ID {self.ident}",
-                    did_you_mean=(self.ident, self.context[ScopeCtx].objects.keys()),
-                )
+                if self.ident == "null":
+                    if not self.context[ValueTypeCtx].allow_null:
+                        raise CompileError("null is not permitted here")
+                else:
+                    raise CompileError(
+                        f"Could not find object with ID {self.ident}",
+                        did_you_mean=(
+                            self.ident,
+                            self.context[ScopeCtx].objects.keys(),
+                        ),
+                    )
             elif object.gir_class and not object.gir_class.assignable_to(expected_type):
                 raise CompileError(
                     f"Cannot assign {object.gir_class.full_name} to {expected_type.full_name}"
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index bd70e85..1b5b579 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -280,6 +280,37 @@ class XmlOutput(OutputFormat):
                 self._emit_attribute(prop.tag_name, "name", prop.name, prop.value, xml)
             xml.end_tag()
 
+        elif isinstance(extension, AdwBreakpointCondition):
+            xml.start_tag("condition")
+            xml.put_text(extension.condition)
+            xml.end_tag()
+
+        elif isinstance(extension, AdwBreakpointSetters):
+            for setter in extension.setters:
+                attrs = {}
+
+                if isinstance(setter.value.child, Translated):
+                    attrs = self._translated_string_attrs(setter.value.child)
+
+                xml.start_tag(
+                    "setter",
+                    object=setter.object_id,
+                    property=setter.property_name,
+                    **attrs,
+                )
+                if isinstance(setter.value.child, Translated):
+                    xml.put_text(setter.value.child.string)
+                elif (
+                    isinstance(setter.value.child, Literal)
+                    and isinstance(setter.value.child.value, IdentLiteral)
+                    and setter.value.child.value.ident == "null"
+                    and setter.context[ScopeCtx].objects.get("null") is None
+                ):
+                    pass
+                else:
+                    self._emit_value(setter.value, xml)
+                xml.end_tag()
+
         elif isinstance(extension, Filters):
             xml.start_tag(extension.tokens["tag_name"])
             for prop in extension.children:
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index a29938b..1017032 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -42,6 +42,26 @@ 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.
 
 
+.. _Syntax ExtAdwBreakpoint:
+
+Adw.Breakpoint
+--------------
+
+.. rst-class:: grammar-block
+
+   ExtAdwBreakpointCondition = 'condition' '(' <condition::ref:`QUOTED<Syntax QUOTED>`> ')'
+   ExtAdwBreakpoint = 'setters' '{' ExtAdwBreakpointSetter* '}'
+   ExtAdwBreakpointSetter = <object::ref:`IDENT<Syntax IDENT>`> '.' <property::ref:`IDENT<Syntax IDENT>`> ':' :ref:`Value <Syntax Value>` ';'
+
+Valid in `Adw.Breakpoint <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.Breakpoint.html>`_.
+
+Defines the condition for a breakpoint and the properties that will be set at that breakpoint. See the documentation for `Adw.Breakpoint <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.Breakpoint.html>`_.
+
+.. note::
+
+   The `Adw.Breakpoint:condition <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/property.Breakpoint.condition.html>`_ property has type `Adw.BreakpointCondition <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/struct.BreakpointCondition.html>`_, which GtkBuilder doesn't know how to parse from a string. Therefore, the ``condition`` syntax is used instead.
+
+
 .. _Syntax ExtAdwMessageDialog:
 
 Adw.MessageDialog Responses
diff --git a/tests/sample_errors/adw_breakpoint.blp b/tests/sample_errors/adw_breakpoint.blp
new file mode 100644
index 0000000..7eb4525
--- /dev/null
+++ b/tests/sample_errors/adw_breakpoint.blp
@@ -0,0 +1,12 @@
+using Gtk 4.0;
+using Adw 1;
+
+Label label {}
+
+Adw.Breakpoint {
+  setters {
+    label.foo: "bar";
+    not_an_object.visible: true;
+    label.foo: "baz";
+  }
+}
\ No newline at end of file
diff --git a/tests/sample_errors/adw_breakpoint.err b/tests/sample_errors/adw_breakpoint.err
new file mode 100644
index 0000000..bd2f6b7
--- /dev/null
+++ b/tests/sample_errors/adw_breakpoint.err
@@ -0,0 +1,4 @@
+8,11,3,Class Gtk.Label does not have a property called foo
+9,5,13,Could not find object with ID not_an_object
+10,11,3,Class Gtk.Label does not have a property called foo
+10,5,17,Duplicate setter for label.foo
\ No newline at end of file
diff --git a/tests/samples/adw_breakpoint.blp b/tests/samples/adw_breakpoint.blp
new file mode 100644
index 0000000..1d085e4
--- /dev/null
+++ b/tests/samples/adw_breakpoint.blp
@@ -0,0 +1,13 @@
+using Gtk 4.0;
+using Adw 1;
+
+Gtk.Label label {}
+
+Adw.Breakpoint {
+  condition ("max-width: 600px")
+  setters {
+    label.label: _("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
new file mode 100644
index 0000000..b2d5ec3
--- /dev/null
+++ b/tests/samples/adw_breakpoint.ui
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <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="visible">false</setter>
+    <setter object="label" property="extra-menu"></setter>
+  </object>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 88cecdf..6e19a08 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -143,6 +143,9 @@ class TestSamples(unittest.TestCase):
             raise AssertionError()
 
     def test_samples(self):
+        have_adw = False
+        have_adw_1_4 = False
+
         try:
             import gi
 
@@ -151,11 +154,15 @@ class TestSamples(unittest.TestCase):
 
             have_adw = True
             Adw.init()
+            if Adw.MINOR_VERSION >= 4:
+                have_adw_1_4 = True
         except:
-            have_adw = False
+            pass
 
         self.assert_sample("accessibility")
         self.assert_sample("action_widgets")
+        if have_adw_1_4:
+            self.assert_sample("adw_breakpoint")
         self.assert_sample("child_type")
         self.assert_sample("combo_box_text")
         self.assert_sample("comments")
@@ -208,6 +215,22 @@ class TestSamples(unittest.TestCase):
         self.assert_sample("using")
 
     def test_sample_errors(self):
+        have_adw = False
+        have_adw_1_4 = False
+
+        try:
+            import gi
+
+            gi.require_version("Adw", "1")
+            from gi.repository import Adw
+
+            have_adw = True
+            Adw.init()
+            if Adw.MINOR_VERSION >= 4:
+                have_adw_1_4 = True
+        except:
+            pass
+
         self.assert_sample_error("a11y_in_non_widget")
         self.assert_sample_error("a11y_prop_dne")
         self.assert_sample_error("a11y_prop_obj_dne")
@@ -219,6 +242,8 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("action_widget_in_invalid_container")
         self.assert_sample_error("action_widget_response_dne")
         self.assert_sample_error("action_widget_negative_response")
+        if have_adw_1_4:
+            self.assert_sample_error("adw_breakpoint")
         self.assert_sample_error("bitfield_member_dne")
         self.assert_sample_error("children")
         self.assert_sample_error("class_assign")

From 77dc9350e928cba82ccc8ba9c6e6e58640ef2ccf Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 6 May 2023 21:34:17 -0500
Subject: [PATCH 115/290] docs: Fix some warnings

---
 docs/index.rst                | 4 +---
 docs/reference/extensions.rst | 2 +-
 docs/reference/objects.rst    | 2 +-
 docs/reference/values.rst     | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 7ba6d80..e277add 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -53,9 +53,7 @@ Features
 - **Concise syntax.** No more clumsy XML! Blueprint is designed from the ground
   up to match GTK's widget model, including templates, child types, signal
   handlers, and menus.
-- **Easy to learn.** The syntax should be very familiar to most people. Scroll
-  through the :doc:`examples page <examples>` for a quick overview of the whole
-  language.
+- **Easy to learn.** The syntax should be very familiar to most people. Take a look at the :doc:`reference <reference/index>` to get started.
 - **Modern tooling.** Blueprint ships a `Language Server <https://microsoft.github.io/language-server-protocol/>`_ for IDE integration.
 
 Links
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index 1017032..d8553ad 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -202,7 +202,7 @@ The template type is `Gtk.ListItem <https://docs.gtk.org/gtk4/class.ListItem.htm
        template {
          child: Label {
            label: bind item.string;
-         }
+         };
        }
      }
 
diff --git a/docs/reference/objects.rst b/docs/reference/objects.rst
index 4b53980..8acbb32 100644
--- a/docs/reference/objects.rst
+++ b/docs/reference/objects.rst
@@ -174,7 +174,7 @@ Child extensions
    }
 
 Internal children
-++++++++++++++++
++++++++++++++++++
 
 .. code-block:: blueprintui
 
diff --git a/docs/reference/values.rst b/docs/reference/values.rst
index 180baf3..9c0a09f 100644
--- a/docs/reference/values.rst
+++ b/docs/reference/values.rst
@@ -85,7 +85,7 @@ Translated Strings
 
 Use ``_("...")`` to mark strings as translatable. You can put a comment for translators on the line above if needed.
 
-.. code-block::
+.. code-block:: blueprintui
 
    Gtk.Label label {
      /* Translators: This is the main text of the welcome screen */
@@ -94,7 +94,7 @@ Use ``_("...")`` to mark strings as translatable. You can put a comment for tran
 
 Use ``C_("context", "...")`` to add a *message context* to a string to disambiguate it, in case the same string appears in different places. Remember, two strings might be the same in one language but different in another depending on context.
 
-.. code-block::
+.. code-block:: blueprintui
 
    Gtk.Label label {
      /* Translators: This is a section in the preferences window */
@@ -165,4 +165,4 @@ String Values
 
    StringValue = :ref:`Translated<Syntax Translated>` | :ref:`QuotedLiteral<Syntax Literal>`
 
-Menus, as well as some :ref:`extensions<Syntax Extensions>`, have properties that can only be string literals or translated strings.
+Menus, as well as some :ref:`extensions<Syntax Extension>`, have properties that can only be string literals or translated strings.

From 43fbf8cf8e1d6549c3cc64d37cf895ca066aa711 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 8 May 2023 10:19:19 -0500
Subject: [PATCH 116/290] Add warning for confusing object IDs

---
 blueprintcompiler/language/gobject_object.py | 8 ++++++++
 blueprintcompiler/language/gtk_menu.py       | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 1dbbce5..9eeae3d 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -26,6 +26,9 @@ from .response_id import ExtResponse
 from .types import ClassName, ConcreteClassName
 
 
+RESERVED_IDS = {"this", "self", "template", "true", "false", "null", "none"}
+
+
 class ObjectContent(AstNode):
     grammar = ["{", Until(OBJECT_CONTENT_HOOKS, "}")]
 
@@ -73,6 +76,11 @@ class Object(AstNode):
             if child.response_id
         ]
 
+    @validate("id")
+    def object_id_not_reserved(self):
+        if self.id in RESERVED_IDS:
+            raise CompileWarning(f"{self.id} may be a confusing object ID")
+
 
 def validate_parent_type(node, ns: str, name: str, err_msg: str):
     parent = node.root.gir.get_type(name, ns)
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 707b072..b9de906 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -23,6 +23,7 @@ from blueprintcompiler.language.values import StringValue
 
 from .common import *
 from .contexts import ValueTypeCtx
+from .gobject_object import RESERVED_IDS
 
 
 class Menu(AstNode):
@@ -47,6 +48,11 @@ class Menu(AstNode):
         if self.tokens["tag"] == "menu" and self.tokens["id"] is None:
             raise CompileError("Menu requires an ID")
 
+    @validate("id")
+    def object_id_not_reserved(self):
+        if self.id in RESERVED_IDS:
+            raise CompileWarning(f"{self.id} may be a confusing object ID")
+
 
 class MenuAttribute(AstNode):
     tag_name = "attribute"

From 26072500c84116f413ca4c11eb3ce8e6036a0e7f Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 11 May 2023 13:18:24 -0500
Subject: [PATCH 117/290] Fix Gio.File properties

---
 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 676de37..f143f29 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -133,7 +133,7 @@ class QuotedLiteral(AstNode):
                 "Gdk.Paintable",
                 "Gdk.Texture",
                 "Gdk.Pixbuf",
-                "GLib.File",
+                "Gio.File",
                 "Gtk.ShortcutTrigger",
                 "Gtk.ShortcutAction",
                 "Gdk.RGBA",

From aebf8be278f64115d0bc6869cf928b5ffda70abd Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 13 May 2023 14:56:38 -0500
Subject: [PATCH 118/290] Fix a bug found by the fuzzer

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

diff --git a/blueprintcompiler/language/adw_breakpoint.py b/blueprintcompiler/language/adw_breakpoint.py
index 20d0b89..addbd8a 100644
--- a/blueprintcompiler/language/adw_breakpoint.py
+++ b/blueprintcompiler/language/adw_breakpoint.py
@@ -96,7 +96,7 @@ class AdwBreakpointSetter(AstNode):
             # This happens for classes defined by the app itself
             return
 
-        if self.gir_property is None:
+        if self.gir_property is None and self.property_name is not None:
             raise CompileError(
                 f"Class {self.gir_class.full_name} does not have a property called {self.property_name}",
                 did_you_mean=(self.property_name, self.gir_class.properties.keys()),

From 04509e4b2e924bcdc519fd8a53834d4bb78bddea Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 9 May 2023 19:42:33 -0500
Subject: [PATCH 119/290] Change template syntax

Templates now use a TypeName instead of an identifier, which makes it
clearer that it's an extern symbol (or that it's a Gtk.ListItem).
---
 blueprintcompiler/decompiler.py               |  3 +
 blueprintcompiler/gir.py                      |  6 +-
 blueprintcompiler/language/contexts.py        | 10 +++-
 blueprintcompiler/language/expression.py      |  6 +-
 blueprintcompiler/language/gobject_object.py  |  6 +-
 .../language/gtkbuilder_template.py           | 56 ++++++++++++-------
 .../language/property_binding.py              | 10 ++++
 blueprintcompiler/language/types.py           | 39 +++++++++++++
 blueprintcompiler/language/ui.py              | 16 +++++-
 blueprintcompiler/language/values.py          |  8 +++
 blueprintcompiler/outputs/xml/__init__.py     |  7 ++-
 tests/sample_errors/abstract_class.blp        |  2 +-
 tests/sample_errors/class_dne.blp             |  2 +-
 tests/sample_errors/class_dne.err             |  2 +-
 tests/sample_errors/expr_cast_needed.blp      |  6 +-
 tests/sample_errors/expr_cast_needed.err      |  2 +-
 tests/sample_errors/legacy_template.blp       | 10 ++++
 tests/sample_errors/legacy_template.err       |  2 +
 tests/sample_errors/not_a_class.blp           |  2 +-
 tests/sample_errors/not_a_class.err           |  2 +-
 tests/sample_errors/ns_not_imported.blp       |  2 +-
 tests/sample_errors/ns_not_imported.err       |  2 +-
 tests/sample_errors/template_parent.blp       |  3 +
 tests/sample_errors/template_parent.err       |  1 +
 tests/sample_errors/two_templates.blp         |  6 +-
 tests/sample_errors/two_templates.err         |  3 +-
 tests/samples/template.blp                    |  4 +-
 tests/samples/template_binding.blp            |  4 +-
 tests/samples/template_binding_extern.blp     |  4 +-
 tests/samples/template_no_parent.blp          |  2 +-
 tests/test_samples.py                         |  2 +
 31 files changed, 175 insertions(+), 55 deletions(-)
 create mode 100644 tests/sample_errors/legacy_template.blp
 create mode 100644 tests/sample_errors/legacy_template.err
 create mode 100644 tests/sample_errors/template_parent.blp
 create mode 100644 tests/sample_errors/template_parent.err

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index f7d858c..d3bf773 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -57,6 +57,7 @@ class DecompileCtx:
         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.gir.add_namespace(get_namespace("Gtk", "4.0"))
 
@@ -158,6 +159,8 @@ class DecompileCtx:
             )
         ):
             self.print(f'{name}: "{escape_quote(value)}";')
+        elif value == self.template_class:
+            self.print(f"{name}: template;")
         elif type.assignable_to(
             self.gir.namespaces["Gtk"].lookup_type("GObject.Object")
         ):
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index fc415fd..e85190b 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -516,7 +516,7 @@ class Class(GirNode, GirType):
 
 
 class TemplateType(GirType):
-    def __init__(self, name: str, parent: T.Optional[Class]):
+    def __init__(self, name: str, parent: T.Optional[GirType]):
         self._name = name
         self.parent = parent
 
@@ -534,14 +534,14 @@ class TemplateType(GirType):
 
     @cached_property
     def properties(self) -> T.Mapping[str, Property]:
-        if self.parent is None or isinstance(self.parent, ExternType):
+        if not (isinstance(self.parent, Class) or isinstance(self.parent, Interface)):
             return {}
         else:
             return self.parent.properties
 
     @cached_property
     def signals(self) -> T.Mapping[str, Signal]:
-        if self.parent is None or isinstance(self.parent, ExternType):
+        if not (isinstance(self.parent, Class) or isinstance(self.parent, Interface)):
             return {}
         else:
             return self.parent.signals
diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
index 1709918..069f4de 100644
--- a/blueprintcompiler/language/contexts.py
+++ b/blueprintcompiler/language/contexts.py
@@ -23,6 +23,7 @@ from functools import cached_property
 
 from .common import *
 from .gobject_object import Object
+from .gtkbuilder_template import Template
 
 
 @dataclass
@@ -51,9 +52,12 @@ class ScopeCtx:
 
             if obj.tokens["id"] in passed:
                 token = obj.group.tokens["id"]
-                raise CompileError(
-                    f"Duplicate object ID '{obj.tokens['id']}'", token.start, token.end
-                )
+                if not isinstance(obj, Template):
+                    raise CompileError(
+                        f"Duplicate object ID '{obj.tokens['id']}'",
+                        token.start,
+                        token.end,
+                    )
             passed[obj.tokens["id"]] = obj
 
     def _iter_recursive(self, node: AstNode):
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index dd8db60..3f816f3 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -85,9 +85,9 @@ class LiteralExpr(ExprBase):
     def is_object(self) -> bool:
         from .values import IdentLiteral
 
-        return (
-            isinstance(self.literal.value, IdentLiteral)
-            and self.literal.value.ident in self.context[ScopeCtx].objects
+        return isinstance(self.literal.value, IdentLiteral) and (
+            self.literal.value.ident in self.context[ScopeCtx].objects
+            or self.root.is_legacy_template(self.literal.value.ident)
         )
 
     @property
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 9eeae3d..183ad8e 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -49,7 +49,7 @@ class Object(AstNode):
         return self.tokens["id"]
 
     @property
-    def class_name(self) -> T.Optional[ClassName]:
+    def class_name(self) -> ClassName:
         return self.children[ClassName][0]
 
     @property
@@ -78,7 +78,9 @@ class Object(AstNode):
 
     @validate("id")
     def object_id_not_reserved(self):
-        if self.id in RESERVED_IDS:
+        from .gtkbuilder_template import Template
+
+        if not isinstance(self, Template) and self.id in RESERVED_IDS:
             raise CompileWarning(f"{self.id} may be a confusing object ID")
 
 
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 46ff6e6..149152a 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -19,15 +19,18 @@
 
 import typing as T
 
+from blueprintcompiler.language.common import GirType
+
 from .gobject_object import Object, ObjectContent
 from .common import *
-from .types import ClassName
+from ..gir import TemplateType
+from .types import ClassName, TemplateClassName
 
 
 class Template(Object):
     grammar = [
-        "template",
-        UseIdent("id").expected("template class name"),
+        UseExact("id", "template"),
+        to_parse_node(TemplateClassName).expected("template type"),
         Optional(
             [
                 Match(":"),
@@ -39,21 +42,29 @@ class Template(Object):
 
     @property
     def id(self) -> str:
-        return self.tokens["id"]
+        return "template"
 
     @property
-    def class_name(self) -> T.Optional[ClassName]:
-        if len(self.children[ClassName]):
-            return self.children[ClassName][0]
+    def gir_class(self) -> GirType:
+        if isinstance(self.class_name.gir_type, ExternType):
+            if gir := self.parent_type:
+                return TemplateType(self.class_name.gir_type.full_name, gir.gir_type)
+        return self.class_name.gir_type
+
+    @property
+    def parent_type(self) -> T.Optional[ClassName]:
+        if len(self.children[ClassName]) == 2:
+            return self.children[ClassName][1]
         else:
             return None
 
-    @property
-    def gir_class(self):
-        if self.class_name is None:
-            return gir.TemplateType(self.id, None)
-        else:
-            return gir.TemplateType(self.id, self.class_name.gir_type)
+    @validate()
+    def parent_only_if_extern(self):
+        if not isinstance(self.class_name.gir_type, ExternType):
+            if self.parent_type is not None:
+                raise CompileError(
+                    "Parent type may only be specified if the template type is extern"
+                )
 
     @validate("id")
     def unique_in_parent(self):
@@ -63,10 +74,15 @@ class Template(Object):
 
 
 @decompiler("template")
-def decompile_template(ctx: DecompileCtx, gir, klass, parent="Widget"):
-    gir_class = ctx.type_by_cname(parent)
-    if gir_class is None:
-        ctx.print(f"template {klass} : .{parent} {{")
-    else:
-        ctx.print(f"template {klass} : {decompile.full_name(gir_class)} {{")
-    return gir_class
+def decompile_template(ctx: DecompileCtx, gir, klass, parent=None):
+    def class_name(cname: str) -> str:
+        if gir := ctx.type_by_cname(cname):
+            return decompile.full_name(gir)
+        else:
+            return "$" + cname
+
+    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/blueprintcompiler/language/property_binding.py b/blueprintcompiler/language/property_binding.py
index 200b271..13bec61 100644
--- a/blueprintcompiler/language/property_binding.py
+++ b/blueprintcompiler/language/property_binding.py
@@ -70,6 +70,8 @@ class PropertyBinding(AstNode):
 
     @property
     def source_obj(self) -> T.Optional[Object]:
+        if self.root.is_legacy_template(self.source):
+            return self.root.template
         return self.context[ScopeCtx].objects.get(self.source)
 
     @property
@@ -127,3 +129,11 @@ class PropertyBinding(AstNode):
                 "Use 'bind-property', introduced in blueprint 0.8.0, to use binding flags",
                 actions=[CodeAction("Use 'bind-property'", "bind-property")],
             )
+
+    @validate("source")
+    def legacy_template(self):
+        if self.root.is_legacy_template(self.source):
+            raise UpgradeWarning(
+                "Use 'template' instead of the class name (introduced in 0.8.0)",
+                actions=[CodeAction("Use 'template'", "template")],
+            )
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index 165f6b2..dbce44f 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -122,3 +122,42 @@ class ConcreteClassName(ClassName):
                 f"{self.gir_type.full_name} can't be instantiated because it's abstract",
                 hints=[f"did you mean to use a subclass of {self.gir_type.full_name}?"],
             )
+
+
+class TemplateClassName(ClassName):
+    """Handles the special case of a template type. The old syntax uses an identifier,
+    which is ambiguous with the new syntax. So this class displays an appropriate
+    upgrade warning instead of a class not found error."""
+
+    @property
+    def is_legacy(self):
+        return (
+            self.tokens["extern"] is None
+            and self.tokens["namespace"] is None
+            and self.root.gir.get_type(self.tokens["class_name"], "Gtk") is None
+        )
+
+    @property
+    def gir_type(self) -> gir.GirType:
+        if self.is_legacy:
+            return gir.ExternType(self.tokens["class_name"])
+        else:
+            return super().gir_type
+
+    @validate("class_name")
+    def type_exists(self):
+        if self.is_legacy:
+            if type := self.root.gir.get_type_by_cname(self.tokens["class_name"]):
+                replacement = type.full_name
+            else:
+                replacement = "$" + self.tokens["class_name"]
+
+            raise UpgradeWarning(
+                "Use type syntax here (introduced in blueprint 0.8.0)",
+                actions=[CodeAction("Use type syntax", replace_with=replacement)],
+            )
+
+        if not self.tokens["extern"] and self.gir_ns is not None:
+            self.root.gir.validate_type(
+                self.tokens["class_name"], self.tokens["namespace"]
+            )
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index ea2dac8..033e2ca 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -43,7 +43,7 @@ class UI(AstNode):
     ]
 
     @property
-    def gir(self):
+    def gir(self) -> gir.GirContext:
         gir_ctx = gir.GirContext()
         self._gir_errors = []
 
@@ -84,6 +84,20 @@ class UI(AstNode):
             or isinstance(child, Menu)
         ]
 
+    @property
+    def template(self) -> T.Optional[Template]:
+        if len(self.children[Template]):
+            return self.children[Template][0]
+        else:
+            return None
+
+    def is_legacy_template(self, id: str) -> bool:
+        return (
+            id not in self.context[ScopeCtx].objects
+            and self.template is not None
+            and self.template.class_name.glib_type_name == id
+        )
+
     @context(ScopeCtx)
     def scope_ctx(self) -> ScopeCtx:
         return ScopeCtx(node=self)
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index f143f29..cf88249 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -260,6 +260,8 @@ class IdentLiteral(AstNode):
             return gir.BoolType()
         elif object := self.context[ScopeCtx].objects.get(self.ident):
             return object.gir_class
+        elif self.root.is_legacy_template(self.ident):
+            return self.root.template.class_name.gir_type
         else:
             return None
 
@@ -277,6 +279,12 @@ class IdentLiteral(AstNode):
                     did_you_mean=(self.ident, list(expected_type.members.keys())),
                 )
 
+        elif self.root.is_legacy_template(self.ident):
+            raise UpgradeWarning(
+                "Use 'template' instead of the class name (introduced in 0.8.0)",
+                actions=[CodeAction("Use 'template'", "template")],
+            )
+
         elif expected_type is not None:
             object = self.context[ScopeCtx].objects.get(self.ident)
             if object is None:
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 1b5b579..3774c07 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -8,6 +8,7 @@ from .xml_emitter import XmlEmitter
 class XmlOutput(OutputFormat):
     def emit(self, ui: UI) -> str:
         xml = XmlEmitter()
+        self._ui = ui
         self._emit_ui(ui, xml)
         return xml.result
 
@@ -32,7 +33,9 @@ class XmlOutput(OutputFormat):
         xml.put_self_closing("requires", lib="gtk", version=gtk.gir_namespace.version)
 
     def _emit_template(self, template: Template, xml: XmlEmitter):
-        xml.start_tag("template", **{"class": template.id}, parent=template.class_name)
+        xml.start_tag(
+            "template", **{"class": template.gir_class}, parent=template.parent_type
+        )
         self._emit_object_or_template(template, xml)
         xml.end_tag()
 
@@ -188,6 +191,8 @@ class XmlOutput(OutputFormat):
                 xml.put_text(value.ident)
             elif isinstance(value_type, gir.Enumeration):
                 xml.put_text(str(value_type.members[value.ident].value))
+            elif value.ident == "template" and self._ui.template is not None:
+                xml.put_text(self._ui.template.gir_class.glib_type_name)
             else:
                 xml.put_text(value.ident)
         elif isinstance(value, TypeLiteral):
diff --git a/tests/sample_errors/abstract_class.blp b/tests/sample_errors/abstract_class.blp
index c6ea8b9..dfb1819 100644
--- a/tests/sample_errors/abstract_class.blp
+++ b/tests/sample_errors/abstract_class.blp
@@ -1,4 +1,4 @@
 using Gtk 4.0;
 
-template MyWidget : Gtk.Widget {}
+template $MyWidget : Gtk.Widget {}
 Gtk.Widget {}
diff --git a/tests/sample_errors/class_dne.blp b/tests/sample_errors/class_dne.blp
index b594268..2d57234 100644
--- a/tests/sample_errors/class_dne.blp
+++ b/tests/sample_errors/class_dne.blp
@@ -1,3 +1,3 @@
 using Gtk 4.0;
 
-template TestTemplate : Gtk.NotARealClass {}
+template $TestTemplate : Gtk.NotARealClass {}
diff --git a/tests/sample_errors/class_dne.err b/tests/sample_errors/class_dne.err
index 57d74f8..8097027 100644
--- a/tests/sample_errors/class_dne.err
+++ b/tests/sample_errors/class_dne.err
@@ -1 +1 @@
-3,29,13,Namespace Gtk does not contain a type called NotARealClass
+3,30,13,Namespace Gtk does not contain a type called NotARealClass
diff --git a/tests/sample_errors/expr_cast_needed.blp b/tests/sample_errors/expr_cast_needed.blp
index f647cb5..286261d 100644
--- a/tests/sample_errors/expr_cast_needed.blp
+++ b/tests/sample_errors/expr_cast_needed.blp
@@ -1,7 +1,5 @@
 using Gtk 4.0;
 
-template GtkListItem {
-  Label {
-    label: bind GtkListItem.item.label;
-  }
+$MyObject object {
+  foo: bind object.bar.baz;
 }
\ No newline at end of file
diff --git a/tests/sample_errors/expr_cast_needed.err b/tests/sample_errors/expr_cast_needed.err
index 51269d2..d50e713 100644
--- a/tests/sample_errors/expr_cast_needed.err
+++ b/tests/sample_errors/expr_cast_needed.err
@@ -1 +1 @@
-5,34,5,Could not determine the type of the preceding expression
\ No newline at end of file
+4,24,3,Could not determine the type of the preceding expression
\ No newline at end of file
diff --git a/tests/sample_errors/legacy_template.blp b/tests/sample_errors/legacy_template.blp
new file mode 100644
index 0000000..8d2c57b
--- /dev/null
+++ b/tests/sample_errors/legacy_template.blp
@@ -0,0 +1,10 @@
+using Gtk 4.0;
+
+template TestTemplate : ApplicationWindow {
+  test-property: "Hello, world";
+  test-signal => $on_test_signal();
+}
+
+Dialog {
+  transient-for: TestTemplate;
+}
diff --git a/tests/sample_errors/legacy_template.err b/tests/sample_errors/legacy_template.err
new file mode 100644
index 0000000..876b0cf
--- /dev/null
+++ b/tests/sample_errors/legacy_template.err
@@ -0,0 +1,2 @@
+3,10,12,Use type syntax here (introduced in blueprint 0.8.0)
+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/sample_errors/not_a_class.blp b/tests/sample_errors/not_a_class.blp
index 0383154..62e2a63 100644
--- a/tests/sample_errors/not_a_class.blp
+++ b/tests/sample_errors/not_a_class.blp
@@ -1,3 +1,3 @@
 using Gtk 4.0;
 
-template TestTemplate : Gtk.Orientable {}
+template $TestTemplate : Gtk.Orientable {}
diff --git a/tests/sample_errors/not_a_class.err b/tests/sample_errors/not_a_class.err
index c69f602..fb28391 100644
--- a/tests/sample_errors/not_a_class.err
+++ b/tests/sample_errors/not_a_class.err
@@ -1 +1 @@
-3,25,14,Gtk.Orientable is an interface, not a class
+3,26,14,Gtk.Orientable is an interface, not a class
diff --git a/tests/sample_errors/ns_not_imported.blp b/tests/sample_errors/ns_not_imported.blp
index 9c81596..46b382f 100644
--- a/tests/sample_errors/ns_not_imported.blp
+++ b/tests/sample_errors/ns_not_imported.blp
@@ -1,3 +1,3 @@
 using Gtk 4.0;
 
-template TestTemplate : Adw.ApplicationWindow {}
+template $TestTemplate : Adw.ApplicationWindow {}
diff --git a/tests/sample_errors/ns_not_imported.err b/tests/sample_errors/ns_not_imported.err
index 15a24d1..0b6263b 100644
--- a/tests/sample_errors/ns_not_imported.err
+++ b/tests/sample_errors/ns_not_imported.err
@@ -1 +1 @@
-3,25,3,Namespace Adw was not imported
+3,26,3,Namespace Adw was not imported
diff --git a/tests/sample_errors/template_parent.blp b/tests/sample_errors/template_parent.blp
new file mode 100644
index 0000000..3a16ee3
--- /dev/null
+++ b/tests/sample_errors/template_parent.blp
@@ -0,0 +1,3 @@
+using Gtk 4.0;
+
+template Gtk.ListItem : $WrongParent {}
\ No newline at end of file
diff --git a/tests/sample_errors/template_parent.err b/tests/sample_errors/template_parent.err
new file mode 100644
index 0000000..1fa5f04
--- /dev/null
+++ b/tests/sample_errors/template_parent.err
@@ -0,0 +1 @@
+3,1,39,Parent type may only be specified if the template type is extern
\ No newline at end of file
diff --git a/tests/sample_errors/two_templates.blp b/tests/sample_errors/two_templates.blp
index a9c4e7c..cd898bf 100644
--- a/tests/sample_errors/two_templates.blp
+++ b/tests/sample_errors/two_templates.blp
@@ -1,4 +1,6 @@
 using Gtk 4.0;
 
-template ClassName : Gtk.Button {}
-template ClassName2 : Gtk.Button {}
+template $ClassName : Gtk.Button {}
+template $ClassName2 : Gtk.Button {}
+
+Label template {}
\ No newline at end of file
diff --git a/tests/sample_errors/two_templates.err b/tests/sample_errors/two_templates.err
index d085061..5d7488e 100644
--- a/tests/sample_errors/two_templates.err
+++ b/tests/sample_errors/two_templates.err
@@ -1 +1,2 @@
-4,10,10,Only one template may be defined per file, but this file contains 2
+6,7,8,Duplicate object ID 'template'
+4,1,8,Only one template may be defined per file, but this file contains 2
\ No newline at end of file
diff --git a/tests/samples/template.blp b/tests/samples/template.blp
index a0ed5cc..fa2f041 100644
--- a/tests/samples/template.blp
+++ b/tests/samples/template.blp
@@ -1,10 +1,10 @@
 using Gtk 4.0;
 
-template TestTemplate : ApplicationWindow {
+template $TestTemplate : ApplicationWindow {
   test-property: "Hello, world";
   test-signal => $on_test_signal();
 }
 
 Dialog {
-  transient-for: TestTemplate;
+  transient-for: template;
 }
\ No newline at end of file
diff --git a/tests/samples/template_binding.blp b/tests/samples/template_binding.blp
index bbe6e8d..e295dc9 100644
--- a/tests/samples/template_binding.blp
+++ b/tests/samples/template_binding.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
-template MyTemplate : Box {
-  prop1: bind MyTemplate.prop2 as <$MyObject>.prop3;
+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 2e4728e..3c66ce0 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 {
-  prop1: bind MyTemplate.prop2 as <$MyObject>.prop3;
+template $MyTemplate : $MyParentClass {
+  prop1: bind template.prop2 as <$MyObject>.prop3;
 }
\ No newline at end of file
diff --git a/tests/samples/template_no_parent.blp b/tests/samples/template_no_parent.blp
index 2e3defc..1164998 100644
--- a/tests/samples/template_no_parent.blp
+++ b/tests/samples/template_no_parent.blp
@@ -1,3 +1,3 @@
 using Gtk 4.0;
 
-template GtkListItem {}
+template Gtk.ListItem {}
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 6e19a08..66faef1 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -266,6 +266,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("inline_menu")
         self.assert_sample_error("invalid_bool")
         self.assert_sample_error("layout_in_non_widget")
+        self.assert_sample_error("legacy_template")
         self.assert_sample_error("menu_no_id")
         self.assert_sample_error("menu_toplevel_attribute")
         self.assert_sample_error("no_import_version")
@@ -284,6 +285,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("strv")
         self.assert_sample_error("styles_in_non_widget")
         self.assert_sample_error("subscope")
+        self.assert_sample_error("template_parent")
         self.assert_sample_error("two_templates")
         self.assert_sample_error("uint")
         self.assert_sample_error("using_invalid_namespace")

From 7008924afee786762e48bace01b18374159d478a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 13 May 2023 16:31:40 -0500
Subject: [PATCH 120/290] docs: Document the new template type syntax

---
 docs/reference/templates.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/reference/templates.rst b/docs/reference/templates.rst
index be799be..fa4c264 100644
--- a/docs/reference/templates.rst
+++ b/docs/reference/templates.rst
@@ -9,7 +9,7 @@ Composite Templates
 
 .. rst-class:: grammar-block
 
-   Template = 'template' <id::ref:`IDENT<Syntax IDENT>`> ( ':' :ref:`TypeName<Syntax TypeName>` )? :ref:`ObjectContent<Syntax Object>`
+   Template = 'template' :ref:`TypeName<Syntax TypeName>` ( ':' :ref:`TypeName<Syntax TypeName>` )? :ref:`ObjectContent<Syntax Object>`
 
 Widget subclassing is one of the primary techniques for structuring an application. For example, a maps app might have a `Gtk.ApplicationWindow <https://docs.gtk.org/gtk4/class.ApplicationWindow.html>`_ subclass, ``MapsApplicationWindow``, that implements the functionality of its main window. But a maps app has a lot of functionality, so the headerbar might be split into its own `Gtk.HeaderBar <https://docs.gtk.org/gtk4/class.HeaderBar.html>`_ subclass, ``MapsHeaderBar``, for the sake of organization.
 
@@ -43,7 +43,7 @@ For this to work, we need to specify in the blueprint which object is the one be
 
    using Gtk 4.0;
 
-   template MapsHeaderBar : Gtk.HeaderBar {
+   template $MapsHeaderBar : Gtk.HeaderBar {
      /* probably a lot of buttons ... */
    }
 
@@ -69,9 +69,9 @@ This ``MapsHeaderBar`` class, along with its blueprint template, can then be ref
 ID & Parent Parameters
 ~~~~~~~~~~~~~~~~~~~~~~
 
-The ID of a template must match the full class name in your application code. The ID can be used elsewhere in the blueprint to reference the template object, just like any other object ID.
+The type name that directly follows the ``template`` keyword is the type of the template class. In most cases, this will be an extern type starting with ``$`` and matching the class name in the application code. Templates for use in a `Gtk.BuilderListItemFactory <https://docs.gtk.org/gtk4/class.BuilderListItemFactory.html>`_ use ``ListItem`` as the type name instead.
 
-The parent type is optional and enables type checking for the template object.
+The parent type is optional, and may only be present if the template type is extern. It enables limited type checking for the properties and signals of the template object.
 
 
 Language Implementations

From 60f91734216c478fcc1f9c67c82cc53d00b0b5ad Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 13 May 2023 16:49:12 -0500
Subject: [PATCH 121/290] Add type to BuilderListItemFactory extension

Makes it a little clearer how it works.
---
 .../language/gtk_list_item_factory.py         | 29 ++++++++++++++++++-
 tests/sample_errors/list_factory.blp          |  5 ++++
 tests/sample_errors/list_factory.err          |  1 +
 tests/sample_errors/subscope.blp              |  2 +-
 tests/samples/list_factory.blp                |  2 +-
 tests/samples/subscope.blp                    |  2 +-
 tests/test_samples.py                         |  1 +
 7 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 tests/sample_errors/list_factory.blp
 create mode 100644 tests/sample_errors/list_factory.err

diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index 9aab904..35695df 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -2,11 +2,19 @@ from .gobject_object import ObjectContent, validate_parent_type
 from ..parse_tree import Keyword
 from ..ast_utils import AstNode, validate
 from .common import *
+from .types import TypeName
 from .contexts import ScopeCtx
 
 
 class ExtListItemFactory(AstNode):
-    grammar = [Keyword("template"), ObjectContent]
+    grammar = [Keyword("template"), Optional(TypeName), ObjectContent]
+
+    @property
+    def type_name(self) -> T.Optional[TypeName]:
+        if len(self.children[TypeName]) == 1:
+            return self.children[TypeName][0]
+        else:
+            return None
 
     @property
     def gir_class(self):
@@ -21,6 +29,25 @@ class ExtListItemFactory(AstNode):
             "sub-templates",
         )
 
+    @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")
+
+    @validate("template")
+    def type_name_upgrade(self):
+        if self.type_name is None:
+            raise UpgradeWarning(
+                "Expected type name after 'template' keyword",
+                actions=[
+                    CodeAction(
+                        "Add ListItem type to template block (introduced in blueprint 0.8.0)",
+                        "template ListItem",
+                    )
+                ],
+            )
+
     @context(ScopeCtx)
     def scope_ctx(self) -> ScopeCtx:
         return ScopeCtx(node=self)
diff --git a/tests/sample_errors/list_factory.blp b/tests/sample_errors/list_factory.blp
new file mode 100644
index 0000000..bf0cbb1
--- /dev/null
+++ b/tests/sample_errors/list_factory.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+BuilderListItemFactory {
+  template Label {}
+}
\ No newline at end of file
diff --git a/tests/sample_errors/list_factory.err b/tests/sample_errors/list_factory.err
new file mode 100644
index 0000000..adfd57b
--- /dev/null
+++ b/tests/sample_errors/list_factory.err
@@ -0,0 +1 @@
+4,3,17,Only Gtk.ListItem is allowed as a type here
\ No newline at end of file
diff --git a/tests/sample_errors/subscope.blp b/tests/sample_errors/subscope.blp
index 59d3a9f..d90a350 100644
--- a/tests/sample_errors/subscope.blp
+++ b/tests/sample_errors/subscope.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 
 BuilderListItemFactory {
-  template {
+  template ListItem {
     child: label;
   }
 }
diff --git a/tests/samples/list_factory.blp b/tests/samples/list_factory.blp
index ead74c3..118aaf3 100644
--- a/tests/samples/list_factory.blp
+++ b/tests/samples/list_factory.blp
@@ -2,7 +2,7 @@ using Gtk 4.0;
 
 Gtk.ListView {
     factory: Gtk.BuilderListItemFactory list_item_factory {
-        template {
+        template ListItem {
             child: Label {
                 label: "Hello";
             };
diff --git a/tests/samples/subscope.blp b/tests/samples/subscope.blp
index a14591b..03643f4 100644
--- a/tests/samples/subscope.blp
+++ b/tests/samples/subscope.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 
 Gtk.BuilderListItemFactory {
-  template {
+  template ListItem {
     child: Gtk.Label label {};
   }
 }
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 66faef1..bf26640 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -267,6 +267,7 @@ class TestSamples(unittest.TestCase):
         self.assert_sample_error("invalid_bool")
         self.assert_sample_error("layout_in_non_widget")
         self.assert_sample_error("legacy_template")
+        self.assert_sample_error("list_factory")
         self.assert_sample_error("menu_no_id")
         self.assert_sample_error("menu_toplevel_attribute")
         self.assert_sample_error("no_import_version")

From 9346ee039e6636d9ee0e3ef1f89bbf97698a0a8a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 13 May 2023 19:57:45 -0500
Subject: [PATCH 122/290] ci: Fuzzer is no longer allowed to fail

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7522ecb..93ef254 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,6 @@ build:
 fuzz:
   image: registry.gitlab.gnome.org/jwestman/blueprint-compiler
   stage: build
-  allow_failure: true
   script:
     - meson _build
     - ninja -C _build install

From 83d11ccb8c28df2483a469068069d6484436bbcb Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 13 May 2023 18:30:42 -0500
Subject: [PATCH 123/290] tests: Auto-discover test files

---
 tests/sample_errors/obj_class_dne.blp |   3 -
 tests/test_samples.py                 | 164 ++++++--------------------
 2 files changed, 35 insertions(+), 132 deletions(-)
 delete mode 100644 tests/sample_errors/obj_class_dne.blp

diff --git a/tests/sample_errors/obj_class_dne.blp b/tests/sample_errors/obj_class_dne.blp
deleted file mode 100644
index e28fc94..0000000
--- a/tests/sample_errors/obj_class_dne.blp
+++ /dev/null
@@ -1,3 +0,0 @@
-using Gtk 4.0;
-
-NotARealWidget {}
diff --git a/tests/test_samples.py b/tests/test_samples.py
index bf26640..0f39866 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -159,140 +159,46 @@ class TestSamples(unittest.TestCase):
         except:
             pass
 
-        self.assert_sample("accessibility")
-        self.assert_sample("action_widgets")
-        if have_adw_1_4:
-            self.assert_sample("adw_breakpoint")
-        self.assert_sample("child_type")
-        self.assert_sample("combo_box_text")
-        self.assert_sample("comments")
-        self.assert_sample("enum")
-        self.assert_sample("expr_closure", skip_run=True)  # The closure doesn't exist
-        self.assert_sample(
-            "expr_closure_args", skip_run=True
-        )  # The closure doesn't exist
-        self.assert_sample("expr_lookup")
-        self.assert_sample("file_filter")
-        self.assert_sample("flags")
-        self.assert_sample("id_prop")
-        self.assert_sample("layout")
-        self.assert_sample("list_factory")
-        self.assert_sample("menu")
-        self.assert_sample("numbers")
-        self.assert_sample("object_prop")
-        self.assert_sample(
-            "parseable", skip_run=True
-        )  # The image resource doesn't exist
-        self.assert_sample("property")
-        self.assert_sample("property_binding")
-        self.assert_sample("responses", skip_run=not have_adw)
-        self.assert_sample("signal", skip_run=True)  # The callback doesn't exist
-        self.assert_sample("size_group")
-        self.assert_sample("string_list")
-        self.assert_sample("strings")
-        self.assert_sample("style")
-        self.assert_sample("subscope")
-        self.assert_sample(
-            "template", skip_run=True
-        )  # The template class doesn't exist
-        self.assert_sample(
-            "template_binding", skip_run=True
-        )  # The template class doesn't exist
-        self.assert_sample(
-            "template_binding_extern", skip_run=True
-        )  # The template class doesn't exist
-        self.assert_sample(
-            "template_no_parent", skip_run=True
-        )  # The template class doesn't exist
-        self.assert_sample("translated")
-        self.assert_sample(
-            "typeof", skip_run=True
-        )  # The custom object type doesn't exist
-        self.assert_sample("uint")
-        self.assert_sample(
-            "unchecked_class", skip_run=True
-        )  # The custom object type doesn't exist
-        self.assert_sample("using")
+        # list the samples directory
+        samples = [
+            f.stem
+            for f in Path(__file__).parent.glob("samples/*.blp")
+            if not f.stem.endswith("_dec")
+        ]
+        for sample in samples:
+            REQUIRE_ADW_1_4 = ["adw_breakpoint"]
 
-    def test_sample_errors(self):
-        have_adw = False
-        have_adw_1_4 = False
+            SKIP_RUN = [
+                "expr_closure",
+                "expr_closure_args",
+                "parseable",
+                "signal",
+                "template",
+                "template_binding",
+                "template_binding_extern",
+                "template_no_parent",
+                "typeof",
+                "unchecked_class",
+            ]
 
-        try:
-            import gi
+            if sample in REQUIRE_ADW_1_4 and not have_adw_1_4:
+                continue
 
-            gi.require_version("Adw", "1")
-            from gi.repository import Adw
+            with self.subTest(sample):
+                self.assert_sample(sample, skip_run=sample in SKIP_RUN)
 
-            have_adw = True
-            Adw.init()
-            if Adw.MINOR_VERSION >= 4:
-                have_adw_1_4 = True
-        except:
-            pass
+        # list the sample_errors directory
+        sample_errors = [
+            f.stem for f in Path(__file__).parent.glob("sample_errors/*.blp")
+        ]
+        for sample_error in sample_errors:
+            REQUIRE_ADW_1_4 = ["adw_breakpoint"]
 
-        self.assert_sample_error("a11y_in_non_widget")
-        self.assert_sample_error("a11y_prop_dne")
-        self.assert_sample_error("a11y_prop_obj_dne")
-        self.assert_sample_error("a11y_prop_type")
-        self.assert_sample_error("abstract_class")
-        self.assert_sample_error("action_widget_float_response")
-        self.assert_sample_error("action_widget_have_no_id")
-        self.assert_sample_error("action_widget_multiple_default")
-        self.assert_sample_error("action_widget_in_invalid_container")
-        self.assert_sample_error("action_widget_response_dne")
-        self.assert_sample_error("action_widget_negative_response")
-        if have_adw_1_4:
-            self.assert_sample_error("adw_breakpoint")
-        self.assert_sample_error("bitfield_member_dne")
-        self.assert_sample_error("children")
-        self.assert_sample_error("class_assign")
-        self.assert_sample_error("class_dne")
-        self.assert_sample_error("consecutive_unexpected_tokens")
-        self.assert_sample_error("does_not_implement")
-        self.assert_sample_error("duplicate_obj_id")
-        self.assert_sample_error("duplicates")
-        self.assert_sample_error("empty")
-        self.assert_sample_error("enum_member_dne")
-        self.assert_sample_error("expected_semicolon")
-        self.assert_sample_error("expr_cast_conversion")
-        self.assert_sample_error("expr_cast_needed")
-        self.assert_sample_error("expr_closure_not_cast")
-        self.assert_sample_error("expr_lookup_dne")
-        self.assert_sample_error("expr_lookup_no_properties")
-        self.assert_sample_error("filters_in_non_file_filter")
-        self.assert_sample_error("gtk_3")
-        self.assert_sample_error("gtk_exact_version")
-        self.assert_sample_error("inline_menu")
-        self.assert_sample_error("invalid_bool")
-        self.assert_sample_error("layout_in_non_widget")
-        self.assert_sample_error("legacy_template")
-        self.assert_sample_error("list_factory")
-        self.assert_sample_error("menu_no_id")
-        self.assert_sample_error("menu_toplevel_attribute")
-        self.assert_sample_error("no_import_version")
-        self.assert_sample_error("ns_not_found")
-        self.assert_sample_error("ns_not_imported")
-        self.assert_sample_error("not_a_class")
-        self.assert_sample_error("object_dne")
-        self.assert_sample_error("obj_in_string_list")
-        self.assert_sample_error("obj_prop_type")
-        self.assert_sample_error("property_dne")
-        self.assert_sample_error("read_only_properties")
-        self.assert_sample_error("signal_dne")
-        self.assert_sample_error("signal_object_dne")
-        self.assert_sample_error("size_group_non_widget")
-        self.assert_sample_error("size_group_obj_dne")
-        self.assert_sample_error("strv")
-        self.assert_sample_error("styles_in_non_widget")
-        self.assert_sample_error("subscope")
-        self.assert_sample_error("template_parent")
-        self.assert_sample_error("two_templates")
-        self.assert_sample_error("uint")
-        self.assert_sample_error("using_invalid_namespace")
-        self.assert_sample_error("warn_old_bind")
-        self.assert_sample_error("warn_old_extern")
-        self.assert_sample_error("widgets_in_non_size_group")
+            if sample_error in REQUIRE_ADW_1_4 and not have_adw_1_4:
+                continue
+
+            with self.subTest(sample_error):
+                self.assert_sample_error(sample_error)
 
     def test_decompiler(self):
         self.assert_decompile("accessibility_dec")

From 5a782c653bc0f5105d29007ac54762c3a3fb54fb Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 13 May 2023 19:39:48 -0500
Subject: [PATCH 124/290] Add Gtk.Scale mark syntax

---
 blueprintcompiler/completions_utils.py      |   1 +
 blueprintcompiler/language/__init__.py      |   2 +
 blueprintcompiler/language/common.py        |   8 +-
 blueprintcompiler/language/gtk_scale.py     | 152 ++++++++++++++++++++
 blueprintcompiler/outputs/xml/__init__.py   |  20 ++-
 blueprintcompiler/parse_tree.py             |  18 ++-
 docs/reference/extensions.rst               |  15 ++
 tests/sample_errors/scale_mark_position.blp |   7 +
 tests/sample_errors/scale_mark_position.err |   1 +
 tests/samples/scale_marks.blp               |   9 ++
 tests/samples/scale_marks.ui                |  11 ++
 tests/test_samples.py                       |   3 +
 12 files changed, 242 insertions(+), 5 deletions(-)
 create mode 100644 blueprintcompiler/language/gtk_scale.py
 create mode 100644 tests/sample_errors/scale_mark_position.blp
 create mode 100644 tests/sample_errors/scale_mark_position.err
 create mode 100644 tests/samples/scale_marks.blp
 create mode 100644 tests/samples/scale_marks.ui

diff --git a/blueprintcompiler/completions_utils.py b/blueprintcompiler/completions_utils.py
index b9811b9..094e449 100644
--- a/blueprintcompiler/completions_utils.py
+++ b/blueprintcompiler/completions_utils.py
@@ -27,6 +27,7 @@ from .lsp_utils import Completion
 new_statement_patterns = [
     [(TokenType.PUNCTUATION, "{")],
     [(TokenType.PUNCTUATION, "}")],
+    [(TokenType.PUNCTUATION, "]")],
     [(TokenType.PUNCTUATION, ";")],
 ]
 
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 8cfd1bd..d785e56 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -30,6 +30,7 @@ from .gtk_file_filter import (
 )
 from .gtk_layout import ExtLayout
 from .gtk_menu import menu, Menu, MenuAttribute
+from .gtk_scale import ExtScaleMarks
 from .gtk_size_group import ExtSizeGroupWidgets
 from .gtk_string_list import ExtStringListStrings
 from .gtk_styles import ExtStyles
@@ -68,6 +69,7 @@ OBJECT_CONTENT_HOOKS.children = [
     ext_file_filter_suffixes,
     ExtLayout,
     ExtListItemFactory,
+    ExtScaleMarks,
     ExtSizeGroupWidgets,
     ExtStringListStrings,
     ExtStyles,
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index 082aaa4..9938bec 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -29,7 +29,13 @@ from ..errors import (
 )
 from ..completions_utils import *
 from .. import decompiler as decompile
-from ..decompiler import DecompileCtx, decompiler
+from ..decompiler import (
+    DecompileCtx,
+    decompiler,
+    escape_quote,
+    truthy,
+    decompile_translatable,
+)
 from ..gir import (
     StringType,
     BoolType,
diff --git a/blueprintcompiler/language/gtk_scale.py b/blueprintcompiler/language/gtk_scale.py
new file mode 100644
index 0000000..a81e03d
--- /dev/null
+++ b/blueprintcompiler/language/gtk_scale.py
@@ -0,0 +1,152 @@
+# gtk_scale.py
+#
+# Copyright 2023 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 .gobject_object import validate_parent_type, ObjectContent
+from .common import *
+from .values import StringValue
+
+
+class ExtScaleMark(AstNode):
+    grammar = [
+        Keyword("mark"),
+        Match("(").expected(),
+        [
+            Optional(AnyOf(UseExact("sign", "-"), UseExact("sign", "+"))),
+            UseNumber("value"),
+            Optional(
+                [
+                    ",",
+                    UseIdent("position"),
+                    Optional([",", StringValue]),
+                ]
+            ),
+        ],
+        Match(")").expected(),
+    ]
+
+    @property
+    def value(self) -> float:
+        if self.tokens["sign"] == "-":
+            return -self.tokens["value"]
+        else:
+            return self.tokens["value"]
+
+    @property
+    def position(self) -> T.Optional[str]:
+        return self.tokens["position"]
+
+    @property
+    def label(self) -> T.Optional[StringValue]:
+        if len(self.children[StringValue]) == 1:
+            return self.children[StringValue][0]
+        else:
+            return None
+
+    @docs("position")
+    def position_docs(self) -> T.Optional[str]:
+        if member := self.root.gir.get_type("PositionType", "Gtk").members.get(
+            self.position
+        ):
+            return member.doc
+        else:
+            return None
+
+    @validate("position")
+    def validate_position(self):
+        positions = self.root.gir.get_type("PositionType", "Gtk").members
+        if self.position is not None and positions.get(self.position) is None:
+            raise CompileError(
+                f"'{self.position}' is not a member of Gtk.PositionType",
+                did_you_mean=(self.position, positions.keys()),
+            )
+
+
+class ExtScaleMarks(AstNode):
+    grammar = [
+        Keyword("marks"),
+        Match("[").expected(),
+        Until(ExtScaleMark, "]", ","),
+    ]
+
+    @property
+    def marks(self) -> T.List[ExtScaleMark]:
+        return self.children
+
+    @validate("marks")
+    def container_is_size_group(self):
+        validate_parent_type(self, "Gtk", "Scale", "scale marks")
+
+    @validate("marks")
+    def unique_in_parent(self):
+        self.validate_unique_in_parent("Duplicate 'marks' block")
+
+
+@completer(
+    applies_in=[ObjectContent],
+    applies_in_subclass=("Gtk", "Scale"),
+    matches=new_statement_patterns,
+)
+def complete_marks(ast_node, match_variables):
+    yield Completion("marks", CompletionItemKind.Keyword, snippet="marks [\n\t$0\n]")
+
+
+@completer(
+    applies_in=[ExtScaleMarks],
+)
+def complete_mark(ast_node, match_variables):
+    yield Completion("mark", CompletionItemKind.Keyword, snippet="mark ($0),")
+
+
+@decompiler("marks")
+def decompile_marks(
+    ctx,
+    gir,
+):
+    ctx.print("marks [")
+
+
+@decompiler("mark", cdata=True)
+def decompile_mark(
+    ctx: DecompileCtx,
+    gir,
+    value,
+    position=None,
+    cdata=None,
+    translatable="false",
+    comments=None,
+    context=None,
+):
+    if comments is not None:
+        ctx.print(f"/* Translators: {comments} */")
+
+    text = f"mark ({value}"
+
+    if position:
+        text += f", {position}"
+    elif cdata:
+        text += f", bottom"
+
+    if truthy(translatable):
+        comments, translatable = decompile_translatable(
+            cdata, translatable, context, comments
+        )
+        text += f", {translatable}"
+
+    text += "),"
+    ctx.print(text)
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 3774c07..020648c 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -147,9 +147,11 @@ class XmlOutput(OutputFormat):
             raise CompilerBugError()
 
     def _translated_string_attrs(
-        self, translated: T.Union[QuotedLiteral, Translated]
+        self, translated: T.Optional[T.Union[QuotedLiteral, Translated]]
     ) -> T.Dict[str, T.Optional[str]]:
-        if isinstance(translated, QuotedLiteral):
+        if translated is None:
+            return {}
+        elif isinstance(translated, QuotedLiteral):
             return {}
         else:
             return {"translatable": "true", "context": translated.translate_context}
@@ -350,6 +352,20 @@ class XmlOutput(OutputFormat):
                 xml.end_tag()
             xml.end_tag()
 
+        elif isinstance(extension, ExtScaleMarks):
+            xml.start_tag("marks")
+            for mark in extension.children:
+                xml.start_tag(
+                    "mark",
+                    value=mark.value,
+                    position=mark.position,
+                    **self._translated_string_attrs(mark.label and mark.label.child),
+                )
+                if mark.label is not None:
+                    xml.put_text(mark.label.string)
+                xml.end_tag()
+            xml.end_tag()
+
         elif isinstance(extension, ExtStringListStrings):
             xml.start_tag("items")
             for string in extension.children:
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index 8b2963a..ff080ea 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -244,7 +244,7 @@ class ParseNode:
         what it does and how the parser works before using it."""
         return Err(self, message)
 
-    def expected(self, expect) -> "Err":
+    def expected(self, expect: str) -> "Err":
         """Convenience method for err()."""
         return self.err("Expected " + expect)
 
@@ -390,9 +390,12 @@ class Until(ParseNode):
     the child does not match, one token is skipped and the match is attempted
     again."""
 
-    def __init__(self, child, delimiter):
+    def __init__(self, child, delimiter, between_delimiter=None):
         self.child = to_parse_node(child)
         self.delimiter = to_parse_node(delimiter)
+        self.between_delimiter = (
+            to_parse_node(between_delimiter) if between_delimiter is not None else None
+        )
 
     def _parse(self, ctx: ParseContext):
         while not self.delimiter.parse(ctx).succeeded():
@@ -402,6 +405,17 @@ class Until(ParseNode):
             try:
                 if not self.child.parse(ctx).matched():
                     ctx.skip_unexpected_token()
+
+                if (
+                    self.between_delimiter is not None
+                    and not self.between_delimiter.parse(ctx).succeeded()
+                ):
+                    if self.delimiter.parse(ctx).succeeded():
+                        return True
+                    else:
+                        if ctx.is_eof():
+                            return False
+                        ctx.skip_unexpected_token()
             except CompileError as e:
                 ctx.errors.append(e)
                 ctx.next_token()
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index d8553ad..bfa0c56 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -212,6 +212,21 @@ The template type is `Gtk.ListItem <https://docs.gtk.org/gtk4/class.ListItem.htm
    }
 
 
+.. _Syntax ExtScaleMarks:
+
+Gtk.Scale Marks
+---------------
+
+.. rst-class:: grammar-block
+
+   ExtScaleMarks = 'marks' '[' (ExtScaleMark),* ']'
+   ExtScaleMark = 'mark' '(' ( '-' | '+' )? <value::ref:`NUMBER<Syntax NUMBER>`> ( ',' <position::ref:`IDENT<Syntax IDENT>`> ( ',' :ref:`StringValue<Syntax StringValue>` )? )? ')'
+
+Valid in `Gtk.Scale <https://docs.gtk.org/gtk4/class.Scale.html>`_.
+
+The ``marks`` block defines the marks on a scale. A single ``mark`` has up to three arguments: a value, an optional position, and an optional label. The position can be ``left``, ``right``, ``top``, or ``bottom``. The label may be translated.
+
+
 .. _Syntax ExtSizeGroupWidgets:
 
 Gtk.SizeGroup Widgets
diff --git a/tests/sample_errors/scale_mark_position.blp b/tests/sample_errors/scale_mark_position.blp
new file mode 100644
index 0000000..40f479b
--- /dev/null
+++ b/tests/sample_errors/scale_mark_position.blp
@@ -0,0 +1,7 @@
+using Gtk 4.0;
+
+Scale {
+  marks [
+    mark (0, bottom_right),
+  ]
+}
\ No newline at end of file
diff --git a/tests/sample_errors/scale_mark_position.err b/tests/sample_errors/scale_mark_position.err
new file mode 100644
index 0000000..612ea8a
--- /dev/null
+++ b/tests/sample_errors/scale_mark_position.err
@@ -0,0 +1 @@
+5,14,12,'bottom_right' is not a member of Gtk.PositionType
\ No newline at end of file
diff --git a/tests/samples/scale_marks.blp b/tests/samples/scale_marks.blp
new file mode 100644
index 0000000..a766cfa
--- /dev/null
+++ b/tests/samples/scale_marks.blp
@@ -0,0 +1,9 @@
+using Gtk 4.0;
+
+Scale {
+  marks [
+    mark (-1, bottom),
+    mark (0, top, _("Hello, world!")),
+    mark (2),
+  ]
+}
diff --git a/tests/samples/scale_marks.ui b/tests/samples/scale_marks.ui
new file mode 100644
index 0000000..719f888
--- /dev/null
+++ b/tests/samples/scale_marks.ui
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkScale">
+    <marks>
+      <mark value="-1" position="bottom"></mark>
+      <mark value="0" position="top" translatable="true">Hello, world!</mark>
+      <mark value="2"></mark>
+    </marks>
+  </object>
+</interface>
\ No newline at end of file
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 0f39866..f6ba1a0 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -165,6 +165,7 @@ class TestSamples(unittest.TestCase):
             for f in Path(__file__).parent.glob("samples/*.blp")
             if not f.stem.endswith("_dec")
         ]
+        samples.sort()
         for sample in samples:
             REQUIRE_ADW_1_4 = ["adw_breakpoint"]
 
@@ -191,6 +192,7 @@ class TestSamples(unittest.TestCase):
         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"]
 
@@ -212,6 +214,7 @@ class TestSamples(unittest.TestCase):
         self.assert_decompile("property_binding_dec")
         self.assert_decompile("placeholder_dec")
         self.assert_decompile("responses")
+        self.assert_decompile("scale_marks")
         self.assert_decompile("signal")
         self.assert_decompile("strings")
         self.assert_decompile("style_dec")

From 46e467bbfb5f498f52efa9829cb542968290fda0 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 13 May 2023 20:15:28 -0500
Subject: [PATCH 125/290] Fix 'template' keyword in list item factories

---
 blueprintcompiler/language/contexts.py           | 16 +++++++++++++++-
 blueprintcompiler/language/expression.py         |  2 +-
 blueprintcompiler/language/gobject_signal.py     |  5 -----
 .../language/gtk_list_item_factory.py            |  2 +-
 blueprintcompiler/outputs/xml/__init__.py        |  8 +++++---
 tests/samples/list_factory.blp                   |  2 +-
 tests/samples/list_factory.ui                    |  8 +++++++-
 7 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
index 069f4de..29d95de 100644
--- a/blueprintcompiler/language/contexts.py
+++ b/blueprintcompiler/language/contexts.py
@@ -36,6 +36,16 @@ class ValueTypeCtx:
 class ScopeCtx:
     node: AstNode
 
+    @cached_property
+    def template(self):
+        from .ui import UI
+        from .gtk_list_item_factory import ExtListItemFactory
+
+        if isinstance(self.node, UI):
+            return self.node.template
+        elif isinstance(self.node, ExtListItemFactory):
+            return self.node
+
     @cached_property
     def objects(self) -> T.Dict[str, Object]:
         return {
@@ -45,6 +55,8 @@ class ScopeCtx:
         }
 
     def validate_unique_ids(self) -> None:
+        from .gtk_list_item_factory import ExtListItemFactory
+
         passed = {}
         for obj in self._iter_recursive(self.node):
             if obj.tokens["id"] is None:
@@ -52,7 +64,9 @@ class ScopeCtx:
 
             if obj.tokens["id"] in passed:
                 token = obj.group.tokens["id"]
-                if not isinstance(obj, Template):
+                if not isinstance(obj, Template) and not isinstance(
+                    obj, ExtListItemFactory
+                ):
                     raise CompileError(
                         f"Duplicate object ID '{obj.tokens['id']}'",
                         token.start,
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 3f816f3..314c753 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -106,7 +106,7 @@ class LiteralExpr(ExprBase):
 
         if isinstance(self.literal.value, IdentLiteral):
             if object := self.context[ScopeCtx].objects.get(self.literal.value.ident):
-                return not isinstance(object, Template)
+                return not object.gir_class.incomplete
         return True
 
 
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index e5c71c6..6cc0c5f 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -96,11 +96,6 @@ class Signal(AstNode):
             # This happens for classes defined by the app itself
             return
 
-        if isinstance(self.parent.parent, Template):
-            # If the signal is part of a template, it might be defined by
-            # the application and thus not in gir
-            return
-
         if self.gir_signal is None:
             raise CompileError(
                 f"Class {self.gir_class.full_name} does not contain a signal called {self.tokens['name']}",
diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index 35695df..cf1a415 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -7,7 +7,7 @@ from .contexts import ScopeCtx
 
 
 class ExtListItemFactory(AstNode):
-    grammar = [Keyword("template"), Optional(TypeName), ObjectContent]
+    grammar = [UseExact("id", "template"), Optional(TypeName), ObjectContent]
 
     @property
     def type_name(self) -> T.Optional[TypeName]:
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 020648c..0fc2c5e 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -8,7 +8,6 @@ from .xml_emitter import XmlEmitter
 class XmlOutput(OutputFormat):
     def emit(self, ui: UI) -> str:
         xml = XmlEmitter()
-        self._ui = ui
         self._emit_ui(ui, xml)
         return xml.result
 
@@ -193,8 +192,11 @@ class XmlOutput(OutputFormat):
                 xml.put_text(value.ident)
             elif isinstance(value_type, gir.Enumeration):
                 xml.put_text(str(value_type.members[value.ident].value))
-            elif value.ident == "template" and self._ui.template is not None:
-                xml.put_text(self._ui.template.gir_class.glib_type_name)
+            elif (
+                value.ident == "template"
+                and value.context[ScopeCtx].template is not None
+            ):
+                xml.put_text(value.context[ScopeCtx].template.gir_class.glib_type_name)
             else:
                 xml.put_text(value.ident)
         elif isinstance(value, TypeLiteral):
diff --git a/tests/samples/list_factory.blp b/tests/samples/list_factory.blp
index 118aaf3..27c65f2 100644
--- a/tests/samples/list_factory.blp
+++ b/tests/samples/list_factory.blp
@@ -4,7 +4,7 @@ Gtk.ListView {
     factory: Gtk.BuilderListItemFactory list_item_factory {
         template ListItem {
             child: Label {
-                label: "Hello";
+                label: bind template.item as <$MyObject>.name;
             };
         }
     };
diff --git a/tests/samples/list_factory.ui b/tests/samples/list_factory.ui
index 664de85..447a53a 100644
--- a/tests/samples/list_factory.ui
+++ b/tests/samples/list_factory.ui
@@ -9,7 +9,13 @@
   <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
-        <property name="label">Hello</property>
+        <binding name="label">
+          <lookup name="name" type="MyObject">
+            <lookup name="item" type="GtkListItem">
+              <constant>GtkListItem</constant>
+            </lookup>
+          </lookup>
+        </binding>
       </object>
     </property>
   </template>

From 8f3682135b6015f38fcf09c8714e4a89daa91987 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 13 May 2023 21:17:25 -0500
Subject: [PATCH 126/290] Release v0.8.0

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

diff --git a/NEWS.md b/NEWS.md
index 276d879..dbea36a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,51 @@
+# v0.8.0
+
+## Breaking Changes
+
+- A trailing `|` is no longer allowed in flags.
+- The primitive type names `gboolean`, `gchararray`, `gint`, `gint64`, `guint`, `guint64`, `gfloat`, `gdouble`, `utf8`, and `gtype` are no longer permitted. Use the non-`g`-prefixed versions instead.
+- Translated strings may no longer have trailing commas.
+
+## Added
+
+- Added cast expressions, which are sometimes needed to specify type information in expressions.
+- Added support for closure expressions.
+- Added the `--typelib-path` command line argument, which allows adding directories to the search path for typelib files.
+- Added custom compile and decompile commands to the language server. (Sonny Piers)
+- Added support for [Adw.MessageDialog](https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1-latest/class.MessageDialog.html#adwmessagedialog-as-gtkbuildable) custom syntax.
+- Added support for inline sub-templates for [Gtk.BuilderListItemFactory](https://docs.gtk.org/gtk4/class.BuilderListItemFactory.html). (Cameron Dehning)
+- Added support for [Adw.Breakpoint](https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.Breakpoint.html) custom syntax.
+- Added a warning when an object ID might be confusing.
+- Added support for [Gtk.Scale](https://docs.gtk.org/gtk4/class.Scale.html#gtkscale-as-gtkbuildable) custom syntax.
+
+## Changed
+
+Some of these changes affect syntax, but the old syntax is still accepted with a purple "upgrade" warning, so they are not breaking changes yet. In editors that support code actions, such as Visual Studio Code, the blueprint language server can automatically fix these warnings.
+
+- The XML output uses the integer value rather than GIR name for enum values.
+- Compiler errors are now printed to stderr rather than stdout. (Sonny Piers)
+- Introduced `$` to indicate types or callbacks that are provided in application code.
+  - Types that are provided by application code are now begin with a `$` rather than a leading `.`.
+  - The handler name in a signal is now prefixed with `$`.
+  - Closure expressions, which were added in this version, are also prefixed with `$`.
+- When a namespace is not found, errors are supressed when the namespace is used.
+- The compiler bug message now reports the version of blueprint-compiler.
+- The `typeof` syntax now uses `<>` instead of `()` to match cast expressions.
+- Menu sections and subsections can now have an ID.
+- The interactive porting tool now ignores hidden folders. (Sonny Piers)
+- Templates now use the typename syntax rather than an ID to specify the template's class. In most cases, this just means adding a `$` prefix to the ID, but for GtkListItem templates it should be shortened to ListItem (since the Gtk namespace is implied). The template object is now referenced with the `template` keyword rather than with the ID.
+
+## Fixed
+
+- Fixed a bug in the language server's acceptance of text change commands. (Sonny Piers)
+- Fixed a bug in the display of diagnostics when the diagnostic is at the beginning of a line.
+- Fixed a crash that occurred when dealing with array types.
+- Fixed a bug that prevented Gio.File properties from being settable.
+
+## Documentation
+
+- Added a reference section to the documentation. This replaces the Examples page with a detailed description of each syntax feature, including a formal specification of the grammar.
+
 # v0.6.0
 
 ## Breaking Changes
diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index f848671..7db32be 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -16,7 +16,7 @@ a module in your flatpak manifest:
        {
          "type": "git",
          "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-         "tag": "v0.6.0"
+         "tag": "v0.8.0"
        }
      ]
    }
diff --git a/meson.build b/meson.build
index 186c967..b082627 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.7.0',
+  version: '0.8.0',
 )
 
 subdir('docs')

From e4bad039b0ff3d054666eb6161004c1df75ea933 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 16 May 2023 17:14:34 -0500
Subject: [PATCH 127/290] Fix simple bindings with template soure

---
 blueprintcompiler/outputs/xml/__init__.py | 11 ++++++++++-
 tests/samples/template_simple_binding.blp |  5 +++++
 tests/samples/template_simple_binding.ui  |  7 +++++++
 tests/test_samples.py                     |  1 +
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tests/samples/template_simple_binding.blp
 create mode 100644 tests/samples/template_simple_binding.ui

diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 0fc2c5e..fd0bb70 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -114,7 +114,16 @@ class XmlOutput(OutputFormat):
 
         elif isinstance(value, Binding):
             if simple := value.simple_binding:
-                props["bind-source"] = simple.source
+                if (
+                    simple.source == "template"
+                    and value.context[ScopeCtx].template is not None
+                ):
+                    props["bind-source"] = value.context[
+                        ScopeCtx
+                    ].template.gir_class.glib_type_name
+                else:
+                    props["bind-source"] = simple.source
+
                 props["bind-property"] = simple.property_name
                 props["bind-flags"] = "sync-create"
                 xml.put_self_closing("property", **props)
diff --git a/tests/samples/template_simple_binding.blp b/tests/samples/template_simple_binding.blp
new file mode 100644
index 0000000..549f885
--- /dev/null
+++ b/tests/samples/template_simple_binding.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+template $MyTemplate {
+  prop: bind template.prop2;
+}
\ No newline at end of file
diff --git a/tests/samples/template_simple_binding.ui b/tests/samples/template_simple_binding.ui
new file mode 100644
index 0000000..41788e4
--- /dev/null
+++ b/tests/samples/template_simple_binding.ui
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="MyTemplate">
+    <property name="prop" bind-source="MyTemplate" bind-property="prop2" bind-flags="sync-create"/>
+  </template>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index f6ba1a0..fa628be 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -178,6 +178,7 @@ class TestSamples(unittest.TestCase):
                 "template_binding",
                 "template_binding_extern",
                 "template_no_parent",
+                "template_simple_binding",
                 "typeof",
                 "unchecked_class",
             ]

From 9e02051e12433e7c2a4e3b818f6e9f21a5983c05 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 16 May 2023 17:33:37 -0500
Subject: [PATCH 128/290] docs: Fix ExtListItemFactory example & description

---
 docs/reference/extensions.rst | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index bfa0c56..f7b42b1 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -187,28 +187,30 @@ Gtk.BuilderListItemFactory Templates
 
 .. rst-class:: grammar-block
 
-   ExtListItemFactory = 'template' :ref:`ObjectContent<Syntax Object>`
+   ExtListItemFactory = 'template' :ref:`TypeName<Syntax TypeName>` :ref:`ObjectContent<Syntax Object>`
 
 Valid in `Gtk.BuilderListItemFactory <https://docs.gtk.org/gtk4/class.BuilderListItemFactory.html>`_.
 
-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 the list items. The sub-blueprint may not reference objects in the main blueprint or vice versa.
+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 is `Gtk.ListItem <https://docs.gtk.org/gtk4/class.ListItem.html>`_, and the template should have a ``child`` property.
+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.
 
 .. code-block:: blueprintui
 
-   ListBox {
-     factory: ListItemFactory {
-       template {
+   ListView {
+     factory: BuilderListItemFactory {
+       template ListItem {
          child: Label {
-           label: bind item.string;
+           label: bind template.item as <StringObject>.string;
          };
        }
-     }
+     };
 
-     model: StringList {
-       strings [ "Item 1", "Item 2", "Item 3" ]
-     }
+     model: NoSelection {
+       model: StringList {
+         strings [ "Item 1", "Item 2", "Item 3" ]
+       };
+     };
    }
 
 

From b5eca8b0b3b5cf36ee9b619b12a1545390e1bd3f Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 16 May 2023 17:37:52 -0500
Subject: [PATCH 129/290] tests: Add another template test

---
 tests/samples/template_id.blp | 6 ++++++
 tests/samples/template_id.ui  | 7 +++++++
 tests/test_samples.py         | 1 +
 3 files changed, 14 insertions(+)
 create mode 100644 tests/samples/template_id.blp
 create mode 100644 tests/samples/template_id.ui

diff --git a/tests/samples/template_id.blp b/tests/samples/template_id.blp
new file mode 100644
index 0000000..7bdff61
--- /dev/null
+++ b/tests/samples/template_id.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+
+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.ui b/tests/samples/template_id.ui
new file mode 100644
index 0000000..c7791b2
--- /dev/null
+++ b/tests/samples/template_id.ui
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="MyTemplate" parent="GtkButton">
+    <property name="child">MyTemplate</property>
+  </template>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index fa628be..34fe45f 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -177,6 +177,7 @@ class TestSamples(unittest.TestCase):
                 "template",
                 "template_binding",
                 "template_binding_extern",
+                "template_id",
                 "template_no_parent",
                 "template_simple_binding",
                 "typeof",

From 3ebe5c72c1d4600e7d43202b29c83a35eaf27b9f Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 16 May 2023 17:42:53 -0500
Subject: [PATCH 130/290] Fix templates in bind-property

---
 blueprintcompiler/outputs/xml/__init__.py | 11 ++++++++++-
 tests/samples/template_bind_property.blp  |  5 +++++
 tests/samples/template_bind_property.ui   |  7 +++++++
 tests/test_samples.py                     |  1 +
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tests/samples/template_bind_property.blp
 create mode 100644 tests/samples/template_bind_property.ui

diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index fd0bb70..a58ca9d 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -141,7 +141,16 @@ class XmlOutput(OutputFormat):
             if value.bidirectional:
                 bind_flags.append("bidirectional")
 
-            props["bind-source"] = value.source
+            if (
+                value.source == "template"
+                and value.context[ScopeCtx].template is not None
+            ):
+                props["bind-source"] = value.context[
+                    ScopeCtx
+                ].template.gir_class.glib_type_name
+            else:
+                props["bind-source"] = value.source
+
             props["bind-property"] = value.property_name
             props["bind-flags"] = "|".join(bind_flags) or None
             xml.put_self_closing("property", **props)
diff --git a/tests/samples/template_bind_property.blp b/tests/samples/template_bind_property.blp
new file mode 100644
index 0000000..e2be0bf
--- /dev/null
+++ b/tests/samples/template_bind_property.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+template $MyTemplate {
+  object: bind-property template.object2;
+}
\ No newline at end of file
diff --git a/tests/samples/template_bind_property.ui b/tests/samples/template_bind_property.ui
new file mode 100644
index 0000000..eb55547
--- /dev/null
+++ b/tests/samples/template_bind_property.ui
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="MyTemplate">
+    <property name="object" bind-source="MyTemplate" bind-property="object2" bind-flags="sync-create"/>
+  </template>
+</interface>
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 34fe45f..30a41aa 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -177,6 +177,7 @@ class TestSamples(unittest.TestCase):
                 "template",
                 "template_binding",
                 "template_binding_extern",
+                "template_bind_property",
                 "template_id",
                 "template_no_parent",
                 "template_simple_binding",

From c95195197d5b9ca603e8335bd0dfdf730bebec4b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 16 May 2023 18:47:07 -0500
Subject: [PATCH 131/290] Fix template IDs in a couple more places

---
 blueprintcompiler/language/gtk_size_group.py |  4 ++
 blueprintcompiler/outputs/xml/__init__.py    | 42 +++++++-------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index 9e45768..235d92b 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -26,6 +26,10 @@ from .contexts import ScopeCtx
 class Widget(AstNode):
     grammar = UseIdent("name")
 
+    @property
+    def name(self) -> str:
+        return self.tokens["name"]
+
     @validate("name")
     def obj_widget(self):
         object = self.context[ScopeCtx].objects.get(self.tokens["name"])
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index a58ca9d..a2d81a3 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -114,16 +114,7 @@ class XmlOutput(OutputFormat):
 
         elif isinstance(value, Binding):
             if simple := value.simple_binding:
-                if (
-                    simple.source == "template"
-                    and value.context[ScopeCtx].template is not None
-                ):
-                    props["bind-source"] = value.context[
-                        ScopeCtx
-                    ].template.gir_class.glib_type_name
-                else:
-                    props["bind-source"] = simple.source
-
+                props["bind-source"] = self._object_id(value, simple.source)
                 props["bind-property"] = simple.property_name
                 props["bind-flags"] = "sync-create"
                 xml.put_self_closing("property", **props)
@@ -141,16 +132,7 @@ class XmlOutput(OutputFormat):
             if value.bidirectional:
                 bind_flags.append("bidirectional")
 
-            if (
-                value.source == "template"
-                and value.context[ScopeCtx].template is not None
-            ):
-                props["bind-source"] = value.context[
-                    ScopeCtx
-                ].template.gir_class.glib_type_name
-            else:
-                props["bind-source"] = value.source
-
+            props["bind-source"] = self._object_id(value, value.source)
             props["bind-property"] = value.property_name
             props["bind-flags"] = "|".join(bind_flags) or None
             xml.put_self_closing("property", **props)
@@ -182,7 +164,9 @@ class XmlOutput(OutputFormat):
             name=name,
             handler=signal.handler,
             swapped=signal.is_swapped or None,
-            object=signal.object_id,
+            object=(
+                self._object_id(signal, signal.object_id) if signal.object_id else None
+            ),
         )
 
     def _emit_child(self, child: Child, xml: XmlEmitter):
@@ -210,13 +194,8 @@ class XmlOutput(OutputFormat):
                 xml.put_text(value.ident)
             elif isinstance(value_type, gir.Enumeration):
                 xml.put_text(str(value_type.members[value.ident].value))
-            elif (
-                value.ident == "template"
-                and value.context[ScopeCtx].template is not None
-            ):
-                xml.put_text(value.context[ScopeCtx].template.gir_class.glib_type_name)
             else:
-                xml.put_text(value.ident)
+                xml.put_text(self._object_id(value, value.ident))
         elif isinstance(value, TypeLiteral):
             xml.put_text(value.type_name.glib_type_name)
         else:
@@ -394,6 +373,7 @@ class XmlOutput(OutputFormat):
                 xml.put_text(value.string)
                 xml.end_tag()
             xml.end_tag()
+
         elif isinstance(extension, ExtListItemFactory):
             child_xml = XmlEmitter()
             child_xml.start_tag("interface")
@@ -414,8 +394,14 @@ class XmlOutput(OutputFormat):
         elif isinstance(extension, ExtSizeGroupWidgets):
             xml.start_tag("widgets")
             for prop in extension.children:
-                xml.put_self_closing("widget", name=prop.tokens["name"])
+                xml.put_self_closing("widget", name=prop.name)
             xml.end_tag()
 
         else:
             raise CompilerBugError()
+
+    def _object_id(self, node: AstNode, id: str) -> str:
+        if id == "template" and node.context[ScopeCtx].template is not None:
+            return node.context[ScopeCtx].template.gir_class.glib_type_name
+        else:
+            return id

From 64da41b2688adc8cbbe1a82177dd88c5dbee0d09 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 17 May 2023 09:58:51 -0500
Subject: [PATCH 132/290] ExtAdwMessageDialog: Duplicate flag errors

---
 .../language/adw_message_dialog.py            | 49 +++++++++++++++----
 .../adw_message_dialog_duplicate_flags.blp    |  9 ++++
 .../adw_message_dialog_duplicate_flags.err    |  2 +
 3 files changed, 50 insertions(+), 10 deletions(-)
 create mode 100644 tests/sample_errors/adw_message_dialog_duplicate_flags.blp
 create mode 100644 tests/sample_errors/adw_message_dialog_duplicate_flags.err

diff --git a/blueprintcompiler/language/adw_message_dialog.py b/blueprintcompiler/language/adw_message_dialog.py
index 3cbd3e2..2823f77 100644
--- a/blueprintcompiler/language/adw_message_dialog.py
+++ b/blueprintcompiler/language/adw_message_dialog.py
@@ -25,31 +25,60 @@ from .gobject_object import ObjectContent, validate_parent_type
 from .values import StringValue
 
 
-class Response(AstNode):
+class ExtAdwMessageDialogFlag(AstNode):
+    grammar = AnyOf(
+        UseExact("flag", "destructive"),
+        UseExact("flag", "suggested"),
+        UseExact("flag", "disabled"),
+    )
+
+    @property
+    def flag(self) -> str:
+        return self.tokens["flag"]
+
+    @validate()
+    def unique(self):
+        self.validate_unique_in_parent(
+            f"Duplicate '{self.flag}' flag", check=lambda child: child.flag == self.flag
+        )
+
+    @validate()
+    def exclusive(self):
+        if self.flag in ["destructive", "suggested"]:
+            self.validate_unique_in_parent(
+                "'suggested' and 'destructive' are exclusive",
+                check=lambda child: child.flag in ["destructive", "suggested"],
+            )
+
+
+class ExtAdwMessageDialogResponse(AstNode):
     grammar = [
         UseIdent("id"),
         Match(":").expected(),
         to_parse_node(StringValue).expected("a string or translatable string"),
-        ZeroOrMore(
-            AnyOf(Keyword("destructive"), Keyword("suggested"), Keyword("disabled"))
-        ),
+        ZeroOrMore(ExtAdwMessageDialogFlag),
     ]
 
     @property
     def id(self) -> str:
         return self.tokens["id"]
 
+    @property
+    def flags(self) -> T.List[ExtAdwMessageDialogFlag]:
+        return self.children[ExtAdwMessageDialogFlag]
+
     @property
     def appearance(self) -> T.Optional[str]:
-        if "destructive" in self.tokens:
+        if any(flag.flag == "destructive" for flag in self.flags):
             return "destructive"
-        if "suggested" in self.tokens:
+        elif any(flag.flag == "suggested" for flag in self.flags):
             return "suggested"
-        return None
+        else:
+            return None
 
     @property
     def enabled(self) -> bool:
-        return "disabled" not in self.tokens
+        return not any(flag.flag == "disabled" for flag in self.flags)
 
     @property
     def value(self) -> StringValue:
@@ -71,12 +100,12 @@ class ExtAdwMessageDialog(AstNode):
     grammar = [
         Keyword("responses"),
         Match("[").expected(),
-        Delimited(Response, ","),
+        Delimited(ExtAdwMessageDialogResponse, ","),
         "]",
     ]
 
     @property
-    def responses(self) -> T.List[Response]:
+    def responses(self) -> T.List[ExtAdwMessageDialogResponse]:
         return self.children
 
     @validate("responses")
diff --git a/tests/sample_errors/adw_message_dialog_duplicate_flags.blp b/tests/sample_errors/adw_message_dialog_duplicate_flags.blp
new file mode 100644
index 0000000..466db6e
--- /dev/null
+++ b/tests/sample_errors/adw_message_dialog_duplicate_flags.blp
@@ -0,0 +1,9 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.MessageDialog {
+  responses [
+    cancel: _("Cancel") disabled disabled,
+    ok: _("Ok") destructive suggested,
+  ]
+}
\ No newline at end of file
diff --git a/tests/sample_errors/adw_message_dialog_duplicate_flags.err b/tests/sample_errors/adw_message_dialog_duplicate_flags.err
new file mode 100644
index 0000000..91f0a3d
--- /dev/null
+++ b/tests/sample_errors/adw_message_dialog_duplicate_flags.err
@@ -0,0 +1,2 @@
+6,34,8,Duplicate 'disabled' flag
+7,29,9,'suggested' and 'destructive' are exclusive
\ No newline at end of file

From 2ca71de06181dbbd29c7941c23ca9e8af5ca65ad Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 17 May 2023 10:01:23 -0500
Subject: [PATCH 133/290] Fix template IDs in breakpoint setters

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

diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index a2d81a3..7d450d1 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -300,7 +300,7 @@ class XmlOutput(OutputFormat):
 
                 xml.start_tag(
                     "setter",
-                    object=setter.object_id,
+                    object=self._object_id(setter, setter.object_id),
                     property=setter.property_name,
                     **attrs,
                 )

From 6ac798ea6ff17aec17c9be1064572eda2b67db6c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 17 May 2023 10:25:25 -0500
Subject: [PATCH 134/290] More errors for duplicates

---
 blueprintcompiler/ast_utils.py                |  4 +-
 blueprintcompiler/language/gobject_signal.py  | 39 +++++++++++++++----
 .../language/gtk_combo_box_text.py            |  7 ++++
 blueprintcompiler/language/gtk_file_filter.py |  7 ++++
 .../language/gtk_list_item_factory.py         |  4 ++
 blueprintcompiler/language/gtk_menu.py        |  6 +++
 blueprintcompiler/language/gtk_size_group.py  |  6 +++
 blueprintcompiler/language/gtk_styles.py      |  6 +++
 .../language/gtkbuilder_child.py              | 14 +++++++
 .../language/property_binding.py              |  6 +++
 blueprintcompiler/language/values.py          |  6 +++
 .../duplicate_internal_child.blp              |  8 ++++
 .../duplicate_internal_child.err              |  1 +
 13 files changed, 105 insertions(+), 9 deletions(-)
 create mode 100644 tests/sample_errors/duplicate_internal_child.blp
 create mode 100644 tests/sample_errors/duplicate_internal_child.err

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 7bfacfb..13f6eb1 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -175,7 +175,9 @@ class AstNode:
         for child in self.children:
             yield from child.get_semantic_tokens()
 
-    def validate_unique_in_parent(self, error, check=None):
+    def validate_unique_in_parent(
+        self, error: str, check: T.Optional[T.Callable[["AstNode"], bool]] = None
+    ):
         for child in self.parent.children:
             if child is self:
                 break
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 6cc0c5f..f08168f 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -24,6 +24,23 @@ from .contexts import ScopeCtx
 from .common import *
 
 
+class SignalFlag(AstNode):
+    grammar = AnyOf(
+        UseExact("flag", "swapped"),
+        UseExact("flag", "after"),
+    )
+
+    @property
+    def flag(self) -> str:
+        return self.tokens["flag"]
+
+    @validate()
+    def unique(self):
+        self.validate_unique_in_parent(
+            f"Duplicate flag '{self.flag}'", lambda x: x.flag == self.flag
+        )
+
+
 class Signal(AstNode):
     grammar = Statement(
         UseIdent("name"),
@@ -39,12 +56,7 @@ class Signal(AstNode):
         Match("(").expected("argument list"),
         Optional(UseIdent("object")).expected("object identifier"),
         Match(")").expected(),
-        ZeroOrMore(
-            AnyOf(
-                [Keyword("swapped"), UseLiteral("swapped", True)],
-                [Keyword("after"), UseLiteral("after", True)],
-            )
-        ),
+        ZeroOrMore(SignalFlag),
     )
 
     @property
@@ -55,6 +67,13 @@ class Signal(AstNode):
     def detail_name(self) -> T.Optional[str]:
         return self.tokens["detail_name"]
 
+    @property
+    def full_name(self) -> str:
+        if self.detail_name is None:
+            return self.name
+        else:
+            return self.name + "::" + self.detail_name
+
     @property
     def handler(self) -> str:
         return self.tokens["handler"]
@@ -63,13 +82,17 @@ class Signal(AstNode):
     def object_id(self) -> T.Optional[str]:
         return self.tokens["object"]
 
+    @property
+    def flags(self) -> T.List[SignalFlag]:
+        return self.children[SignalFlag]
+
     @property
     def is_swapped(self) -> bool:
-        return self.tokens["swapped"] or False
+        return any(x.flag == "swapped" for x in self.flags)
 
     @property
     def is_after(self) -> bool:
-        return self.tokens["after"] or False
+        return any(x.flag == "after" for x in self.flags)
 
     @property
     def gir_signal(self):
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index 5725041..275327a 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -38,6 +38,13 @@ class Item(AstNode):
     def value(self) -> StringValue:
         return self.children[StringValue][0]
 
+    @validate("name")
+    def unique_in_parent(self):
+        if self.name is not None:
+            self.validate_unique_in_parent(
+                f"Duplicate item '{self.name}'", lambda x: x.name == self.name
+            )
+
 
 class ExtComboBoxItems(AstNode):
     grammar = [
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index daf0679..492f19e 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -46,6 +46,13 @@ class FilterString(AstNode):
     def item(self) -> str:
         return self.tokens["name"]
 
+    @validate()
+    def unique_in_parent(self):
+        self.validate_unique_in_parent(
+            f"Duplicate {self.tokens['tag_name']} '{self.item}'",
+            check=lambda child: child.item == self.item,
+        )
+
 
 def create_node(tag_name: str, singular: str):
     return Group(
diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index cf1a415..bbb3bda 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -29,6 +29,10 @@ class ExtListItemFactory(AstNode):
             "sub-templates",
         )
 
+    @validate("template")
+    def unique_in_parent(self):
+        self.validate_unique_in_parent("Duplicate template block")
+
     @validate()
     def type_is_list_item(self):
         if self.type_name is not None:
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index b9de906..5698e12 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -69,6 +69,12 @@ class MenuAttribute(AstNode):
     def value_type(self) -> ValueTypeCtx:
         return ValueTypeCtx(None)
 
+    @validate("name")
+    def unique(self):
+        self.validate_unique_in_parent(
+            f"Duplicate attribute '{self.name}'", lambda x: x.name == self.name
+        )
+
 
 menu_child = AnyOf()
 
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index 235d92b..5ba4325 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -47,6 +47,12 @@ class Widget(AstNode):
                 f"Cannot assign {object.gir_class.full_name} to {type.full_name}"
             )
 
+    @validate("name")
+    def unique_in_parent(self):
+        self.validate_unique_in_parent(
+            f"Object '{self.name}' is listed twice", lambda x: x.name == self.name
+        )
+
 
 class ExtSizeGroupWidgets(AstNode):
     grammar = [
diff --git a/blueprintcompiler/language/gtk_styles.py b/blueprintcompiler/language/gtk_styles.py
index 798773c..6591aa5 100644
--- a/blueprintcompiler/language/gtk_styles.py
+++ b/blueprintcompiler/language/gtk_styles.py
@@ -29,6 +29,12 @@ class StyleClass(AstNode):
     def name(self) -> str:
         return self.tokens["name"]
 
+    @validate("name")
+    def unique_in_parent(self):
+        self.validate_unique_in_parent(
+            f"Duplicate style class '{self.name}'", lambda x: x.name == self.name
+        )
+
 
 class ExtStyles(AstNode):
     grammar = [
diff --git a/blueprintcompiler/language/gtkbuilder_child.py b/blueprintcompiler/language/gtkbuilder_child.py
index c3e1c47..4de13f2 100644
--- a/blueprintcompiler/language/gtkbuilder_child.py
+++ b/blueprintcompiler/language/gtkbuilder_child.py
@@ -112,6 +112,20 @@ class Child(AstNode):
         else:
             return None
 
+    @validate()
+    def internal_child_unique(self):
+        if self.annotation is not None:
+            if isinstance(self.annotation.child, ChildInternal):
+                internal_child = self.annotation.child.internal_child
+                self.validate_unique_in_parent(
+                    f"Duplicate internal child '{internal_child}'",
+                    lambda x: (
+                        x.annotation
+                        and isinstance(x.annotation.child, ChildInternal)
+                        and x.annotation.child.internal_child == internal_child
+                    ),
+                )
+
 
 @decompiler("child")
 def decompile_child(ctx, gir, type=None, internal_child=None):
diff --git a/blueprintcompiler/language/property_binding.py b/blueprintcompiler/language/property_binding.py
index 13bec61..686d1e8 100644
--- a/blueprintcompiler/language/property_binding.py
+++ b/blueprintcompiler/language/property_binding.py
@@ -44,6 +44,12 @@ class PropertyBindingFlag(AstNode):
                 actions=[CodeAction("remove 'sync-create'", "")],
             )
 
+    @validate()
+    def unique(self):
+        self.validate_unique_in_parent(
+            f"Duplicate flag '{self.flag}'", lambda x: x.flag == self.flag
+        )
+
 
 class PropertyBinding(AstNode):
     grammar = AnyOf(
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index cf88249..d0f3be5 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -229,6 +229,12 @@ class Flag(AstNode):
                 did_you_mean=(self.tokens["value"], expected_type.members.keys()),
             )
 
+    @validate()
+    def unique(self):
+        self.validate_unique_in_parent(
+            f"Duplicate flag '{self.name}'", lambda x: x.name == self.name
+        )
+
 
 class Flags(AstNode):
     grammar = [Flag, "|", Flag, ZeroOrMore(["|", Flag])]
diff --git a/tests/sample_errors/duplicate_internal_child.blp b/tests/sample_errors/duplicate_internal_child.blp
new file mode 100644
index 0000000..339ed0c
--- /dev/null
+++ b/tests/sample_errors/duplicate_internal_child.blp
@@ -0,0 +1,8 @@
+using Gtk 4.0;
+
+$MyWidget {
+  [internal-child test]
+  Button {}
+  [internal-child test]
+  Button {}
+}
\ No newline at end of file
diff --git a/tests/sample_errors/duplicate_internal_child.err b/tests/sample_errors/duplicate_internal_child.err
new file mode 100644
index 0000000..8bb16e7
--- /dev/null
+++ b/tests/sample_errors/duplicate_internal_child.err
@@ -0,0 +1 @@
+6,3,33,Duplicate internal child 'test'
\ No newline at end of file

From aa7679618e864748f4f4d8f15283906e712752fe Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 17 May 2023 10:47:52 -0500
Subject: [PATCH 135/290] Release v0.8.1

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

diff --git a/NEWS.md b/NEWS.md
index dbea36a..544b4a0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,18 @@
+# v0.8.1
+
+## Breaking Changes
+
+- Duplicates in a number of places are now considered errors. For example, duplicate flags in several places, duplicate
+  strings in Gtk.FileFilters, etc.
+
+## Fixed
+
+- Fixed a number of bugs in the XML output when using `template` to refer to the template object.
+
+## Documentation
+
+- Fixed the example for ExtListItemFactory
+
 # v0.8.0
 
 ## Breaking Changes
diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index 7db32be..f10a944 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -16,7 +16,7 @@ a module in your flatpak manifest:
        {
          "type": "git",
          "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-         "tag": "v0.8.0"
+         "tag": "v0.8.1"
        }
      ]
    }
diff --git a/meson.build b/meson.build
index b082627..0b1f48a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.8.0',
+  version: '0.8.1',
 )
 
 subdir('docs')

From 24bfe2d2252d5ff879498f3f88914372463f2074 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 22 May 2023 20:01:15 -0500
Subject: [PATCH 136/290] Mention syntax highlighters in MAINTENANCE.md

---
 MAINTENANCE.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/MAINTENANCE.md b/MAINTENANCE.md
index 3f62476..220c117 100644
--- a/MAINTENANCE.md
+++ b/MAINTENANCE.md
@@ -5,8 +5,14 @@ in the NEWS file.
 2. Update the version number, according to semver:
   - At the top of meson.build
   - In docs/flatpak.rst
-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.
+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.)
+
+## Related projects
+
+Blueprint is supported by the following syntax highlighters. If changes are made to the syntax, remember to update these projects as well.
+
+- Pygments (https://github.com/pygments/pygments/blob/master/pygments/lexers/blueprint.py)
+- GtkSourceView (https://gitlab.gnome.org/GNOME/gtksourceview/-/blob/master/data/language-specs/blueprint.lang)
\ No newline at end of file

From 93392e5e0213c7ede0e56aa9d3d9ee568b71e99a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 23 May 2023 20:27:31 -0500
Subject: [PATCH 137/290] docs: Fix Extension grammar

It was missing ExtAdwBreakpoint
---
 docs/reference/extensions.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index f7b42b1..fb5a46b 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -16,6 +16,7 @@ Properties are the main way to set values on objects, but they are limited by th
 
    Extension = :ref:`ExtAccessibility<Syntax ExtAccessibility>`
    | :ref:`ExtAdwMessageDialog<Syntax ExtAdwMessageDialog>`
+   | :ref:`ExtAdwBreakpoint<Syntax ExtAdwBreakpoint>`
    | :ref:`ExtComboBoxItems<Syntax ExtComboBoxItems>`
    | :ref:`ExtFileFilterMimeTypes<Syntax ExtFileFilter>`
    | :ref:`ExtFileFilterPatterns<Syntax ExtFileFilter>`

From 9c567fe0392b2734bac591aad623185131985c19 Mon Sep 17 00:00:00 2001
From: seshotake <seshotake@gmail.com>
Date: Mon, 5 Jun 2023 05:15:51 +0300
Subject: [PATCH 138/290] lsp: Make SemanticTokenServerCapabilities match the
 LSP spec

SemanticTokenSeverCapabilities doesn't deserealize because legend requires a tokenModifiers array, which not provided.
See: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#semanticTokensLegend
---
 blueprintcompiler/lsp.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index b44d631..5f6b5a2 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -194,6 +194,7 @@ class LanguageServer:
                     "semanticTokensProvider": {
                         "legend": {
                             "tokenTypes": ["enumMember"],
+                            "tokenModifiers": [],
                         },
                         "full": True,
                     },

From 4e02c34a5bc68f4260d71adfa23501d75211a129 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 13 Jun 2023 17:39:59 -0500
Subject: [PATCH 139/290] Minor performance optimizations

---
 blueprintcompiler/gir.py         | 24 +++++++++++++++---------
 blueprintcompiler/language/ui.py |  4 +++-
 blueprintcompiler/typelib.py     |  4 +---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index e85190b..b289b5e 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -638,29 +638,35 @@ class Namespace(GirNode):
     def __init__(self, repo: "Repository", tl: typelib.Typelib) -> None:
         super().__init__(repo, tl)
 
-        self.entries: T.Dict[str, GirType] = {}
+    @cached_property
+    def entries(self) -> T.Mapping[str, GirType]:
+        entries: dict[str, GirType] = {}
+
+        n_local_entries: int = self.tl.HEADER_N_ENTRIES
+        directory: typelib.Typelib = self.tl.HEADER_DIRECTORY
+        blob_size: int = self.tl.header.HEADER_ENTRY_BLOB_SIZE
 
-        n_local_entries: int = tl.HEADER_N_ENTRIES
-        directory: typelib.Typelib = tl.HEADER_DIRECTORY
         for i in range(n_local_entries):
-            entry = directory[i * tl.HEADER_ENTRY_BLOB_SIZE]
+            entry = directory[i * blob_size]
             entry_name: str = entry.DIR_ENTRY_NAME
             entry_type: int = entry.DIR_ENTRY_BLOB_TYPE
             entry_blob: typelib.Typelib = entry.DIR_ENTRY_OFFSET
 
             if entry_type == typelib.BLOB_TYPE_ENUM:
-                self.entries[entry_name] = Enumeration(self, entry_blob)
+                entries[entry_name] = Enumeration(self, entry_blob)
             elif entry_type == typelib.BLOB_TYPE_FLAGS:
-                self.entries[entry_name] = Bitfield(self, entry_blob)
+                entries[entry_name] = Bitfield(self, entry_blob)
             elif entry_type == typelib.BLOB_TYPE_OBJECT:
-                self.entries[entry_name] = Class(self, entry_blob)
+                entries[entry_name] = Class(self, entry_blob)
             elif entry_type == typelib.BLOB_TYPE_INTERFACE:
-                self.entries[entry_name] = Interface(self, entry_blob)
+                entries[entry_name] = Interface(self, entry_blob)
             elif (
                 entry_type == typelib.BLOB_TYPE_BOXED
                 or entry_type == typelib.BLOB_TYPE_STRUCT
             ):
-                self.entries[entry_name] = Boxed(self, entry_blob)
+                entries[entry_name] = Boxed(self, entry_blob)
+
+        return entries
 
     @cached_property
     def xml(self):
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index 033e2ca..533d21b 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+from functools import cached_property
+
 from .. import gir
 from .imports import GtkDirective, Import
 from .gtkbuilder_template import Template
@@ -42,7 +44,7 @@ class UI(AstNode):
         ),
     ]
 
-    @property
+    @cached_property
     def gir(self) -> gir.GirContext:
         gir_ctx = gir.GirContext()
         self._gir_errors = []
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index 6babc10..54ee341 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -237,9 +237,7 @@ class Typelib:
         if loc == 0:
             return None
 
-        end = loc
-        while self._typelib_file[end] != 0:
-            end += 1
+        end = self._typelib_file.find(b"\0", loc)
         return self._typelib_file[loc:end].decode("utf-8")
 
     def _int(self, size, signed) -> int:

From f526cfa4d92a02be1eeb539076e22b06bc9ab887 Mon Sep 17 00:00:00 2001
From: AkshayWarrier <aksmen121@gmail.com>
Date: Mon, 12 Jun 2023 22:23:30 +0530
Subject: [PATCH 140/290] lsp: Decompile empty XML docs to empty strings

---
 blueprintcompiler/lsp.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 5f6b5a2..58d6fac 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -292,16 +292,19 @@ class LanguageServer:
     def decompile(self, id, params):
         text = params.get("text")
         blp = None
-
-        try:
-            blp = decompiler.decompile_string(text)
-        except decompiler.UnsupportedError as e:
-            self._send_error(id, ErrorCode.RequestFailed, e.message)
-            return
-        except:
-            printerr(traceback.format_exc())
-            self._send_error(id, ErrorCode.RequestFailed, "Invalid input")
-            return
+        if text.strip() == "":
+            blp = ""
+            printerr("Decompiled to empty blueprint because input was empty")
+        else:
+            try:
+                blp = decompiler.decompile_string(text)
+            except decompiler.UnsupportedError as e:
+                self._send_error(id, ErrorCode.RequestFailed, e.message)
+                return
+            except:
+                printerr(traceback.format_exc())
+                self._send_error(id, ErrorCode.RequestFailed, "Invalid input")
+                return
 
         self._send_response(id, {"blp": blp})
 

From 3730e2e726b514c738aea472eb3849d5a8607bb3 Mon Sep 17 00:00:00 2001
From: gregorni <gregorniehl@web.de>
Date: Sun, 9 Jul 2023 14:26:37 +0000
Subject: [PATCH 141/290] Add isort to CI and run on files

---
 .gitlab-ci.yml                                |  1 +
 blueprint-compiler.py                         |  3 +-
 blueprintcompiler/ast_utils.py                |  2 +-
 blueprintcompiler/completions.py              |  4 +--
 blueprintcompiler/completions_utils.py        |  3 +-
 blueprintcompiler/decompiler.py               |  5 ++-
 blueprintcompiler/errors.py                   |  6 ++--
 blueprintcompiler/gir.py                      |  7 +++--
 blueprintcompiler/interactive_port.py         |  7 ++---
 blueprintcompiler/language/__init__.py        | 23 +++++++-------
 .../language/adw_message_dialog.py            |  2 +-
 blueprintcompiler/language/binding.py         |  2 +-
 blueprintcompiler/language/common.py          | 31 +++++++++----------
 blueprintcompiler/language/contexts.py        |  2 +-
 blueprintcompiler/language/expression.py      |  3 +-
 blueprintcompiler/language/gobject_object.py  |  1 -
 .../language/gobject_property.py              |  6 ++--
 blueprintcompiler/language/gobject_signal.py  |  4 +--
 blueprintcompiler/language/gtk_a11y.py        |  6 ++--
 .../language/gtk_combo_box_text.py            |  2 +-
 blueprintcompiler/language/gtk_file_filter.py |  2 +-
 blueprintcompiler/language/gtk_layout.py      |  2 +-
 .../language/gtk_list_item_factory.py         |  6 ++--
 blueprintcompiler/language/gtk_scale.py       |  2 +-
 blueprintcompiler/language/gtk_size_group.py  |  2 +-
 blueprintcompiler/language/gtk_string_list.py |  2 +-
 blueprintcompiler/language/gtk_styles.py      |  2 +-
 .../language/gtkbuilder_child.py              |  2 +-
 .../language/gtkbuilder_template.py           |  4 +--
 blueprintcompiler/language/types.py           |  2 +-
 blueprintcompiler/language/ui.py              |  8 ++---
 blueprintcompiler/language/values.py          |  4 +--
 blueprintcompiler/lsp.py                      |  8 +++--
 blueprintcompiler/lsp_utils.py                |  2 +-
 blueprintcompiler/main.py                     | 11 ++++---
 blueprintcompiler/outputs/xml/__init__.py     |  2 +-
 blueprintcompiler/outputs/xml/xml_emitter.py  |  1 -
 blueprintcompiler/parse_tree.py               |  8 ++---
 blueprintcompiler/parser.py                   |  2 +-
 blueprintcompiler/tokenizer.py                |  2 +-
 blueprintcompiler/typelib.py                  |  6 ++--
 blueprintcompiler/xml_reader.py               |  3 +-
 build-aux/Dockerfile                          |  2 +-
 tests/fuzz.py                                 | 11 ++++---
 tests/test_samples.py                         |  9 +++---
 45 files changed, 112 insertions(+), 113 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93ef254..7e9ee9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ build:
   stage: build
   script:
     - black --check --diff blueprintcompiler tests
+    - isort --check --diff --profile black blueprintcompiler tests
     - mypy --python-version=3.9 blueprintcompiler
     - G_DEBUG=fatal-warnings xvfb-run coverage run -m unittest
     - coverage report
diff --git a/blueprint-compiler.py b/blueprint-compiler.py
index 61eae79..0c5c3fd 100755
--- a/blueprint-compiler.py
+++ b/blueprint-compiler.py
@@ -19,7 +19,8 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-import os, sys
+import os
+import sys
 
 # These variables should be set by meson. If they aren't, we're running
 # uninstalled, and we might have to guess some values.
diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 13f6eb1..7eebe45 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -17,9 +17,9 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+import typing as T
 from collections import ChainMap, defaultdict
 from functools import cached_property
-import typing as T
 
 from .errors import *
 from .lsp_utils import SemanticToken
diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index fc6eeee..b189bf1 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -20,12 +20,12 @@
 import typing as T
 
 from . import gir, language
-from .language.types import ClassName
 from .ast_utils import AstNode
 from .completions_utils import *
+from .language.types import ClassName
 from .lsp_utils import Completion, CompletionItemKind
 from .parser import SKIP_TOKENS
-from .tokenizer import TokenType, Token
+from .tokenizer import Token, TokenType
 
 Pattern = T.List[T.Tuple[TokenType, T.Optional[str]]]
 
diff --git a/blueprintcompiler/completions_utils.py b/blueprintcompiler/completions_utils.py
index 094e449..2aae874 100644
--- a/blueprintcompiler/completions_utils.py
+++ b/blueprintcompiler/completions_utils.py
@@ -20,9 +20,8 @@
 
 import typing as T
 
-from .tokenizer import Token, TokenType
 from .lsp_utils import Completion
-
+from .tokenizer import Token, TokenType
 
 new_statement_patterns = [
     [(TokenType.PUNCTUATION, "{")],
diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index d3bf773..98e00af 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -18,14 +18,13 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 import re
-from enum import Enum
 import typing as T
 from dataclasses import dataclass
+from enum import Enum
 
-from .xml_reader import Element, parse, parse_string
 from .gir import *
 from .utils import Colors
-
+from .xml_reader import Element, parse, parse_string
 
 __all__ = ["decompile"]
 
diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 3fc2666..2a14040 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -17,9 +17,11 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-from dataclasses import dataclass
+import sys
+import traceback
 import typing as T
-import sys, traceback
+from dataclasses import dataclass
+
 from . import utils
 from .utils import Colors
 
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index b289b5e..2986447 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -17,17 +17,18 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-from functools import cached_property
+import os
+import sys
 import typing as T
-import os, sys
+from functools import cached_property
 
 import gi  # type: ignore
 
 gi.require_version("GIRepository", "2.0")
 from gi.repository import GIRepository  # type: ignore
 
-from .errors import CompileError, CompilerBugError
 from . import typelib, xml_reader
+from .errors import CompileError, CompilerBugError
 
 _namespace_cache: T.Dict[str, "Namespace"] = {}
 _xml_cache = {}
diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index 1286f0b..43bb03f 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -18,16 +18,15 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-import typing as T
 import difflib
 import os
+import typing as T
 
-from . import decompiler, tokenizer, parser
+from . import decompiler, parser, tokenizer
+from .errors import CompilerBugError, MultipleErrors, PrintableError
 from .outputs.xml import XmlOutput
-from .errors import MultipleErrors, PrintableError, CompilerBugError
 from .utils import Colors
 
-
 # A tool to interactively port projects to blueprints.
 
 
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index d785e56..f849c75 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -1,12 +1,12 @@
-from .gtk_list_item_factory import ExtListItemFactory
+from .adw_breakpoint import (
+    AdwBreakpointCondition,
+    AdwBreakpointSetter,
+    AdwBreakpointSetters,
+)
 from .adw_message_dialog import ExtAdwMessageDialog
 from .attributes import BaseAttribute
-from .adw_breakpoint import (
-    AdwBreakpointSetters,
-    AdwBreakpointSetter,
-    AdwBreakpointCondition,
-)
 from .binding import Binding
+from .common import *
 from .contexts import ScopeCtx, ValueTypeCtx
 from .expression import (
     CastExpr,
@@ -23,23 +23,24 @@ from .gobject_signal import Signal
 from .gtk_a11y import ExtAccessibility
 from .gtk_combo_box_text import ExtComboBoxItems
 from .gtk_file_filter import (
+    Filters,
     ext_file_filter_mime_types,
     ext_file_filter_patterns,
     ext_file_filter_suffixes,
-    Filters,
 )
 from .gtk_layout import ExtLayout
-from .gtk_menu import menu, Menu, MenuAttribute
+from .gtk_list_item_factory import ExtListItemFactory
+from .gtk_menu import Menu, MenuAttribute, menu
 from .gtk_scale import ExtScaleMarks
 from .gtk_size_group import ExtSizeGroupWidgets
 from .gtk_string_list import ExtStringListStrings
 from .gtk_styles import ExtStyles
-from .gtkbuilder_child import Child, ChildType, ChildInternal, ChildExtension
+from .gtkbuilder_child import Child, ChildExtension, ChildInternal, ChildType
 from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
 from .property_binding import PropertyBinding
-from .ui import UI
 from .types import ClassName
+from .ui import UI
 from .values import (
     Flag,
     Flags,
@@ -54,8 +55,6 @@ from .values import (
     Value,
 )
 
-from .common import *
-
 OBJECT_CONTENT_HOOKS.children = [
     Signal,
     Property,
diff --git a/blueprintcompiler/language/adw_message_dialog.py b/blueprintcompiler/language/adw_message_dialog.py
index 2823f77..98c40cd 100644
--- a/blueprintcompiler/language/adw_message_dialog.py
+++ b/blueprintcompiler/language/adw_message_dialog.py
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from ..decompiler import truthy, decompile_translatable
+from ..decompiler import decompile_translatable, truthy
 from .common import *
 from .contexts import ValueTypeCtx
 from .gobject_object import ObjectContent, validate_parent_type
diff --git a/blueprintcompiler/language/binding.py b/blueprintcompiler/language/binding.py
index b13d5da..e6bffd0 100644
--- a/blueprintcompiler/language/binding.py
+++ b/blueprintcompiler/language/binding.py
@@ -20,7 +20,7 @@
 from dataclasses import dataclass
 
 from .common import *
-from .expression import Expression, LookupOp, LiteralExpr
+from .expression import Expression, LiteralExpr, LookupOp
 
 
 class Binding(AstNode):
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index 9938bec..f1c6bb9 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -18,36 +18,35 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .. import gir
-from ..ast_utils import AstNode, validate, docs, context
-from ..errors import (
-    CompileError,
-    MultipleErrors,
-    UpgradeWarning,
-    CompileWarning,
-    CodeAction,
-)
-from ..completions_utils import *
 from .. import decompiler as decompile
+from .. import gir
+from ..ast_utils import AstNode, context, docs, validate
+from ..completions_utils import *
 from ..decompiler import (
     DecompileCtx,
+    decompile_translatable,
     decompiler,
     escape_quote,
     truthy,
-    decompile_translatable,
+)
+from ..errors import (
+    CodeAction,
+    CompileError,
+    CompileWarning,
+    MultipleErrors,
+    UpgradeWarning,
 )
 from ..gir import (
-    StringType,
     BoolType,
-    IntType,
-    FloatType,
-    GirType,
     Enumeration,
     ExternType,
+    FloatType,
+    GirType,
+    IntType,
+    StringType,
 )
 from ..lsp_utils import Completion, CompletionItemKind, SemanticToken, SemanticTokenType
 from ..parse_tree import *
 
-
 OBJECT_CONTENT_HOOKS = AnyOf()
 LITERAL = AnyOf()
diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
index 29d95de..fb24f5a 100644
--- a/blueprintcompiler/language/contexts.py
+++ b/blueprintcompiler/language/contexts.py
@@ -38,8 +38,8 @@ class ScopeCtx:
 
     @cached_property
     def template(self):
-        from .ui import UI
         from .gtk_list_item_factory import ExtListItemFactory
+        from .ui import UI
 
         if isinstance(self.node, UI):
             return self.node.template
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index 314c753..a2185a3 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -20,9 +20,8 @@
 
 from .common import *
 from .contexts import ScopeCtx, ValueTypeCtx
-from .types import TypeName
 from .gtkbuilder_template import Template
-
+from .types import TypeName
 
 expr = Sequence()
 
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 183ad8e..d247c61 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -25,7 +25,6 @@ from .common import *
 from .response_id import ExtResponse
 from .types import ClassName, ConcreteClassName
 
-
 RESERVED_IDS = {"this", "self", "template", "true", "false", "null", "none"}
 
 
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 09873bc..f65c5ca 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -18,12 +18,12 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .gtkbuilder_template import Template
-from .values import Value, ObjectValue
+from .binding import Binding
 from .common import *
 from .contexts import ValueTypeCtx
+from .gtkbuilder_template import Template
 from .property_binding import PropertyBinding
-from .binding import Binding
+from .values import ObjectValue, Value
 
 
 class Property(AstNode):
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index f08168f..2fc4699 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -19,9 +19,9 @@
 
 import typing as T
 
-from .gtkbuilder_template import Template
-from .contexts import ScopeCtx
 from .common import *
+from .contexts import ScopeCtx
+from .gtkbuilder_template import Template
 
 
 class SignalFlag(AstNode):
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index c378927..f7f89d6 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -17,12 +17,12 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-from .gobject_object import ObjectContent, validate_parent_type
+from ..decompiler import escape_quote
 from .attributes import BaseAttribute
-from .values import Value
 from .common import *
 from .contexts import ValueTypeCtx
-from ..decompiler import escape_quote
+from .gobject_object import ObjectContent, validate_parent_type
+from .values import Value
 
 
 def get_property_types(gir):
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index 275327a..e6c804e 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -18,9 +18,9 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .gobject_object import ObjectContent, validate_parent_type
 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_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 492f19e..53cd102 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -18,8 +18,8 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
+from .gobject_object import ObjectContent, validate_parent_type
 
 
 class Filters(AstNode):
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index cceb6c6..7632c7a 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -18,9 +18,9 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
 from .contexts import ValueTypeCtx
+from .gobject_object import ObjectContent, validate_parent_type
 from .values import Value
 
 
diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index bbb3bda..f2f9d63 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -1,9 +1,9 @@
-from .gobject_object import ObjectContent, validate_parent_type
-from ..parse_tree import Keyword
 from ..ast_utils import AstNode, validate
+from ..parse_tree import Keyword
 from .common import *
-from .types import TypeName
 from .contexts import ScopeCtx
+from .gobject_object import ObjectContent, validate_parent_type
+from .types import TypeName
 
 
 class ExtListItemFactory(AstNode):
diff --git a/blueprintcompiler/language/gtk_scale.py b/blueprintcompiler/language/gtk_scale.py
index a81e03d..18452e1 100644
--- a/blueprintcompiler/language/gtk_scale.py
+++ b/blueprintcompiler/language/gtk_scale.py
@@ -17,8 +17,8 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-from .gobject_object import validate_parent_type, ObjectContent
 from .common import *
+from .gobject_object import ObjectContent, validate_parent_type
 from .values import StringValue
 
 
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index 5ba4325..2a10a35 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -18,9 +18,9 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
 from .contexts import ScopeCtx
+from .gobject_object import ObjectContent, validate_parent_type
 
 
 class Widget(AstNode):
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index 78d9c67..455960e 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -18,9 +18,9 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
+from .common import *
 from .gobject_object import ObjectContent, validate_parent_type
 from .values import StringValue
-from .common import *
 
 
 class Item(AstNode):
diff --git a/blueprintcompiler/language/gtk_styles.py b/blueprintcompiler/language/gtk_styles.py
index 6591aa5..8152b82 100644
--- a/blueprintcompiler/language/gtk_styles.py
+++ b/blueprintcompiler/language/gtk_styles.py
@@ -18,8 +18,8 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .gobject_object import ObjectContent, validate_parent_type
 from .common import *
+from .gobject_object import ObjectContent, validate_parent_type
 
 
 class StyleClass(AstNode):
diff --git a/blueprintcompiler/language/gtkbuilder_child.py b/blueprintcompiler/language/gtkbuilder_child.py
index 4de13f2..52c8ad4 100644
--- a/blueprintcompiler/language/gtkbuilder_child.py
+++ b/blueprintcompiler/language/gtkbuilder_child.py
@@ -20,9 +20,9 @@
 
 from functools import cached_property
 
+from .common import *
 from .gobject_object import Object
 from .response_id import ExtResponse
-from .common import *
 
 ALLOWED_PARENTS: T.List[T.Tuple[str, str]] = [
     ("Gtk", "Buildable"),
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 149152a..9de4d66 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -21,9 +21,9 @@ import typing as T
 
 from blueprintcompiler.language.common import GirType
 
-from .gobject_object import Object, ObjectContent
-from .common import *
 from ..gir import TemplateType
+from .common import *
+from .gobject_object import Object, ObjectContent
 from .types import ClassName, TemplateClassName
 
 
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index dbce44f..e75ebdc 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -18,8 +18,8 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from .common import *
 from ..gir import Class, ExternType, Interface
+from .common import *
 
 
 class TypeName(AstNode):
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index 533d21b..1b7e6e9 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -20,12 +20,12 @@
 from functools import cached_property
 
 from .. import gir
-from .imports import GtkDirective, Import
-from .gtkbuilder_template import Template
-from .gobject_object import Object
-from .gtk_menu import menu, Menu
 from .common import *
 from .contexts import ScopeCtx
+from .gobject_object import Object
+from .gtk_menu import Menu, menu
+from .gtkbuilder_template import Template
+from .imports import GtkDirective, Import
 
 
 class UI(AstNode):
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index d0f3be5..6981141 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -20,9 +20,9 @@
 import typing as T
 
 from .common import *
-from .types import TypeName
-from .gobject_object import Object
 from .contexts import ScopeCtx, ValueTypeCtx
+from .gobject_object import Object
+from .types import TypeName
 
 
 class Translated(AstNode):
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 58d6fac..e8c37f3 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -18,14 +18,16 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
+import json
+import sys
+import traceback
 import typing as T
-import json, sys, traceback
 
+from . import decompiler, parser, tokenizer, utils, xml_reader
 from .completions import complete
-from .errors import PrintableError, CompileError, MultipleErrors
+from .errors import CompileError, MultipleErrors, PrintableError
 from .lsp_utils import *
 from .outputs.xml import XmlOutput
-from . import tokenizer, parser, utils, xml_reader, decompiler
 
 
 def printerr(*args, **kwargs):
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 219cade..7f46680 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -18,9 +18,9 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-from dataclasses import dataclass
 import enum
 import typing as T
+from dataclasses import dataclass
 
 from .errors import *
 from .utils import *
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 6ac7a11..db9fb65 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -18,15 +18,18 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
+import argparse
+import json
+import os
+import sys
 import typing as T
-import argparse, json, os, sys
 
-from .errors import PrintableError, report_bug, MultipleErrors, CompilerBugError
+from . import decompiler, interactive_port, parser, tokenizer
+from .errors import CompilerBugError, MultipleErrors, PrintableError, report_bug
 from .gir import add_typelib_search_path
 from .lsp import LanguageServer
-from . import parser, tokenizer, decompiler, interactive_port
-from .utils import Colors
 from .outputs import XmlOutput
+from .utils import Colors
 
 VERSION = "uninstalled"
 LIBDIR = None
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 7d450d1..3ef7375 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -1,7 +1,7 @@
 import typing as T
 
-from .. import OutputFormat
 from ...language import *
+from .. import OutputFormat
 from .xml_emitter import XmlEmitter
 
 
diff --git a/blueprintcompiler/outputs/xml/xml_emitter.py b/blueprintcompiler/outputs/xml/xml_emitter.py
index 3dd09a0..44013da 100644
--- a/blueprintcompiler/outputs/xml/xml_emitter.py
+++ b/blueprintcompiler/outputs/xml/xml_emitter.py
@@ -18,7 +18,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 import typing as T
-
 from xml.sax import saxutils
 
 from blueprintcompiler.gir import GirType
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index ff080ea..48f60b1 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -20,21 +20,19 @@
 """ Utilities for parsing an AST from a token stream. """
 
 import typing as T
-
 from collections import defaultdict
 from enum import Enum
-from .ast_utils import AstNode
 
+from .ast_utils import AstNode
 from .errors import (
-    assert_true,
-    CompilerBugError,
     CompileError,
+    CompilerBugError,
     CompileWarning,
     UnexpectedTokenError,
+    assert_true,
 )
 from .tokenizer import Token, TokenType
 
-
 SKIP_TOKENS = [TokenType.COMMENT, TokenType.WHITESPACE]
 
 
diff --git a/blueprintcompiler/parser.py b/blueprintcompiler/parser.py
index edef840..8b50de5 100644
--- a/blueprintcompiler/parser.py
+++ b/blueprintcompiler/parser.py
@@ -19,9 +19,9 @@
 
 
 from .errors import MultipleErrors, PrintableError
+from .language import OBJECT_CONTENT_HOOKS, UI, Template
 from .parse_tree import *
 from .tokenizer import TokenType
-from .language import OBJECT_CONTENT_HOOKS, Template, UI
 
 
 def parse(
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index f68f5a7..3c98b94 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -18,8 +18,8 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-import typing as T
 import re
+import typing as T
 from enum import Enum
 
 from .errors import CompileError, CompilerBugError
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index 54ee341..8de06c5 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -17,15 +17,15 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
+import math
+import mmap
+import os
 import sys
 import typing as T
-import math
 from ctypes import *
-import mmap, os
 
 from .errors import CompilerBugError
 
-
 BLOB_TYPE_STRUCT = 3
 BLOB_TYPE_BOXED = 4
 BLOB_TYPE_ENUM = 5
diff --git a/blueprintcompiler/xml_reader.py b/blueprintcompiler/xml_reader.py
index b2d579b..a3c0e3e 100644
--- a/blueprintcompiler/xml_reader.py
+++ b/blueprintcompiler/xml_reader.py
@@ -18,12 +18,11 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
+import typing as T
 from collections import defaultdict
 from functools import cached_property
-import typing as T
 from xml import sax
 
-
 # To speed up parsing, we ignore all tags except these
 PARSE_GIR = set(
     [
diff --git a/build-aux/Dockerfile b/build-aux/Dockerfile
index b060765..aa26f43 100644
--- a/build-aux/Dockerfile
+++ b/build-aux/Dockerfile
@@ -4,7 +4,7 @@ RUN dnf install -y meson gcc g++ python3-pip gobject-introspection-devel \
 	python3-devel python3-gobject git diffutils xorg-x11-server-Xvfb \
     appstream-devel "dnf-command(builddep)"
 RUN dnf build-dep -y gtk4 libadwaita
-RUN pip3 install furo mypy sphinx coverage black
+RUN pip3 install furo mypy sphinx coverage black isort
 
 COPY install_deps.sh .
 RUN ./install_deps.sh
diff --git a/tests/fuzz.py b/tests/fuzz.py
index ad1c764..81a9058 100644
--- a/tests/fuzz.py
+++ b/tests/fuzz.py
@@ -1,20 +1,21 @@
-import os, sys
+import os
+import sys
+
 from pythonfuzz.main import PythonFuzz
 
 from blueprintcompiler.outputs.xml import XmlOutput
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
-from blueprintcompiler import tokenizer, parser, decompiler, gir
+from blueprintcompiler import decompiler, gir, parser, tokenizer, utils
 from blueprintcompiler.completions import complete
 from blueprintcompiler.errors import (
-    PrintableError,
-    MultipleErrors,
     CompileError,
     CompilerBugError,
+    MultipleErrors,
+    PrintableError,
 )
 from blueprintcompiler.tokenizer import Token, TokenType, tokenize
-from blueprintcompiler import utils
 
 
 @PythonFuzz
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 30a41aa..7fe7941 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -19,20 +19,19 @@
 
 
 import difflib  # I love Python
-from pathlib import Path
 import unittest
+from pathlib import Path
 
 import gi
 
 gi.require_version("Gtk", "4.0")
 from gi.repository import Gtk
 
-from blueprintcompiler import tokenizer, parser, decompiler
+from blueprintcompiler import decompiler, parser, tokenizer, utils
 from blueprintcompiler.completions import complete
-from blueprintcompiler.errors import PrintableError, MultipleErrors, CompileError
-from blueprintcompiler.tokenizer import Token, TokenType, tokenize
-from blueprintcompiler import utils
+from blueprintcompiler.errors import CompileError, MultipleErrors, PrintableError
 from blueprintcompiler.outputs.xml import XmlOutput
+from blueprintcompiler.tokenizer import Token, TokenType, tokenize
 
 
 class TestSamples(unittest.TestCase):

From 3d79f9560c82b5060f9303b1b1893c0b115b18c7 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 15 Jul 2023 17:34:04 -0500
Subject: [PATCH 142/290] ci: Fix Dockerfile

---
 build-aux/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-aux/Dockerfile b/build-aux/Dockerfile
index aa26f43..d7093ff 100644
--- a/build-aux/Dockerfile
+++ b/build-aux/Dockerfile
@@ -2,7 +2,7 @@ FROM fedora:latest
 
 RUN dnf install -y meson gcc g++ python3-pip gobject-introspection-devel \
 	python3-devel python3-gobject git diffutils xorg-x11-server-Xvfb \
-    appstream-devel "dnf-command(builddep)"
+	appstream-devel dbus-x11 "dnf-command(builddep)"
 RUN dnf build-dep -y gtk4 libadwaita
 RUN pip3 install furo mypy sphinx coverage black isort
 

From 4eaf735732561e4fbcc0739669d47a62e77a6fed Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 6 Jul 2023 20:13:49 -0500
Subject: [PATCH 143/290] gir: Fix signatures for properties and signals

Add arguments to signal signatures and fix property signatures
---
 blueprintcompiler/gir.py     | 49 ++++++++++++++++++++++++++++--------
 blueprintcompiler/typelib.py | 13 ++++++++++
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 2986447..6e37626 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -318,7 +318,7 @@ class Property(GirNode):
 
     @cached_property
     def signature(self):
-        return f"{self.full_name} {self.container.name}.{self.name}"
+        return f"{self.type.full_name} {self.container.name}:{self.name}"
 
     @property
     def writable(self) -> bool:
@@ -329,27 +329,56 @@ class Property(GirNode):
         return self.tl.PROP_CONSTRUCT_ONLY == 1
 
 
-class Parameter(GirNode):
+class Argument(GirNode):
     def __init__(self, container: GirNode, tl: typelib.Typelib) -> None:
         super().__init__(container, tl)
 
+    @cached_property
+    def name(self) -> str:
+        return self.tl.ARG_NAME
+
+    @cached_property
+    def type(self) -> GirType:
+        return self.get_containing(Repository)._resolve_type_id(self.tl.ARG_TYPE)
+
+
+class Signature(GirNode):
+    def __init__(self, container: GirNode, tl: typelib.Typelib) -> None:
+        super().__init__(container, tl)
+
+    @cached_property
+    def args(self) -> T.List[Argument]:
+        n_arguments = self.tl.SIGNATURE_N_ARGUMENTS
+        blob_size = self.tl.header.HEADER_ARG_BLOB_SIZE
+        result = []
+        for i in range(n_arguments):
+            entry = self.tl.SIGNATURE_ARGUMENTS[i * blob_size]
+            result.append(Argument(self, entry))
+        return result
+
+    @cached_property
+    def return_type(self) -> GirType:
+        return self.get_containing(Repository)._resolve_type_id(
+            self.tl.SIGNATURE_RETURN_TYPE
+        )
+
 
 class Signal(GirNode):
     def __init__(
         self, klass: T.Union["Class", "Interface"], tl: typelib.Typelib
     ) -> None:
         super().__init__(klass, tl)
-        # if parameters := xml.get_elements('parameters'):
-        #     self.params = [Parameter(self, child) for child in parameters[0].get_elements('parameter')]
-        # else:
-        #     self.params = []
+
+    @cached_property
+    def gir_signature(self) -> Signature:
+        return Signature(self, self.tl.SIGNAL_SIGNATURE)
 
     @property
     def signature(self):
-        # TODO: fix
-        # args = ", ".join([f"{p.type_name} {p.name}" for p in self.params])
-        args = ""
-        return f"signal {self.container.name}.{self.name} ({args})"
+        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})"
 
 
 class Interface(GirNode, GirType):
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index 8de06c5..2ce3e32 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -118,6 +118,7 @@ class Typelib:
     HEADER_FUNCTION_BLOB_SIZE = Field(0x3E, "u16")
     HEADER_CALLBACK_BLOB_SIZE = Field(0x40, "u16")
     HEADER_SIGNAL_BLOB_SIZE = Field(0x42, "u16")
+    HEADER_ARG_BLOB_SIZE = Field(0x46, "u16")
     HEADER_PROPERTY_BLOB_SIZE = Field(0x48, "u16")
     HEADER_FIELD_BLOB_SIZE = Field(0x4A, "u16")
     HEADER_VALUE_BLOB_SIZE = Field(0x4C, "u16")
@@ -132,6 +133,13 @@ class Typelib:
     DIR_ENTRY_OFFSET = Field(0x8, "pointer")
     DIR_ENTRY_NAMESPACE = Field(0x8, "string")
 
+    ARG_NAME = Field(0x0, "string")
+    ARG_TYPE = Field(0xC, "u32")
+
+    SIGNATURE_RETURN_TYPE = Field(0x0, "u32")
+    SIGNATURE_N_ARGUMENTS = Field(0x6, "u16")
+    SIGNATURE_ARGUMENTS = Field(0x8, "offset")
+
     ATTR_OFFSET = Field(0x0, "u32")
     ATTR_NAME = Field(0x0, "string")
     ATTR_VALUE = Field(0x0, "string")
@@ -180,6 +188,11 @@ class Typelib:
     PROP_CONSTRUCT_ONLY = Field(0x4, "u32", 4, 1)
     PROP_TYPE = Field(0xC, "u32")
 
+    SIGNAL_DEPRECATED = Field(0x0, "u16", 0, 1)
+    SIGNAL_DETAILED = Field(0x0, "u16", 5, 1)
+    SIGNAL_NAME = Field(0x4, "string")
+    SIGNAL_SIGNATURE = Field(0xC, "pointer")
+
     VALUE_NAME = Field(0x4, "string")
     VALUE_VALUE = Field(0x8, "i32")
 

From e1b7410e51926882d87e0abc53ec3450bc74d916 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 6 Jul 2023 20:40:56 -0500
Subject: [PATCH 144/290] docs: Add link to online documentation

---
 blueprintcompiler/gir.py | 74 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 6e37626..816b58b 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -92,6 +92,23 @@ def get_xml(namespace: str, version: str):
     return _xml_cache[filename]
 
 
+ONLINE_DOCS = {
+    "Adw-1": "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1-latest/",
+    "Gdk-4.0": "https://docs.gtk.org/gdk4/",
+    "GdkPixbuf-2.0": "https://docs.gtk.org/gdk-pixbuf/",
+    "Gio-2.0": "https://docs.gtk.org/gio/",
+    "GLib-2.0": "https://docs.gtk.org/glib/",
+    "GModule-2.0": "https://docs.gtk.org/gmodule/",
+    "GObject-2.0": "https://docs.gtk.org/gobject/",
+    "Gsk-4.0": "https://docs.gtk.org/gsk4/",
+    "Gtk-4.0": "https://docs.gtk.org/gtk4/",
+    "GtkSource-5": "https://gnome.pages.gitlab.gnome.org/gtksourceview/gtksourceview5",
+    "Pango-1.0": "https://docs.gtk.org/Pango/",
+    "Shumate-1.0": "https://gnome.pages.gitlab.gnome.org/libshumate/",
+    "WebKit2-4.1": "https://webkitgtk.org/reference/webkit2gtk/stable/",
+}
+
+
 class GirType:
     @property
     def doc(self) -> T.Optional[str]:
@@ -291,10 +308,17 @@ class GirNode:
         except:
             # Not a huge deal, but if you want docs in the language server you
             # should ensure .gir files are installed
-            pass
+            sections.append("Documentation is not installed")
+
+        if self.online_docs:
+            sections.append(f"[Online documentation]({self.online_docs})")
 
         return "\n\n---\n\n".join(sections)
 
+    @property
+    def online_docs(self) -> T.Optional[str]:
+        return None
+
     @property
     def signature(self) -> T.Optional[str]:
         return None
@@ -328,6 +352,14 @@ class Property(GirNode):
     def construct_only(self) -> bool:
         return self.tl.PROP_CONSTRUCT_ONLY == 1
 
+    @property
+    def online_docs(self) -> T.Optional[str]:
+        if ns := self.get_containing(Namespace).online_docs:
+            assert self.container is not None
+            return f"{ns}property.{self.container.name}.{self.name}.html"
+        else:
+            return None
+
 
 class Argument(GirNode):
     def __init__(self, container: GirNode, tl: typelib.Typelib) -> None:
@@ -380,6 +412,14 @@ class Signal(GirNode):
         )
         return f"signal {self.container.full_name}::{self.name} ({args})"
 
+    @property
+    def online_docs(self) -> T.Optional[str]:
+        if ns := self.get_containing(Namespace).online_docs:
+            assert self.container is not None
+            return f"{ns}signal.{self.container.name}.{self.name}.html"
+        else:
+            return None
+
 
 class Interface(GirNode, GirType):
     def __init__(self, ns: "Namespace", tl: typelib.Typelib):
@@ -432,6 +472,13 @@ class Interface(GirNode, GirType):
                 return True
         return False
 
+    @property
+    def online_docs(self) -> T.Optional[str]:
+        if ns := self.get_containing(Namespace).online_docs:
+            return f"{ns}interface.{self.name}.html"
+        else:
+            return None
+
 
 class Class(GirNode, GirType):
     def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
@@ -544,6 +591,13 @@ class Class(GirNode, GirType):
         for impl in self.implements:
             yield from impl.signals.values()
 
+    @property
+    def online_docs(self) -> T.Optional[str]:
+        if ns := self.get_containing(Namespace).online_docs:
+            return f"{ns}class.{self.name}.html"
+        else:
+            return None
+
 
 class TemplateType(GirType):
     def __init__(self, name: str, parent: T.Optional[GirType]):
@@ -646,6 +700,13 @@ class Enumeration(GirNode, GirType):
     def assignable_to(self, type: GirType) -> bool:
         return type == self
 
+    @property
+    def online_docs(self) -> T.Optional[str]:
+        if ns := self.get_containing(Namespace).online_docs:
+            return f"{ns}enum.{self.name}.html"
+        else:
+            return None
+
 
 class Boxed(GirNode, GirType):
     def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
@@ -658,6 +719,13 @@ class Boxed(GirNode, GirType):
     def assignable_to(self, type) -> bool:
         return type == self
 
+    @property
+    def online_docs(self) -> T.Optional[str]:
+        if ns := self.get_containing(Namespace).online_docs:
+            return f"{ns}boxed.{self.name}.html"
+        else:
+            return None
+
 
 class Bitfield(Enumeration):
     def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
@@ -753,6 +821,10 @@ class Namespace(GirNode):
         else:
             return self.get_type(type_name)
 
+    @property
+    def online_docs(self) -> T.Optional[str]:
+        return ONLINE_DOCS.get(f"{self.name}-{self.version}")
+
 
 class Repository(GirNode):
     def __init__(self, tl: typelib.Typelib) -> None:

From c4fc4f3de870aca63698ddec040f3fb87d7ee674 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 6 Jul 2023 20:53:30 -0500
Subject: [PATCH 145/290] docs: Fix bug with colliding names

Often a vfunc has the same name as a signal, and the wrong docs would be
shown.
---
 blueprintcompiler/gir.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 816b58b..6dab652 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -253,6 +253,8 @@ TNode = T.TypeVar("TNode", bound="GirNode")
 
 
 class GirNode:
+    xml_tag: str
+
     def __init__(self, container: T.Optional["GirNode"], tl: typelib.Typelib) -> None:
         self.container = container
         self.tl = tl
@@ -269,7 +271,8 @@ class GirNode:
     def xml(self):
         for el in self.container.xml.children:
             if el.attrs.get("name") == self.name:
-                return el
+                if el.tag == self.xml_tag:
+                    return el
 
     @cached_property
     def glib_type_name(self) -> str:
@@ -329,6 +332,8 @@ class GirNode:
 
 
 class Property(GirNode):
+    xml_tag = "property"
+
     def __init__(self, klass: T.Union["Class", "Interface"], tl: typelib.Typelib):
         super().__init__(klass, tl)
 
@@ -396,6 +401,8 @@ class Signature(GirNode):
 
 
 class Signal(GirNode):
+    xml_tag = "glib:signal"
+
     def __init__(
         self, klass: T.Union["Class", "Interface"], tl: typelib.Typelib
     ) -> None:
@@ -422,6 +429,8 @@ class Signal(GirNode):
 
 
 class Interface(GirNode, GirType):
+    xml_tag = "interface"
+
     def __init__(self, ns: "Namespace", tl: typelib.Typelib):
         super().__init__(ns, tl)
 
@@ -481,6 +490,8 @@ class Interface(GirNode, GirType):
 
 
 class Class(GirNode, GirType):
+    xml_tag = "class"
+
     def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
         super().__init__(ns, tl)
 
@@ -654,6 +665,8 @@ class TemplateType(GirType):
 
 
 class EnumMember(GirNode):
+    xml_tag = "member"
+
     def __init__(self, enum: "Enumeration", tl: typelib.Typelib) -> None:
         super().__init__(enum, tl)
 
@@ -679,6 +692,8 @@ class EnumMember(GirNode):
 
 
 class Enumeration(GirNode, GirType):
+    xml_tag = "enumeration"
+
     def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
         super().__init__(ns, tl)
 
@@ -709,6 +724,8 @@ class Enumeration(GirNode, GirType):
 
 
 class Boxed(GirNode, GirType):
+    xml_tag = "glib:boxed"
+
     def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
         super().__init__(ns, tl)
 
@@ -728,6 +745,8 @@ class Boxed(GirNode, GirType):
 
 
 class Bitfield(Enumeration):
+    xml_tag = "bitfield"
+
     def __init__(self, ns: "Namespace", tl: typelib.Typelib) -> None:
         super().__init__(ns, tl)
 

From 9ff76b65cc381ee5f97c243a43d461a7fae086e0 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 6 Jul 2023 20:54:14 -0500
Subject: [PATCH 146/290] docs: Fix docs for accessibility properties

---
 blueprintcompiler/language/gtk_a11y.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index f7f89d6..6a346ec 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -98,6 +98,7 @@ def get_types(gir):
 
 
 def _get_docs(gir, name):
+    name = name.replace("-", "_")
     if gir_type := (
         gir.get_type("AccessibleProperty", "Gtk").members.get(name)
         or gir.get_type("AccessibleRelation", "Gtk").members.get(name)
@@ -197,7 +198,9 @@ def a11y_completer(ast_node, match_variables):
 def a11y_name_completer(ast_node, match_variables):
     for name, type in get_types(ast_node.root.gir).items():
         yield Completion(
-            name, CompletionItemKind.Property, docs=_get_docs(ast_node.root.gir, type)
+            name,
+            CompletionItemKind.Property,
+            docs=_get_docs(ast_node.root.gir, type.name),
         )
 
 

From cb1eb9ba4438a3e338ed01fd60908d19e6b35261 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 6 Jul 2023 21:21:24 -0500
Subject: [PATCH 147/290] lsp: Show better info on IdentLiteral hover

Instead of showing the documentation for the expected type, show the
signature of the referenced object.
---
 blueprintcompiler/language/gobject_object.py   |  7 +++++++
 .../language/gtk_list_item_factory.py          |  8 ++++++++
 blueprintcompiler/language/gtk_menu.py         |  7 +++++++
 .../language/gtkbuilder_template.py            |  7 +++++++
 blueprintcompiler/language/values.py           | 18 ++++++++++++------
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index d247c61..1a42c0a 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -55,6 +55,13 @@ class Object(AstNode):
     def content(self) -> ObjectContent:
         return self.children[ObjectContent][0]
 
+    @property
+    def signature(self) -> str:
+        if self.id:
+            return f"{self.class_name.gir_type.full_name} {self.id}"
+        else:
+            return f"{self.class_name.gir_type.full_name}"
+
     @property
     def gir_class(self) -> GirType:
         if self.class_name is None:
diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index f2f9d63..ba2a27f 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -9,6 +9,14 @@ from .types import TypeName
 class ExtListItemFactory(AstNode):
     grammar = [UseExact("id", "template"), Optional(TypeName), ObjectContent]
 
+    @property
+    def id(self) -> str:
+        return "template"
+
+    @property
+    def signature(self) -> str:
+        return f"template {self.gir_class.full_name}"
+
     @property
     def type_name(self) -> T.Optional[TypeName]:
         if len(self.children[TypeName]) == 1:
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 5698e12..824ec5c 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -35,6 +35,13 @@ class Menu(AstNode):
     def id(self) -> str:
         return self.tokens["id"]
 
+    @property
+    def signature(self) -> str:
+        if self.id:
+            return f"Gio.Menu {self.id}"
+        else:
+            return "Gio.Menu"
+
     @property
     def tag(self) -> str:
         return self.tokens["tag"]
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 9de4d66..7af5cc8 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -44,6 +44,13 @@ class Template(Object):
     def id(self) -> str:
         return "template"
 
+    @property
+    def signature(self) -> str:
+        if self.parent_type:
+            return f"template {self.gir_class.full_name} : {self.parent_type.gir_type.full_name}"
+        else:
+            return f"template {self.gir_class.full_name}"
+
     @property
     def gir_class(self) -> GirType:
         if isinstance(self.class_name.gir_type, ExternType):
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 6981141..fd1765b 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -312,14 +312,20 @@ class IdentLiteral(AstNode):
 
     @docs()
     def docs(self) -> T.Optional[str]:
-        type = self.context[ValueTypeCtx].value_type
-        if isinstance(type, gir.Enumeration):
-            if member := type.members.get(self.ident):
+        expected_type = self.context[ValueTypeCtx].value_type
+        if isinstance(expected_type, gir.BoolType):
+            return None
+        elif isinstance(expected_type, gir.Enumeration):
+            if member := expected_type.members.get(self.ident):
                 return member.doc
             else:
-                return type.doc
-        elif isinstance(type, gir.GirNode):
-            return type.doc
+                return expected_type.doc
+        elif self.ident == "null" and self.context[ValueTypeCtx].allow_null:
+            return None
+        elif object := self.context[ScopeCtx].objects.get(self.ident):
+            return f"```\n{object.signature}\n```"
+        elif self.root.is_legacy_template(self.ident):
+            return f"```\n{self.root.template.signature}\n```"
         else:
             return None
 

From abc4e5de65160b63ce15a803be2f177c0650e780 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 6 Jul 2023 21:29:13 -0500
Subject: [PATCH 148/290] lsp: Add docs for Adw.Breakpoint

---
 blueprintcompiler/language/adw_breakpoint.py | 41 ++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/language/adw_breakpoint.py b/blueprintcompiler/language/adw_breakpoint.py
index addbd8a..e71b29a 100644
--- a/blueprintcompiler/language/adw_breakpoint.py
+++ b/blueprintcompiler/language/adw_breakpoint.py
@@ -24,12 +24,26 @@ from .values import Value
 
 
 class AdwBreakpointCondition(AstNode):
-    grammar = ["condition", "(", UseQuoted("condition"), Match(")").expected()]
+    grammar = [
+        UseExact("kw", "condition"),
+        "(",
+        UseQuoted("condition"),
+        Match(")").expected(),
+    ]
 
     @property
     def condition(self) -> str:
         return self.tokens["condition"]
 
+    @docs("kw")
+    def keyword_docs(self):
+        klass = self.root.gir.get_type("Breakpoint", "Adw")
+        if klass is None:
+            return None
+        prop = klass.properties.get("condition")
+        assert isinstance(prop, gir.Property)
+        return prop.doc
+
     @validate()
     def unique(self):
         self.validate_unique_in_parent("Duplicate condition statement")
@@ -68,9 +82,16 @@ class AdwBreakpointSetter(AstNode):
             return None
 
     @property
-    def gir_property(self):
-        if self.gir_class is not None and not isinstance(self.gir_class, ExternType):
+    def gir_property(self) -> T.Optional[gir.Property]:
+        if (
+            self.gir_class is not None
+            and not isinstance(self.gir_class, ExternType)
+            and self.property_name is not None
+        ):
+            assert isinstance(self.gir_class, gir.Class)
             return self.gir_class.properties.get(self.property_name)
+        else:
+            return None
 
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
@@ -81,6 +102,20 @@ class AdwBreakpointSetter(AstNode):
 
         return ValueTypeCtx(type, allow_null=True)
 
+    @docs("object")
+    def object_docs(self):
+        if self.object is not None:
+            return f"```\n{self.object.signature}\n```"
+        else:
+            return None
+
+    @docs("property")
+    def property_docs(self):
+        if self.gir_property is not None:
+            return self.gir_property.doc
+        else:
+            return None
+
     @validate("object")
     def object_exists(self):
         if self.object is None:

From 0a4b5d07a1190e87b99e60735b74291996dc2135 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 22 May 2023 21:26:07 -0500
Subject: [PATCH 149/290] Remove PropertyBinding rule, just use Binding

---
 blueprintcompiler/language/__init__.py        |   1 -
 blueprintcompiler/language/binding.py         |  58 ++++++-
 blueprintcompiler/language/contexts.py        |   1 +
 blueprintcompiler/language/expression.py      |   6 +-
 .../language/gobject_property.py              |   9 +-
 .../language/property_binding.py              | 145 ------------------
 blueprintcompiler/language/values.py          |   8 +-
 blueprintcompiler/outputs/xml/__init__.py     |  24 ++-
 tests/sample_errors/binding_flags.blp         |   5 +
 tests/sample_errors/binding_flags.err         |   1 +
 .../binding_object_not_found.blp              |   5 +
 .../binding_object_not_found.err              |   1 +
 tests/sample_errors/warn_old_bind.blp         |   5 +-
 tests/sample_errors/warn_old_bind.err         |   4 +-
 tests/samples/property_binding.blp            |   4 +-
 tests/samples/template_bind_property.blp      |   2 +-
 16 files changed, 100 insertions(+), 179 deletions(-)
 delete mode 100644 blueprintcompiler/language/property_binding.py
 create mode 100644 tests/sample_errors/binding_flags.blp
 create mode 100644 tests/sample_errors/binding_flags.err
 create mode 100644 tests/sample_errors/binding_object_not_found.blp
 create mode 100644 tests/sample_errors/binding_object_not_found.err

diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index f849c75..39d8336 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -38,7 +38,6 @@ from .gtk_styles import ExtStyles
 from .gtkbuilder_child import Child, ChildExtension, ChildInternal, ChildType
 from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
-from .property_binding import PropertyBinding
 from .types import ClassName
 from .ui import UI
 from .values import (
diff --git a/blueprintcompiler/language/binding.py b/blueprintcompiler/language/binding.py
index e6bffd0..86beec0 100644
--- a/blueprintcompiler/language/binding.py
+++ b/blueprintcompiler/language/binding.py
@@ -23,16 +23,57 @@ from .common import *
 from .expression import Expression, LiteralExpr, LookupOp
 
 
+class BindingFlag(AstNode):
+    grammar = [
+        AnyOf(
+            UseExact("flag", "inverted"),
+            UseExact("flag", "bidirectional"),
+            UseExact("flag", "no-sync-create"),
+            UseExact("flag", "sync-create"),
+        )
+    ]
+
+    @property
+    def flag(self) -> str:
+        return self.tokens["flag"]
+
+    @validate()
+    def sync_create(self):
+        if self.flag == "sync-create":
+            raise UpgradeWarning(
+                "'sync-create' is now the default. Use 'no-sync-create' if this is not wanted.",
+                actions=[CodeAction("remove 'sync-create'", "")],
+            )
+
+    @validate()
+    def unique(self):
+        self.validate_unique_in_parent(
+            f"Duplicate flag '{self.flag}'", lambda x: x.flag == self.flag
+        )
+
+    @validate()
+    def flags_only_if_simple(self):
+        if self.parent.simple_binding is None:
+            raise CompileError(
+                "Only bindings with a single lookup can have flags",
+            )
+
+
 class Binding(AstNode):
     grammar = [
-        Keyword("bind"),
+        AnyOf(Keyword("bind"), UseExact("bind", "bind-property")),
         Expression,
+        ZeroOrMore(BindingFlag),
     ]
 
     @property
     def expression(self) -> Expression:
         return self.children[Expression][0]
 
+    @property
+    def flags(self) -> T.List[BindingFlag]:
+        return self.children[BindingFlag]
+
     @property
     def simple_binding(self) -> T.Optional["SimpleBinding"]:
         if isinstance(self.expression.last, LookupOp):
@@ -40,14 +81,29 @@ class Binding(AstNode):
                 from .values import IdentLiteral
 
                 if isinstance(self.expression.last.lhs.literal.value, IdentLiteral):
+                    flags = [x.flag for x in self.flags]
                     return SimpleBinding(
                         self.expression.last.lhs.literal.value.ident,
                         self.expression.last.property_name,
+                        no_sync_create="no-sync-create" in flags,
+                        bidirectional="bidirectional" in flags,
+                        inverted="inverted" in flags,
                     )
         return None
 
+    @validate("bind")
+    def bind_property(self):
+        if self.tokens["bind"] == "bind-property":
+            raise UpgradeWarning(
+                "'bind-property' is no longer needed. Use 'bind' instead. (blueprint 0.8.2)",
+                actions=[CodeAction("use 'bind'", "bind")],
+            )
+
 
 @dataclass
 class SimpleBinding:
     source: str
     property_name: str
+    no_sync_create: bool = False
+    bidirectional: bool = False
+    inverted: bool = False
diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
index fb24f5a..2f8e22e 100644
--- a/blueprintcompiler/language/contexts.py
+++ b/blueprintcompiler/language/contexts.py
@@ -30,6 +30,7 @@ from .gtkbuilder_template import Template
 class ValueTypeCtx:
     value_type: T.Optional[GirType]
     allow_null: bool = False
+    must_infer_type: bool = False
 
 
 @dataclass
diff --git a/blueprintcompiler/language/expression.py b/blueprintcompiler/language/expression.py
index a2185a3..10426fa 100644
--- a/blueprintcompiler/language/expression.py
+++ b/blueprintcompiler/language/expression.py
@@ -114,7 +114,7 @@ class LookupOp(InfixExpr):
 
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
-        return ValueTypeCtx(None)
+        return ValueTypeCtx(None, must_infer_type=True)
 
     @property
     def property_name(self) -> str:
@@ -133,6 +133,10 @@ class LookupOp(InfixExpr):
     @validate("property")
     def property_exists(self):
         if self.lhs.type is None:
+            # Literal values throw their own errors if the type isn't known
+            if isinstance(self.lhs, LiteralExpr):
+                return
+
             raise CompileError(
                 f"Could not determine the type of the preceding expression",
                 hints=[
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index f65c5ca..b24cd07 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -22,21 +22,18 @@ from .binding import Binding
 from .common import *
 from .contexts import ValueTypeCtx
 from .gtkbuilder_template import Template
-from .property_binding import PropertyBinding
 from .values import ObjectValue, Value
 
 
 class Property(AstNode):
-    grammar = Statement(
-        UseIdent("name"), ":", AnyOf(PropertyBinding, Binding, ObjectValue, Value)
-    )
+    grammar = Statement(UseIdent("name"), ":", AnyOf(Binding, ObjectValue, Value))
 
     @property
     def name(self) -> str:
         return self.tokens["name"]
 
     @property
-    def value(self) -> T.Union[PropertyBinding, Binding, ObjectValue, Value]:
+    def value(self) -> T.Union[Binding, ObjectValue, Value]:
         return self.children[0]
 
     @property
@@ -51,7 +48,7 @@ class Property(AstNode):
     @validate()
     def binding_valid(self):
         if (
-            (isinstance(self.value, PropertyBinding) or isinstance(self.value, Binding))
+            isinstance(self.value, Binding)
             and self.gir_property is not None
             and self.gir_property.construct_only
         ):
diff --git a/blueprintcompiler/language/property_binding.py b/blueprintcompiler/language/property_binding.py
deleted file mode 100644
index 686d1e8..0000000
--- a/blueprintcompiler/language/property_binding.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# property_binding.py
-#
-# Copyright 2023 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 *
-from .contexts import ScopeCtx
-from .gobject_object import Object
-
-
-class PropertyBindingFlag(AstNode):
-    grammar = [
-        AnyOf(
-            UseExact("flag", "inverted"),
-            UseExact("flag", "bidirectional"),
-            UseExact("flag", "no-sync-create"),
-            UseExact("flag", "sync-create"),
-        )
-    ]
-
-    @property
-    def flag(self) -> str:
-        return self.tokens["flag"]
-
-    @validate()
-    def sync_create(self):
-        if self.flag == "sync-create":
-            raise UpgradeWarning(
-                "'sync-create' is now the default. Use 'no-sync-create' if this is not wanted.",
-                actions=[CodeAction("remove 'sync-create'", "")],
-            )
-
-    @validate()
-    def unique(self):
-        self.validate_unique_in_parent(
-            f"Duplicate flag '{self.flag}'", lambda x: x.flag == self.flag
-        )
-
-
-class PropertyBinding(AstNode):
-    grammar = AnyOf(
-        [
-            Keyword("bind-property"),
-            UseIdent("source"),
-            ".",
-            UseIdent("property"),
-            ZeroOrMore(PropertyBindingFlag),
-        ],
-        [
-            Keyword("bind"),
-            UseIdent("source"),
-            ".",
-            UseIdent("property"),
-            PropertyBindingFlag,
-            ZeroOrMore(PropertyBindingFlag),
-        ],
-    )
-
-    @property
-    def source(self) -> str:
-        return self.tokens["source"]
-
-    @property
-    def source_obj(self) -> T.Optional[Object]:
-        if self.root.is_legacy_template(self.source):
-            return self.root.template
-        return self.context[ScopeCtx].objects.get(self.source)
-
-    @property
-    def property_name(self) -> str:
-        return self.tokens["property"]
-
-    @property
-    def flags(self) -> T.List[PropertyBindingFlag]:
-        return self.children[PropertyBindingFlag]
-
-    @property
-    def inverted(self) -> bool:
-        return any([f.flag == "inverted" for f in self.flags])
-
-    @property
-    def bidirectional(self) -> bool:
-        return any([f.flag == "bidirectional" for f in self.flags])
-
-    @property
-    def no_sync_create(self) -> bool:
-        return any([f.flag == "no-sync-create" for f in self.flags])
-
-    @validate("source")
-    def source_object_exists(self) -> None:
-        if self.source_obj is None:
-            raise CompileError(
-                f"Could not find object with ID {self.source}",
-                did_you_mean=(self.source, self.context[ScopeCtx].objects.keys()),
-            )
-
-    @validate("property")
-    def property_exists(self) -> None:
-        if self.source_obj is None:
-            return
-
-        gir_class = self.source_obj.gir_class
-
-        if gir_class is None or gir_class.incomplete:
-            # Objects that we have no gir data on should not be validated
-            # This happens for classes defined by the app itself
-            return
-
-        if (
-            isinstance(gir_class, gir.Class)
-            and gir_class.properties.get(self.property_name) is None
-        ):
-            raise CompileError(
-                f"{gir_class.full_name} does not have a property called {self.property_name}"
-            )
-
-    @validate("bind")
-    def old_bind(self):
-        if self.tokens["bind"]:
-            raise UpgradeWarning(
-                "Use 'bind-property', introduced in blueprint 0.8.0, to use binding flags",
-                actions=[CodeAction("Use 'bind-property'", "bind-property")],
-            )
-
-    @validate("source")
-    def legacy_template(self):
-        if self.root.is_legacy_template(self.source):
-            raise UpgradeWarning(
-                "Use 'template' instead of the class name (introduced in 0.8.0)",
-                actions=[CodeAction("Use 'template'", "template")],
-            )
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index fd1765b..888d6a1 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -291,7 +291,7 @@ class IdentLiteral(AstNode):
                 actions=[CodeAction("Use 'template'", "template")],
             )
 
-        elif expected_type is not None:
+        elif expected_type is not None or self.context[ValueTypeCtx].must_infer_type:
             object = self.context[ScopeCtx].objects.get(self.ident)
             if object is None:
                 if self.ident == "null":
@@ -305,7 +305,11 @@ class IdentLiteral(AstNode):
                             self.context[ScopeCtx].objects.keys(),
                         ),
                     )
-            elif object.gir_class and not object.gir_class.assignable_to(expected_type):
+            elif (
+                expected_type is not None
+                and object.gir_class is not None
+                and not object.gir_class.assignable_to(expected_type)
+            ):
                 raise CompileError(
                     f"Cannot assign {object.gir_class.full_name} to {expected_type.full_name}"
                 )
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 3ef7375..e9f091f 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -116,27 +116,21 @@ class XmlOutput(OutputFormat):
             if simple := value.simple_binding:
                 props["bind-source"] = self._object_id(value, simple.source)
                 props["bind-property"] = simple.property_name
-                props["bind-flags"] = "sync-create"
+                flags = []
+                if not simple.no_sync_create:
+                    flags.append("sync-create")
+                if simple.inverted:
+                    flags.append("invert-boolean")
+                if simple.bidirectional:
+                    flags.append("bidirectional")
+                props["bind-flags"] = "|".join(flags) or None
+
                 xml.put_self_closing("property", **props)
             else:
                 xml.start_tag("binding", **props)
                 self._emit_expression(value.expression, xml)
                 xml.end_tag()
 
-        elif isinstance(value, PropertyBinding):
-            bind_flags = []
-            if not value.no_sync_create:
-                bind_flags.append("sync-create")
-            if value.inverted:
-                bind_flags.append("invert-boolean")
-            if value.bidirectional:
-                bind_flags.append("bidirectional")
-
-            props["bind-source"] = self._object_id(value, value.source)
-            props["bind-property"] = value.property_name
-            props["bind-flags"] = "|".join(bind_flags) or None
-            xml.put_self_closing("property", **props)
-
         elif isinstance(value, ObjectValue):
             xml.start_tag("property", **props)
             self._emit_object(value.object, xml)
diff --git a/tests/sample_errors/binding_flags.blp b/tests/sample_errors/binding_flags.blp
new file mode 100644
index 0000000..7e94058
--- /dev/null
+++ b/tests/sample_errors/binding_flags.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: bind $my_closure() as <Label> bidirectional;
+}
\ No newline at end of file
diff --git a/tests/sample_errors/binding_flags.err b/tests/sample_errors/binding_flags.err
new file mode 100644
index 0000000..b525a30
--- /dev/null
+++ b/tests/sample_errors/binding_flags.err
@@ -0,0 +1 @@
+4,40,13,Only bindings with a single lookup can have flags
\ No newline at end of file
diff --git a/tests/sample_errors/binding_object_not_found.blp b/tests/sample_errors/binding_object_not_found.blp
new file mode 100644
index 0000000..a708975
--- /dev/null
+++ b/tests/sample_errors/binding_object_not_found.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: bind something.other;
+}
\ No newline at end of file
diff --git a/tests/sample_errors/binding_object_not_found.err b/tests/sample_errors/binding_object_not_found.err
new file mode 100644
index 0000000..0d08c81
--- /dev/null
+++ b/tests/sample_errors/binding_object_not_found.err
@@ -0,0 +1 @@
+4,15,9,Could not find object with ID something
\ No newline at end of file
diff --git a/tests/sample_errors/warn_old_bind.blp b/tests/sample_errors/warn_old_bind.blp
index 39e4458..422a0dc 100644
--- a/tests/sample_errors/warn_old_bind.blp
+++ b/tests/sample_errors/warn_old_bind.blp
@@ -1,9 +1,8 @@
 using Gtk 4.0;
 
 Box {
-  visible: bind box2.visible inverted;
-  orientation: bind box2.orientation;
-  spacing: bind box2.spacing no-sync-create;
+  visible: bind-property box2.visible inverted;
+  orientation: bind-property box2.orientation;
 }
 
 Box box2 {
diff --git a/tests/sample_errors/warn_old_bind.err b/tests/sample_errors/warn_old_bind.err
index f1acc86..827e360 100644
--- a/tests/sample_errors/warn_old_bind.err
+++ b/tests/sample_errors/warn_old_bind.err
@@ -1,2 +1,2 @@
-4,12,4,Use 'bind-property', introduced in blueprint 0.8.0, to use binding flags
-6,12,4,Use 'bind-property', introduced in blueprint 0.8.0, to use binding flags
\ No newline at end of file
+4,12,13,'bind-property' is no longer needed. Use 'bind' instead. (blueprint 0.8.2)
+5,16,13,'bind-property' is no longer needed. Use 'bind' instead. (blueprint 0.8.2)
\ No newline at end of file
diff --git a/tests/samples/property_binding.blp b/tests/samples/property_binding.blp
index 1d7d6ea..39e4458 100644
--- a/tests/samples/property_binding.blp
+++ b/tests/samples/property_binding.blp
@@ -1,9 +1,9 @@
 using Gtk 4.0;
 
 Box {
-  visible: bind-property box2.visible inverted;
+  visible: bind box2.visible inverted;
   orientation: bind box2.orientation;
-  spacing: bind-property box2.spacing no-sync-create;
+  spacing: bind box2.spacing no-sync-create;
 }
 
 Box box2 {
diff --git a/tests/samples/template_bind_property.blp b/tests/samples/template_bind_property.blp
index e2be0bf..834494e 100644
--- a/tests/samples/template_bind_property.blp
+++ b/tests/samples/template_bind_property.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 template $MyTemplate {
-  object: bind-property template.object2;
+  object: bind template.object2;
 }
\ No newline at end of file

From c69a12096cadb46cc43a97c3966900916a29cc21 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 13 Jun 2023 20:41:41 -0500
Subject: [PATCH 150/290] docs: Update bindings docs

---
 docs/reference/objects.rst |  2 +-
 docs/reference/values.rst  | 50 ++++++++++++++++----------------------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/docs/reference/objects.rst b/docs/reference/objects.rst
index 8acbb32..fe4d1a7 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:`PropertyBinding<Syntax PropertyBinding>` | :ref:`Binding<Syntax Binding>` | :ref:`ObjectValue<Syntax ObjectValue>` | :ref:`Value<Syntax Value>` ) ';'
+   Property = <name::ref:`IDENT<Syntax IDENT>`> ':' ( :ref:`Binding<Syntax Binding>` | :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/docs/reference/values.rst b/docs/reference/values.rst
index 9c0a09f..035408f 100644
--- a/docs/reference/values.rst
+++ b/docs/reference/values.rst
@@ -102,34 +102,6 @@ Use ``C_("context", "...")`` to add a *message context* to a string to disambigu
    }
 
 
-.. _Syntax PropertyBinding:
-
-Property Bindings
------------------
-
-.. rst-class:: grammar-block
-
-   PropertyBinding = 'bind-property' <source::ref:`IDENT<Syntax IDENT>`> '.' <property::ref:`IDENT<Syntax IDENT>`> (PropertyBindingFlag)*
-   PropertyBindingFlag = 'inverted' | 'bidirectional' | 'no-sync-create'
-
-Bindings keep a property updated as another property changes. They can be used to keep the UI in sync with application data, or to connect two parts of the UI.
-
-Example
-~~~~~~~
-
-.. code-block:: blueprintui
-
-   /* Use property bindings to show a label when a switch
-    * is active, without any application code */
-
-   Switch advanced_feature {}
-
-   Label warning {
-     visible: bind-property advanced_feature.active;
-     label: _("This is an advanced feature. Use with caution!");
-   }
-
-
 .. _Syntax Binding:
 
 Expression Bindings
@@ -139,7 +111,27 @@ Expression Bindings
 
    Binding = 'bind' :ref:`Expression<Syntax Expression>`
 
-Expression bindings serve the same purpose as property bindings, but are more powerful. They can call application code to compute the value of a property, and they can do multi-step property lookups. See :ref:`the expressions page<Syntax Expression>`.
+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.
+
+The simplest bindings connect to a property of another object in the blueprint. When that other property changes, the bound property updates as well. More advanced bindings can do multi-step property lookups and can even call application code to compute values. See :ref:`the expressions page<Syntax Expression>`.
+
+Example
+~~~~~~~
+
+.. code-block:: blueprintui
+
+   /* Use bindings to show a label when a switch
+    * is active, without any application code */
+
+   Switch advanced_feature {}
+
+   Label warning {
+     visible: bind-property advanced_feature.active;
+     label: _("This is an advanced feature. Use with caution!");
+   }
+
+.. code-block: blueprintui
+
 
 
 .. _Syntax ObjectValue:

From 883a136103ddeead046b259ab283e245bdf2277f Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 14 Jun 2023 15:22:57 -0500
Subject: [PATCH 151/290] Fix parsing decimals

A number literal is a float if it contains ".", not if it is divisible
by 1. For example, 1.0 should be considered a float literal.
---
 .gitlab-ci.yml                            | 2 +-
 blueprintcompiler/outputs/xml/__init__.py | 5 ++++-
 blueprintcompiler/parse_tree.py           | 2 --
 blueprintcompiler/tokenizer.py            | 4 +++-
 tests/samples/issue_119.blp               | 5 +++++
 tests/samples/issue_119.ui                | 9 +++++++++
 tests/samples/numbers.blp                 | 2 +-
 tests/samples/numbers.ui                  | 1 +
 8 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 tests/samples/issue_119.blp
 create mode 100644 tests/samples/issue_119.ui

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e9ee9c..ed26158 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 3077f669fc9c8e3ceb4da85e6bda680c297c58a2
+    - git checkout 9bfb9325d75a9985310230f119579f07df519e60
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index e9f091f..12b4e18 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -193,7 +193,10 @@ class XmlOutput(OutputFormat):
         elif isinstance(value, TypeLiteral):
             xml.put_text(value.type_name.glib_type_name)
         else:
-            xml.put_text(value.value)
+            if isinstance(value.value, float) and value.value == int(value.value):
+                xml.put_text(int(value.value))
+            else:
+                xml.put_text(value.value)
 
     def _emit_value(self, value: Value, xml: XmlEmitter):
         if isinstance(value.child, Literal):
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index 48f60b1..3ddac69 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -520,8 +520,6 @@ class UseNumber(ParseNode):
             return False
 
         number = token.get_number()
-        if number % 1.0 == 0:
-            number = int(number)
         ctx.set_group_val(self.key, number, token)
         return True
 
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 3c98b94..bde8dd1 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -70,8 +70,10 @@ class Token:
         try:
             if string.startswith("0x"):
                 return int(string, 16)
-            else:
+            elif "." in string:
                 return float(string)
+            else:
+                return int(string)
         except:
             raise CompileError(
                 f"{str(self)} is not a valid number literal", self.start, self.end
diff --git a/tests/samples/issue_119.blp b/tests/samples/issue_119.blp
new file mode 100644
index 0000000..145a9f8
--- /dev/null
+++ b/tests/samples/issue_119.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Adjustment {
+  value: bind 1.0 as <double>;
+}
\ No newline at end of file
diff --git a/tests/samples/issue_119.ui b/tests/samples/issue_119.ui
new file mode 100644
index 0000000..2e039b5
--- /dev/null
+++ b/tests/samples/issue_119.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkAdjustment">
+    <binding name="value">
+      <constant type="gfloat">1</constant>
+    </binding>
+  </object>
+</interface>
diff --git a/tests/samples/numbers.blp b/tests/samples/numbers.blp
index 9ac25dd..ae0ce42 100644
--- a/tests/samples/numbers.blp
+++ b/tests/samples/numbers.blp
@@ -2,7 +2,7 @@ using Gtk 4.0;
 
 Gtk.Label {
   xalign: .5;
+  yalign: 0.0;
   height-request: 1_000_000;
   margin-top: 0x30;
-
 }
diff --git a/tests/samples/numbers.ui b/tests/samples/numbers.ui
index 03dee06..813afe4 100644
--- a/tests/samples/numbers.ui
+++ b/tests/samples/numbers.ui
@@ -3,6 +3,7 @@
   <requires lib="gtk" version="4.0"/>
   <object class="GtkLabel">
     <property name="xalign">0.5</property>
+    <property name="yalign">0</property>
     <property name="height-request">1000000</property>
     <property name="margin-top">48</property>
   </object>

From 2a39a16391122af2f3d812e478c1c1398c98b972 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 21 Jul 2023 15:06:18 -0500
Subject: [PATCH 152/290] Release v0.10.0

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

diff --git a/NEWS.md b/NEWS.md
index 544b4a0..efdc77c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,32 @@
+# v0.10.0
+
+## Added
+
+- The hover documentation now includes a link to the documentation for the symbol, if available.
+- Added hover documentation for the Adw.Breakpoint extensions, `condition` and `setters`.
+
+## Changed
+
+- Decompiling an empty file now produces an empty file rather than an error.
+- More relevant documentation is shown when hovering over an identifier literal (such as an enum value or an object ID).
+
+## Fixed
+
+- Fixed an issue with the language server not conforming the spec. (seshotake)
+- Fixed the signature section of the hover documentation for properties and signals.
+- Fixed a bug where documentation was sometimes shown for a different symbol with the same name.
+- Fixed a bug where documentation was not shown for accessibility properties that contain `-`.
+- Number literals are now correctly parsed as floats if they contain a `.`, even if they are divisible by 1.
+
+## Removed
+
+- The `bind-property` keyword has been removed. Use `bind` instead. The old syntax is still accepted with a warning.
+
+## Documentation
+
+- Fixed the grammar for Extension, which was missing ExtAdwBreakpoint.
+
+
 # v0.8.1
 
 ## Breaking Changes
diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index f10a944..89355b7 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -16,7 +16,7 @@ a module in your flatpak manifest:
        {
          "type": "git",
          "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-         "tag": "v0.8.1"
+         "tag": "v0.10.0"
        }
      ]
    }
diff --git a/meson.build b/meson.build
index 0b1f48a..0a0979c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.8.1',
+  version: '0.10.0',
 )
 
 subdir('docs')

From ee614e0cc0882175c8bd170d037a16c2232c94f6 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 21 Jul 2023 15:08:16 -0500
Subject: [PATCH 153/290] Post-release version bump

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

diff --git a/meson.build b/meson.build
index 0a0979c..0edd6d8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.10.0',
+  version: '0.10.1',
 )
 
 subdir('docs')

From 8fab7c1706d5fb4ef6a45bc82f9cd41e579c1191 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 21 Jul 2023 15:11:24 -0500
Subject: [PATCH 154/290] A couple of fixes to NEWS

---
 NEWS.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index efdc77c..706f4f0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,12 +2,12 @@
 
 ## Added
 
-- The hover documentation now includes a link to the documentation for the symbol, if available.
+- The hover documentation now includes a link to the online documentation for the symbol, if available.
 - Added hover documentation for the Adw.Breakpoint extensions, `condition` and `setters`.
 
 ## Changed
 
-- Decompiling an empty file now produces an empty file rather than an error.
+- Decompiling an empty file now produces an empty file rather than an error. (AkshayWarrier)
 - More relevant documentation is shown when hovering over an identifier literal (such as an enum value or an object ID).
 
 ## Fixed

From 94db929f742929e25aa394fe03fd30c2447513c4 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 23 Jul 2023 18:04:10 -0500
Subject: [PATCH 155/290] Emit deprecation warnings

---
 blueprintcompiler/gir.py                      | 39 +++++++++++++++++++
 .../language/gobject_property.py              | 15 ++++++-
 blueprintcompiler/language/gobject_signal.py  | 15 ++++++-
 blueprintcompiler/language/types.py           | 11 ++++++
 blueprintcompiler/typelib.py                  |  4 ++
 tests/sample_errors/deprecations.blp          | 10 +++++
 tests/sample_errors/deprecations.err          |  1 +
 tests/sample_errors/legacy_template.err       |  1 +
 tests/test_samples.py                         |  8 ++++
 9 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 tests/sample_errors/deprecations.blp
 create mode 100644 tests/sample_errors/deprecations.err

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 6dab652..3642bd6 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -136,6 +136,14 @@ class GirType:
     def incomplete(self) -> bool:
         return False
 
+    @property
+    def deprecated(self) -> bool:
+        return False
+
+    @property
+    def deprecated_doc(self) -> T.Optional[str]:
+        return None
+
 
 class ExternType(GirType):
     def __init__(self, name: str) -> None:
@@ -330,6 +338,13 @@ class GirNode:
     def type(self) -> GirType:
         raise NotImplementedError()
 
+    @property
+    def deprecated_doc(self) -> T.Optional[str]:
+        try:
+            return self.xml.get_elements("doc-deprecated")[0].cdata.strip()
+        except:
+            return None
+
 
 class Property(GirNode):
     xml_tag = "property"
@@ -365,6 +380,10 @@ class Property(GirNode):
         else:
             return None
 
+    @property
+    def deprecated(self) -> bool:
+        return self.tl.PROP_DEPRECATED == 1
+
 
 class Argument(GirNode):
     def __init__(self, container: GirNode, tl: typelib.Typelib) -> None:
@@ -427,6 +446,10 @@ class Signal(GirNode):
         else:
             return None
 
+    @property
+    def deprecated(self) -> bool:
+        return self.tl.SIGNAL_DEPRECATED == 1
+
 
 class Interface(GirNode, GirType):
     xml_tag = "interface"
@@ -488,6 +511,10 @@ class Interface(GirNode, GirType):
         else:
             return None
 
+    @property
+    def deprecated(self) -> bool:
+        return self.tl.INTERFACE_DEPRECATED == 1
+
 
 class Class(GirNode, GirType):
     xml_tag = "class"
@@ -609,6 +636,10 @@ class Class(GirNode, GirType):
         else:
             return None
 
+    @property
+    def deprecated(self) -> bool:
+        return self.tl.OBJ_DEPRECATED == 1
+
 
 class TemplateType(GirType):
     def __init__(self, name: str, parent: T.Optional[GirType]):
@@ -722,6 +753,10 @@ class Enumeration(GirNode, GirType):
         else:
             return None
 
+    @property
+    def deprecated(self) -> bool:
+        return self.tl.ENUM_DEPRECATED == 1
+
 
 class Boxed(GirNode, GirType):
     xml_tag = "glib:boxed"
@@ -743,6 +778,10 @@ class Boxed(GirNode, GirType):
         else:
             return None
 
+    @property
+    def deprecated(self) -> bool:
+        return self.tl.STRUCT_DEPRECATED == 1
+
 
 class Bitfield(Enumeration):
     xml_tag = "bitfield"
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index b24cd07..526b308 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -41,9 +41,11 @@ class Property(AstNode):
         return self.parent.parent.gir_class
 
     @property
-    def gir_property(self):
+    def gir_property(self) -> T.Optional[gir.Property]:
         if self.gir_class is not None and not isinstance(self.gir_class, ExternType):
             return self.gir_class.properties.get(self.tokens["name"])
+        else:
+            return None
 
     @validate()
     def binding_valid(self):
@@ -91,6 +93,17 @@ class Property(AstNode):
             check=lambda child: child.tokens["name"] == self.tokens["name"],
         )
 
+    @validate("name")
+    def deprecated(self) -> None:
+        if self.gir_property is not None and self.gir_property.deprecated:
+            hints = []
+            if self.gir_property.deprecated_doc:
+                hints.append(self.gir_property.deprecated_doc)
+            raise CompileWarning(
+                f"{self.gir_property.signature} is deprecated",
+                hints=hints,
+            )
+
     @docs("name")
     def property_docs(self):
         if self.gir_property is not None:
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 2fc4699..1c60bbf 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -95,9 +95,11 @@ class Signal(AstNode):
         return any(x.flag == "after" for x in self.flags)
 
     @property
-    def gir_signal(self):
+    def gir_signal(self) -> T.Optional[gir.Signal]:
         if self.gir_class is not None and not isinstance(self.gir_class, ExternType):
             return self.gir_class.signals.get(self.tokens["name"])
+        else:
+            return None
 
     @property
     def gir_class(self):
@@ -134,6 +136,17 @@ class Signal(AstNode):
         if self.context[ScopeCtx].objects.get(object_id) is None:
             raise CompileError(f"Could not find object with ID '{object_id}'")
 
+    @validate("name")
+    def deprecated(self) -> None:
+        if self.gir_signal is not None and self.gir_signal.deprecated:
+            hints = []
+            if self.gir_signal.deprecated_doc:
+                hints.append(self.gir_signal.deprecated_doc)
+            raise CompileWarning(
+                f"{self.gir_signal.signature} is deprecated",
+                hints=hints,
+            )
+
     @docs("name")
     def signal_docs(self):
         if self.gir_signal is not None:
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index e75ebdc..1d9911b 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -57,6 +57,17 @@ class TypeName(AstNode):
         if not self.tokens["extern"]:
             self.root.gir.validate_ns(self.tokens["namespace"])
 
+    @validate()
+    def deprecated(self) -> None:
+        if self.gir_type and self.gir_type.deprecated:
+            hints = []
+            if self.gir_type.deprecated_doc:
+                hints.append(self.gir_type.deprecated_doc)
+            raise CompileWarning(
+                f"{self.gir_type.full_name} is deprecated",
+                hints=hints,
+            )
+
     @property
     def gir_ns(self):
         if not self.tokens["extern"]:
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index 2ce3e32..c8a3ff3 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -150,11 +150,15 @@ class Typelib:
 
     BLOB_NAME = Field(0x4, "string")
 
+    STRUCT_DEPRECATED = Field(0x2, "u16", 0, 1)
+
+    ENUM_DEPRECATED = Field(0x2, "u16", 0, 1)
     ENUM_GTYPE_NAME = Field(0x8, "string")
     ENUM_N_VALUES = Field(0x10, "u16")
     ENUM_N_METHODS = Field(0x12, "u16")
     ENUM_VALUES = Field(0x18, "offset")
 
+    INTERFACE_DEPRECATED = Field(0x2, "u16", 0, 1)
     INTERFACE_GTYPE_NAME = Field(0x8, "string")
     INTERFACE_N_PREREQUISITES = Field(0x12, "u16")
     INTERFACE_N_PROPERTIES = Field(0x14, "u16")
diff --git a/tests/sample_errors/deprecations.blp b/tests/sample_errors/deprecations.blp
new file mode 100644
index 0000000..1554a0b
--- /dev/null
+++ b/tests/sample_errors/deprecations.blp
@@ -0,0 +1,10 @@
+using Gtk 4.0;
+using Gio 2.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
new file mode 100644
index 0000000..6059412
--- /dev/null
+++ b/tests/sample_errors/deprecations.err
@@ -0,0 +1 @@
+4,1,6,Gtk.Dialog is deprecated
\ No newline at end of file
diff --git a/tests/sample_errors/legacy_template.err b/tests/sample_errors/legacy_template.err
index 876b0cf..79ad519 100644
--- a/tests/sample_errors/legacy_template.err
+++ b/tests/sample_errors/legacy_template.err
@@ -1,2 +1,3 @@
 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 7fe7941..1273805 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -54,6 +54,14 @@ class TestSamples(unittest.TestCase):
             tokens = tokenizer.tokenize(blueprint)
             ast, errors, warnings = parser.parse(tokens)
 
+            # Ignore deprecation warnings because some of the things we're testing
+            # are deprecated
+            warnings = [
+                warning
+                for warning in warnings
+                if "is deprecated" not in warning.message
+            ]
+
             if errors:
                 raise errors
             if len(warnings):

From 950b141d2621ef45df00a7ec5a12734ad89d32e5 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 23 Jul 2023 18:04:10 -0500
Subject: [PATCH 156/290] lsp: Mark deprecation warnings

Some editors use different styling (e.g. strikethrough) for deprecation
warnings.
---
 blueprintcompiler/errors.py                    | 4 ++++
 blueprintcompiler/language/common.py           | 1 +
 blueprintcompiler/language/gobject_property.py | 2 +-
 blueprintcompiler/language/gobject_signal.py   | 2 +-
 blueprintcompiler/language/types.py            | 2 +-
 blueprintcompiler/lsp.py                       | 3 +++
 blueprintcompiler/lsp_utils.py                 | 5 +++++
 tests/test_samples.py                          | 9 +++++++--
 8 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 2a14040..e89ec31 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -128,6 +128,10 @@ class CompileWarning(CompileError):
     color = Colors.YELLOW
 
 
+class DeprecatedWarning(CompileWarning):
+    pass
+
+
 class UpgradeWarning(CompileWarning):
     category = "upgrade"
     color = Colors.PURPLE
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index f1c6bb9..e45cddc 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -33,6 +33,7 @@ from ..errors import (
     CodeAction,
     CompileError,
     CompileWarning,
+    DeprecatedWarning,
     MultipleErrors,
     UpgradeWarning,
 )
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 526b308..68f8c6d 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -99,7 +99,7 @@ class Property(AstNode):
             hints = []
             if self.gir_property.deprecated_doc:
                 hints.append(self.gir_property.deprecated_doc)
-            raise CompileWarning(
+            raise DeprecatedWarning(
                 f"{self.gir_property.signature} is deprecated",
                 hints=hints,
             )
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 1c60bbf..721c443 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -142,7 +142,7 @@ class Signal(AstNode):
             hints = []
             if self.gir_signal.deprecated_doc:
                 hints.append(self.gir_signal.deprecated_doc)
-            raise CompileWarning(
+            raise DeprecatedWarning(
                 f"{self.gir_signal.signature} is deprecated",
                 hints=hints,
             )
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index 1d9911b..e7b1867 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -63,7 +63,7 @@ class TypeName(AstNode):
             hints = []
             if self.gir_type.deprecated_doc:
                 hints.append(self.gir_type.deprecated_doc)
-            raise CompileWarning(
+            raise DeprecatedWarning(
                 f"{self.gir_type.full_name} is deprecated",
                 hints=hints,
             )
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index e8c37f3..54a36c8 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -391,6 +391,9 @@ class LanguageServer:
             else DiagnosticSeverity.Error,
         }
 
+        if isinstance(err, DeprecationWarning):
+            result["tags"] = [DiagnosticTag.Deprecated]
+
         if len(err.references) > 0:
             result["relatedInformation"] = [
                 {
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 7f46680..2d1072e 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -119,6 +119,11 @@ class DiagnosticSeverity(enum.IntEnum):
     Hint = 4
 
 
+class DiagnosticTag(enum.IntEnum):
+    Unnecessary = 1
+    Deprecated = 2
+
+
 @dataclass
 class SemanticToken:
     start: int
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 1273805..bacca80 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -29,7 +29,12 @@ from gi.repository import Gtk
 
 from blueprintcompiler import decompiler, parser, tokenizer, utils
 from blueprintcompiler.completions import complete
-from blueprintcompiler.errors import CompileError, MultipleErrors, PrintableError
+from blueprintcompiler.errors import (
+    CompileError,
+    DeprecatedWarning,
+    MultipleErrors,
+    PrintableError,
+)
 from blueprintcompiler.outputs.xml import XmlOutput
 from blueprintcompiler.tokenizer import Token, TokenType, tokenize
 
@@ -59,7 +64,7 @@ class TestSamples(unittest.TestCase):
             warnings = [
                 warning
                 for warning in warnings
-                if "is deprecated" not in warning.message
+                if not isinstance(warning, DeprecatedWarning)
             ]
 
             if errors:

From e087aeb44f44072435a2c998b7341de28d9321fe Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 23 Jul 2023 21:11:00 -0500
Subject: [PATCH 157/290] lsp: Add document outline

---
 blueprintcompiler/ast_utils.py                | 37 +++++++++++++++-
 blueprintcompiler/language/adw_breakpoint.py  | 35 +++++++++++++++-
 .../language/adw_message_dialog.py            | 19 +++++++++
 blueprintcompiler/language/common.py          |  9 +++-
 blueprintcompiler/language/gobject_object.py  | 17 +++++++-
 .../language/gobject_property.py              | 15 +++++++
 blueprintcompiler/language/gobject_signal.py  | 12 ++++++
 blueprintcompiler/language/gtk_a11y.py        | 19 +++++++++
 .../language/gtk_combo_box_text.py            | 21 +++++++++-
 blueprintcompiler/language/gtk_file_filter.py | 18 ++++++++
 blueprintcompiler/language/gtk_layout.py      | 19 +++++++++
 .../language/gtk_list_item_factory.py         | 15 ++++++-
 blueprintcompiler/language/gtk_menu.py        | 30 +++++++++++--
 blueprintcompiler/language/gtk_scale.py       | 19 +++++++++
 blueprintcompiler/language/gtk_size_group.py  | 18 ++++++++
 blueprintcompiler/language/gtk_string_list.py | 18 ++++++++
 blueprintcompiler/language/gtk_styles.py      | 18 ++++++++
 .../language/gtkbuilder_template.py           | 15 +++++--
 blueprintcompiler/lsp.py                      | 26 ++++++++++++
 blueprintcompiler/lsp_utils.py                | 42 ++++++++++++++++++-
 blueprintcompiler/parse_tree.py               | 37 +++++++++++++---
 blueprintcompiler/parser.py                   |  3 +-
 blueprintcompiler/tokenizer.py                | 24 +++++++++++
 tests/test_samples.py                         | 11 ++---
 24 files changed, 469 insertions(+), 28 deletions(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 7eebe45..59331f9 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -22,7 +22,8 @@ from collections import ChainMap, defaultdict
 from functools import cached_property
 
 from .errors import *
-from .lsp_utils import SemanticToken
+from .lsp_utils import DocumentSymbol, SemanticToken
+from .tokenizer import Range
 
 TType = T.TypeVar("TType")
 
@@ -54,6 +55,18 @@ class Children:
             return [child for child in self._children if isinstance(child, key)]
 
 
+class Ranges:
+    def __init__(self, ranges: T.Dict[str, Range]):
+        self._ranges = ranges
+
+    def __getitem__(self, key: T.Union[str, tuple[str, str]]) -> T.Optional[Range]:
+        if isinstance(key, str):
+            return self._ranges.get(key)
+        elif isinstance(key, tuple):
+            start, end = key
+            return Range.join(self._ranges.get(start), self._ranges.get(end))
+
+
 TCtx = T.TypeVar("TCtx")
 TAttr = T.TypeVar("TAttr")
 
@@ -102,6 +115,10 @@ class AstNode:
     def context(self):
         return Ctx(self)
 
+    @cached_property
+    def ranges(self):
+        return Ranges(self.group.ranges)
+
     @cached_property
     def root(self):
         if self.parent is None:
@@ -109,6 +126,10 @@ class AstNode:
         else:
             return self.parent.root
 
+    @property
+    def range(self):
+        return Range(self.group.start, self.group.end, self.group.text)
+
     def parent_by_type(self, type: T.Type[TType]) -> TType:
         if self.parent is None:
             raise CompilerBugError()
@@ -175,6 +196,20 @@ class AstNode:
         for child in self.children:
             yield from child.get_semantic_tokens()
 
+    @property
+    def document_symbol(self) -> T.Optional[DocumentSymbol]:
+        return None
+
+    def get_document_symbols(self) -> T.List[DocumentSymbol]:
+        result = []
+        for child in self.children:
+            if s := child.document_symbol:
+                s.children = child.get_document_symbols()
+                result.append(s)
+            else:
+                result.extend(child.get_document_symbols())
+        return result
+
     def validate_unique_in_parent(
         self, error: str, check: T.Optional[T.Callable[["AstNode"], bool]] = None
     ):
diff --git a/blueprintcompiler/language/adw_breakpoint.py b/blueprintcompiler/language/adw_breakpoint.py
index e71b29a..aec4ab5 100644
--- a/blueprintcompiler/language/adw_breakpoint.py
+++ b/blueprintcompiler/language/adw_breakpoint.py
@@ -35,6 +35,16 @@ class AdwBreakpointCondition(AstNode):
     def condition(self) -> str:
         return self.tokens["condition"]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "condition",
+            SymbolKind.Property,
+            self.range,
+            self.group.tokens["kw"].range,
+            self.condition,
+        )
+
     @docs("kw")
     def keyword_docs(self):
         klass = self.root.gir.get_type("Breakpoint", "Adw")
@@ -93,6 +103,16 @@ class AdwBreakpointSetter(AstNode):
         else:
             return None
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            f"{self.object_id}.{self.property_name}",
+            SymbolKind.Property,
+            self.range,
+            self.group.tokens["object"].range,
+            self.value.range.text,
+        )
+
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
         if self.gir_property is not None:
@@ -147,12 +167,25 @@ class AdwBreakpointSetter(AstNode):
 
 
 class AdwBreakpointSetters(AstNode):
-    grammar = ["setters", Match("{").expected(), Until(AdwBreakpointSetter, "}")]
+    grammar = [
+        Keyword("setters"),
+        Match("{").expected(),
+        Until(AdwBreakpointSetter, "}"),
+    ]
 
     @property
     def setters(self) -> T.List[AdwBreakpointSetter]:
         return self.children[AdwBreakpointSetter]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "setters",
+            SymbolKind.Struct,
+            self.range,
+            self.group.tokens["setters"].range,
+        )
+
     @validate()
     def container_is_breakpoint(self):
         validate_parent_type(self, "Adw", "Breakpoint", "breakpoint setters")
diff --git a/blueprintcompiler/language/adw_message_dialog.py b/blueprintcompiler/language/adw_message_dialog.py
index 98c40cd..fb2be66 100644
--- a/blueprintcompiler/language/adw_message_dialog.py
+++ b/blueprintcompiler/language/adw_message_dialog.py
@@ -84,6 +84,16 @@ class ExtAdwMessageDialogResponse(AstNode):
     def value(self) -> StringValue:
         return self.children[0]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.id,
+            SymbolKind.Field,
+            self.range,
+            self.group.tokens["id"].range,
+            self.value.range.text,
+        )
+
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
         return ValueTypeCtx(StringType())
@@ -108,6 +118,15 @@ class ExtAdwMessageDialog(AstNode):
     def responses(self) -> T.List[ExtAdwMessageDialogResponse]:
         return self.children
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "responses",
+            SymbolKind.Array,
+            self.range,
+            self.group.tokens["responses"].range,
+        )
+
     @validate("responses")
     def container_is_message_dialog(self):
         validate_parent_type(self, "Adw", "MessageDialog", "responses")
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index e45cddc..e1bfa36 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -46,7 +46,14 @@ from ..gir import (
     IntType,
     StringType,
 )
-from ..lsp_utils import Completion, CompletionItemKind, SemanticToken, SemanticTokenType
+from ..lsp_utils import (
+    Completion,
+    CompletionItemKind,
+    DocumentSymbol,
+    SemanticToken,
+    SemanticTokenType,
+    SymbolKind,
+)
 from ..parse_tree import *
 
 OBJECT_CONTENT_HOOKS = AnyOf()
diff --git a/blueprintcompiler/language/gobject_object.py b/blueprintcompiler/language/gobject_object.py
index 1a42c0a..16c92e7 100644
--- a/blueprintcompiler/language/gobject_object.py
+++ b/blueprintcompiler/language/gobject_object.py
@@ -21,6 +21,9 @@
 import typing as T
 from functools import cached_property
 
+from blueprintcompiler.errors import T
+from blueprintcompiler.lsp_utils import DocumentSymbol
+
 from .common import *
 from .response_id import ExtResponse
 from .types import ClassName, ConcreteClassName
@@ -59,8 +62,20 @@ class Object(AstNode):
     def signature(self) -> str:
         if self.id:
             return f"{self.class_name.gir_type.full_name} {self.id}"
+        elif t := self.class_name.gir_type:
+            return f"{t.full_name}"
         else:
-            return f"{self.class_name.gir_type.full_name}"
+            return f"{self.class_name.as_string}"
+
+    @property
+    def document_symbol(self) -> T.Optional[DocumentSymbol]:
+        return DocumentSymbol(
+            self.class_name.as_string,
+            SymbolKind.Object,
+            self.range,
+            self.children[ClassName][0].range,
+            self.id,
+        )
 
     @property
     def gir_class(self) -> GirType:
diff --git a/blueprintcompiler/language/gobject_property.py b/blueprintcompiler/language/gobject_property.py
index 68f8c6d..3d2ac5b 100644
--- a/blueprintcompiler/language/gobject_property.py
+++ b/blueprintcompiler/language/gobject_property.py
@@ -47,6 +47,21 @@ class Property(AstNode):
         else:
             return None
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        if isinstance(self.value, ObjectValue):
+            detail = None
+        else:
+            detail = self.value.range.text
+
+        return DocumentSymbol(
+            self.name,
+            SymbolKind.Property,
+            self.range,
+            self.group.tokens["name"].range,
+            detail,
+        )
+
     @validate()
     def binding_valid(self):
         if (
diff --git a/blueprintcompiler/language/gobject_signal.py b/blueprintcompiler/language/gobject_signal.py
index 721c443..063b2e8 100644
--- a/blueprintcompiler/language/gobject_signal.py
+++ b/blueprintcompiler/language/gobject_signal.py
@@ -51,12 +51,14 @@ class Signal(AstNode):
             ]
         ),
         "=>",
+        Mark("detail_start"),
         Optional(["$", UseLiteral("extern", True)]),
         UseIdent("handler").expected("the name of a function to handle the signal"),
         Match("(").expected("argument list"),
         Optional(UseIdent("object")).expected("object identifier"),
         Match(")").expected(),
         ZeroOrMore(SignalFlag),
+        Mark("detail_end"),
     )
 
     @property
@@ -105,6 +107,16 @@ class Signal(AstNode):
     def gir_class(self):
         return self.parent.parent.gir_class
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.full_name,
+            SymbolKind.Event,
+            self.range,
+            self.group.tokens["name"].range,
+            self.ranges["detail_start", "detail_end"].text,
+        )
+
     @validate("handler")
     def old_extern(self):
         if not self.tokens["extern"]:
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index 6a346ec..e9850f5 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -139,6 +139,16 @@ class A11yProperty(BaseAttribute):
     def value_type(self) -> ValueTypeCtx:
         return ValueTypeCtx(get_types(self.root.gir).get(self.tokens["name"]))
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.name,
+            SymbolKind.Field,
+            self.range,
+            self.group.tokens["name"].range,
+            self.value.range.text,
+        )
+
     @validate("name")
     def is_valid_property(self):
         types = get_types(self.root.gir)
@@ -172,6 +182,15 @@ class ExtAccessibility(AstNode):
     def properties(self) -> T.List[A11yProperty]:
         return self.children[A11yProperty]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "accessibility",
+            SymbolKind.Struct,
+            self.range,
+            self.group.tokens["accessibility"].range,
+        )
+
     @validate("accessibility")
     def container_is_widget(self):
         validate_parent_type(self, "Gtk", "Widget", "accessibility properties")
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index e6c804e..4c6fda9 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -31,13 +31,23 @@ class Item(AstNode):
     ]
 
     @property
-    def name(self) -> str:
+    def name(self) -> T.Optional[str]:
         return self.tokens["name"]
 
     @property
     def value(self) -> StringValue:
         return self.children[StringValue][0]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.value.range.text,
+            SymbolKind.String,
+            self.range,
+            self.value.range,
+            self.name,
+        )
+
     @validate("name")
     def unique_in_parent(self):
         if self.name is not None:
@@ -54,6 +64,15 @@ class ExtComboBoxItems(AstNode):
         "]",
     ]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "items",
+            SymbolKind.Array,
+            self.range,
+            self.group.tokens["items"].range,
+        )
+
     @validate("items")
     def container_is_combo_box_text(self):
         validate_parent_type(self, "Gtk", "ComboBoxText", "combo box items")
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 53cd102..1be83e8 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -23,6 +23,15 @@ from .gobject_object import ObjectContent, validate_parent_type
 
 
 class Filters(AstNode):
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.tokens["tag_name"],
+            SymbolKind.Array,
+            self.range,
+            self.group.tokens[self.tokens["tag_name"]].range,
+        )
+
     @validate()
     def container_is_file_filter(self):
         validate_parent_type(self, "Gtk", "FileFilter", "file filter properties")
@@ -46,6 +55,15 @@ class FilterString(AstNode):
     def item(self) -> str:
         return self.tokens["name"]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.item,
+            SymbolKind.String,
+            self.range,
+            self.group.tokens["name"].range,
+        )
+
     @validate()
     def unique_in_parent(self):
         self.validate_unique_in_parent(
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index 7632c7a..892e0c6 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -36,6 +36,16 @@ class LayoutProperty(AstNode):
     def value(self) -> Value:
         return self.children[Value][0]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.name,
+            SymbolKind.Field,
+            self.range,
+            self.group.tokens["name"].range,
+            self.value.range.text,
+        )
+
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
         # there isn't really a way to validate these
@@ -56,6 +66,15 @@ class ExtLayout(AstNode):
         Until(LayoutProperty, "}"),
     )
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "layout",
+            SymbolKind.Struct,
+            self.range,
+            self.group.tokens["layout"].range,
+        )
+
     @validate("layout")
     def container_is_widget(self):
         validate_parent_type(self, "Gtk", "Widget", "layout properties")
diff --git a/blueprintcompiler/language/gtk_list_item_factory.py b/blueprintcompiler/language/gtk_list_item_factory.py
index ba2a27f..7d05422 100644
--- a/blueprintcompiler/language/gtk_list_item_factory.py
+++ b/blueprintcompiler/language/gtk_list_item_factory.py
@@ -1,5 +1,9 @@
+import typing as T
+
+from blueprintcompiler.errors import T
+from blueprintcompiler.lsp_utils import DocumentSymbol
+
 from ..ast_utils import AstNode, validate
-from ..parse_tree import Keyword
 from .common import *
 from .contexts import ScopeCtx
 from .gobject_object import ObjectContent, validate_parent_type
@@ -17,6 +21,15 @@ class ExtListItemFactory(AstNode):
     def signature(self) -> str:
         return f"template {self.gir_class.full_name}"
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.signature,
+            SymbolKind.Object,
+            self.range,
+            self.group.tokens["id"].range,
+        )
+
     @property
     def type_name(self) -> T.Optional[TypeName]:
         if len(self.children[TypeName]) == 1:
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 824ec5c..e1bbd57 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -42,6 +42,16 @@ class Menu(AstNode):
         else:
             return "Gio.Menu"
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.tokens["tag"],
+            SymbolKind.Object,
+            self.range,
+            self.group.tokens[self.tokens["tag"]].range,
+            self.id,
+        )
+
     @property
     def tag(self) -> str:
         return self.tokens["tag"]
@@ -72,6 +82,18 @@ class MenuAttribute(AstNode):
     def value(self) -> StringValue:
         return self.children[StringValue][0]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.name,
+            SymbolKind.Field,
+            self.range,
+            self.group.tokens["name"].range
+            if self.group.tokens["name"]
+            else self.range,
+            self.value.range.text,
+        )
+
     @context(ValueTypeCtx)
     def value_type(self) -> ValueTypeCtx:
         return ValueTypeCtx(None)
@@ -98,7 +120,7 @@ menu_attribute = Group(
 menu_section = Group(
     Menu,
     [
-        "section",
+        Keyword("section"),
         UseLiteral("tag", "section"),
         Optional(UseIdent("id")),
         Match("{").expected(),
@@ -109,7 +131,7 @@ menu_section = Group(
 menu_submenu = Group(
     Menu,
     [
-        "submenu",
+        Keyword("submenu"),
         UseLiteral("tag", "submenu"),
         Optional(UseIdent("id")),
         Match("{").expected(),
@@ -120,7 +142,7 @@ menu_submenu = Group(
 menu_item = Group(
     Menu,
     [
-        "item",
+        Keyword("item"),
         UseLiteral("tag", "item"),
         Match("{").expected(),
         Until(menu_attribute, "}"),
@@ -130,7 +152,7 @@ menu_item = Group(
 menu_item_shorthand = Group(
     Menu,
     [
-        "item",
+        Keyword("item"),
         UseLiteral("tag", "item"),
         "(",
         Group(
diff --git a/blueprintcompiler/language/gtk_scale.py b/blueprintcompiler/language/gtk_scale.py
index 18452e1..504e290 100644
--- a/blueprintcompiler/language/gtk_scale.py
+++ b/blueprintcompiler/language/gtk_scale.py
@@ -58,6 +58,16 @@ class ExtScaleMark(AstNode):
         else:
             return None
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            str(self.value),
+            SymbolKind.Field,
+            self.range,
+            self.group.tokens["mark"].range,
+            self.label.string if self.label else None,
+        )
+
     @docs("position")
     def position_docs(self) -> T.Optional[str]:
         if member := self.root.gir.get_type("PositionType", "Gtk").members.get(
@@ -88,6 +98,15 @@ class ExtScaleMarks(AstNode):
     def marks(self) -> T.List[ExtScaleMark]:
         return self.children
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "marks",
+            SymbolKind.Array,
+            self.range,
+            self.group.tokens["marks"].range,
+        )
+
     @validate("marks")
     def container_is_size_group(self):
         validate_parent_type(self, "Gtk", "Scale", "scale marks")
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index 2a10a35..60af861 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -30,6 +30,15 @@ class Widget(AstNode):
     def name(self) -> str:
         return self.tokens["name"]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.name,
+            SymbolKind.Field,
+            self.range,
+            self.group.tokens["name"].range,
+        )
+
     @validate("name")
     def obj_widget(self):
         object = self.context[ScopeCtx].objects.get(self.tokens["name"])
@@ -62,6 +71,15 @@ class ExtSizeGroupWidgets(AstNode):
         "]",
     ]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "widgets",
+            SymbolKind.Array,
+            self.range,
+            self.group.tokens["widgets"].range,
+        )
+
     @validate("widgets")
     def container_is_size_group(self):
         validate_parent_type(self, "Gtk", "SizeGroup", "size group properties")
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index 455960e..37a46ec 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -30,6 +30,15 @@ class Item(AstNode):
     def child(self) -> StringValue:
         return self.children[StringValue][0]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.child.range.text,
+            SymbolKind.String,
+            self.range,
+            self.range,
+        )
+
 
 class ExtStringListStrings(AstNode):
     grammar = [
@@ -39,6 +48,15 @@ class ExtStringListStrings(AstNode):
         "]",
     ]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "strings",
+            SymbolKind.Array,
+            self.range,
+            self.group.tokens["strings"].range,
+        )
+
     @validate("items")
     def container_is_string_list(self):
         validate_parent_type(self, "Gtk", "StringList", "StringList items")
diff --git a/blueprintcompiler/language/gtk_styles.py b/blueprintcompiler/language/gtk_styles.py
index 8152b82..26c0e74 100644
--- a/blueprintcompiler/language/gtk_styles.py
+++ b/blueprintcompiler/language/gtk_styles.py
@@ -29,6 +29,15 @@ class StyleClass(AstNode):
     def name(self) -> str:
         return self.tokens["name"]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.name,
+            SymbolKind.String,
+            self.range,
+            self.range,
+        )
+
     @validate("name")
     def unique_in_parent(self):
         self.validate_unique_in_parent(
@@ -44,6 +53,15 @@ class ExtStyles(AstNode):
         "]",
     ]
 
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            "styles",
+            SymbolKind.Array,
+            self.range,
+            self.group.tokens["styles"].range,
+        )
+
     @validate("styles")
     def container_is_widget(self):
         validate_parent_type(self, "Gtk", "Widget", "style classes")
diff --git a/blueprintcompiler/language/gtkbuilder_template.py b/blueprintcompiler/language/gtkbuilder_template.py
index 7af5cc8..e1e2131 100644
--- a/blueprintcompiler/language/gtkbuilder_template.py
+++ b/blueprintcompiler/language/gtkbuilder_template.py
@@ -46,10 +46,19 @@ class Template(Object):
 
     @property
     def signature(self) -> str:
-        if self.parent_type:
-            return f"template {self.gir_class.full_name} : {self.parent_type.gir_type.full_name}"
+        if self.parent_type and self.parent_type.gir_type:
+            return f"template {self.class_name.as_string} : {self.parent_type.gir_type.full_name}"
         else:
-            return f"template {self.gir_class.full_name}"
+            return f"template {self.class_name.as_string}"
+
+    @property
+    def document_symbol(self) -> DocumentSymbol:
+        return DocumentSymbol(
+            self.signature,
+            SymbolKind.Object,
+            self.range,
+            self.group.tokens["id"].range,
+        )
 
     @property
     def gir_class(self) -> GirType:
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 54a36c8..ec161a8 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -203,6 +203,7 @@ class LanguageServer:
                     "completionProvider": {},
                     "codeActionProvider": {},
                     "hoverProvider": True,
+                    "documentSymbolProvider": True,
                 },
                 "serverInfo": {
                     "name": "Blueprint",
@@ -363,6 +364,31 @@ class LanguageServer:
 
         self._send_response(id, actions)
 
+    @command("textDocument/documentSymbol")
+    def document_symbols(self, id, params):
+        open_file = self._open_files[params["textDocument"]["uri"]]
+        symbols = open_file.ast.get_document_symbols()
+
+        def to_json(symbol: DocumentSymbol):
+            result = {
+                "name": symbol.name,
+                "kind": symbol.kind,
+                "range": utils.idxs_to_range(
+                    symbol.range.start, symbol.range.end, open_file.text
+                ),
+                "selectionRange": utils.idxs_to_range(
+                    symbol.selection_range.start,
+                    symbol.selection_range.end,
+                    open_file.text,
+                ),
+                "children": [to_json(child) for child in symbol.children],
+            }
+            if symbol.detail is not None:
+                result["detail"] = symbol.detail
+            return result
+
+        self._send_response(id, [to_json(symbol) for symbol in symbols])
+
     def _send_file_updates(self, open_file: OpenFile):
         self._send_notification(
             "textDocument/publishDiagnostics",
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 2d1072e..2225ba2 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -20,9 +20,10 @@
 
 import enum
 import typing as T
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from .errors import *
+from .tokenizer import Range
 from .utils import *
 
 
@@ -129,3 +130,42 @@ class SemanticToken:
     start: int
     end: int
     type: SemanticTokenType
+
+
+class SymbolKind(enum.IntEnum):
+    File = 1
+    Module = 2
+    Namespace = 3
+    Package = 4
+    Class = 5
+    Method = 6
+    Property = 7
+    Field = 8
+    Constructor = 9
+    Enum = 10
+    Interface = 11
+    Function = 12
+    Variable = 13
+    Constant = 14
+    String = 15
+    Number = 16
+    Boolean = 17
+    Array = 18
+    Object = 19
+    Key = 20
+    Null = 21
+    EnumMember = 22
+    Struct = 23
+    Event = 24
+    Operator = 25
+    TypeParameter = 26
+
+
+@dataclass
+class DocumentSymbol:
+    name: str
+    kind: SymbolKind
+    range: Range
+    selection_range: Range
+    detail: T.Optional[str] = None
+    children: T.List["DocumentSymbol"] = field(default_factory=list)
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index 3ddac69..b29bd96 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -20,7 +20,6 @@
 """ Utilities for parsing an AST from a token stream. """
 
 import typing as T
-from collections import defaultdict
 from enum import Enum
 
 from .ast_utils import AstNode
@@ -31,7 +30,7 @@ from .errors import (
     UnexpectedTokenError,
     assert_true,
 )
-from .tokenizer import Token, TokenType
+from .tokenizer import Range, Token, TokenType
 
 SKIP_TOKENS = [TokenType.COMMENT, TokenType.WHITESPACE]
 
@@ -63,14 +62,16 @@ class ParseGroup:
     be converted to AST nodes by passing the children and key=value pairs to
     the AST node constructor."""
 
-    def __init__(self, ast_type: T.Type[AstNode], start: int):
+    def __init__(self, ast_type: T.Type[AstNode], start: int, text: str):
         self.ast_type = ast_type
         self.children: T.List[ParseGroup] = []
         self.keys: T.Dict[str, T.Any] = {}
         self.tokens: T.Dict[str, T.Optional[Token]] = {}
+        self.ranges: T.Dict[str, Range] = {}
         self.start = start
         self.end: T.Optional[int] = None
         self.incomplete = False
+        self.text = text
 
     def add_child(self, child: "ParseGroup"):
         self.children.append(child)
@@ -81,6 +82,10 @@ class ParseGroup:
         self.keys[key] = val
         self.tokens[key] = token
 
+    def set_range(self, key: str, range: Range):
+        assert_true(key not in self.ranges)
+        self.ranges[key] = range
+
     def to_ast(self):
         """Creates an AST node from the match group."""
         children = [child.to_ast() for child in self.children]
@@ -104,8 +109,9 @@ class ParseGroup:
 class ParseContext:
     """Contains the state of the parser."""
 
-    def __init__(self, tokens: T.List[Token], index=0):
+    def __init__(self, tokens: T.List[Token], text: str, index=0):
         self.tokens = tokens
+        self.text = text
 
         self.binding_power = 0
         self.index = index
@@ -113,6 +119,7 @@ class ParseContext:
         self.group: T.Optional[ParseGroup] = None
         self.group_keys: T.Dict[str, T.Tuple[T.Any, T.Optional[Token]]] = {}
         self.group_children: T.List[ParseGroup] = []
+        self.group_ranges: T.Dict[str, Range] = {}
         self.last_group: T.Optional[ParseGroup] = None
         self.group_incomplete = False
 
@@ -124,7 +131,7 @@ class ParseContext:
         context will be used to parse one node. If parsing is successful, the
         new context will be applied to "self". If parsing fails, the new
         context will be discarded."""
-        ctx = ParseContext(self.tokens, self.index)
+        ctx = ParseContext(self.tokens, self.text, self.index)
         ctx.errors = self.errors
         ctx.warnings = self.warnings
         ctx.binding_power = self.binding_power
@@ -140,6 +147,8 @@ class ParseContext:
                 other.group.set_val(key, val, token)
             for child in other.group_children:
                 other.group.add_child(child)
+            for key, range in other.group_ranges.items():
+                other.group.set_range(key, range)
             other.group.end = other.tokens[other.index - 1].end
             other.group.incomplete = other.group_incomplete
             self.group_children.append(other.group)
@@ -148,6 +157,7 @@ class ParseContext:
             # its matched values
             self.group_keys = {**self.group_keys, **other.group_keys}
             self.group_children += other.group_children
+            self.group_ranges = {**self.group_ranges, **other.group_ranges}
             self.group_incomplete |= other.group_incomplete
 
         self.index = other.index
@@ -161,13 +171,19 @@ class ParseContext:
     def start_group(self, ast_type: T.Type[AstNode]):
         """Sets this context to have its own match group."""
         assert_true(self.group is None)
-        self.group = ParseGroup(ast_type, self.tokens[self.index].start)
+        self.group = ParseGroup(ast_type, self.tokens[self.index].start, self.text)
 
     def set_group_val(self, key: str, value: T.Any, token: T.Optional[Token]):
         """Sets a matched key=value pair on the current match group."""
         assert_true(key not in self.group_keys)
         self.group_keys[key] = (value, token)
 
+    def set_mark(self, key: str):
+        """Sets a zero-length range on the current match group at the current position."""
+        self.group_ranges[key] = Range(
+            self.tokens[self.index].start, self.tokens[self.index].start, self.text
+        )
+
     def set_group_incomplete(self):
         """Marks the current match group as incomplete (it could not be fully
         parsed, but the parser recovered)."""
@@ -604,6 +620,15 @@ class Keyword(ParseNode):
         return str(token) == self.kw
 
 
+class Mark(ParseNode):
+    def __init__(self, key: str):
+        self.key = key
+
+    def _parse(self, ctx: ParseContext):
+        ctx.set_mark(self.key)
+        return True
+
+
 def to_parse_node(value) -> ParseNode:
     if isinstance(value, str):
         return Match(value)
diff --git a/blueprintcompiler/parser.py b/blueprintcompiler/parser.py
index 8b50de5..a9cc0ae 100644
--- a/blueprintcompiler/parser.py
+++ b/blueprintcompiler/parser.py
@@ -30,7 +30,8 @@ def parse(
     """Parses a list of tokens into an abstract syntax tree."""
 
     try:
-        ctx = ParseContext(tokens)
+        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
 
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index bde8dd1..64abf0f 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -20,6 +20,7 @@
 
 import re
 import typing as T
+from dataclasses import dataclass
 from enum import Enum
 
 from .errors import CompileError, CompilerBugError
@@ -62,6 +63,10 @@ class Token:
     def __str__(self) -> str:
         return self.string[self.start : self.end]
 
+    @property
+    def range(self) -> "Range":
+        return Range(self.start, self.end, self.string)
+
     def get_number(self) -> T.Union[int, float]:
         if self.type != TokenType.NUMBER:
             raise CompilerBugError()
@@ -103,3 +108,22 @@ def _tokenize(ui_ml: str):
 
 def tokenize(data: str) -> T.List[Token]:
     return list(_tokenize(data))
+
+
+@dataclass
+class Range:
+    start: int
+    end: int
+    original_text: str
+
+    @property
+    def text(self) -> str:
+        return self.original_text[self.start : self.end]
+
+    @staticmethod
+    def join(a: T.Optional["Range"], b: T.Optional["Range"]) -> T.Optional["Range"]:
+        if a is None:
+            return b
+        if b is None:
+            return a
+        return Range(min(a.start, b.start), max(a.end, b.end), a.original_text)
diff --git a/tests/test_samples.py b/tests/test_samples.py
index bacca80..9ad8cc0 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -40,13 +40,12 @@ from blueprintcompiler.tokenizer import Token, TokenType, tokenize
 
 
 class TestSamples(unittest.TestCase):
-    def assert_docs_dont_crash(self, text, ast):
+    def assert_ast_doesnt_crash(self, text, tokens, ast):
         for i in range(len(text)):
             ast.get_docs(i)
-
-    def assert_completions_dont_crash(self, text, ast, tokens):
         for i in range(len(text)):
             list(complete(ast, tokens, i))
+        ast.get_document_symbols()
 
     def assert_sample(self, name, skip_run=False):
         print(f'assert_sample("{name}", skip_run={skip_run})')
@@ -79,8 +78,7 @@ class TestSamples(unittest.TestCase):
                 print("\n".join(diff))
                 raise AssertionError()
 
-            self.assert_docs_dont_crash(blueprint, ast)
-            self.assert_completions_dont_crash(blueprint, ast, tokens)
+            self.assert_ast_doesnt_crash(blueprint, tokens, ast)
         except PrintableError as e:  # pragma: no cover
             e.pretty_print(name + ".blp", blueprint)
             raise AssertionError()
@@ -105,8 +103,7 @@ class TestSamples(unittest.TestCase):
             ast, errors, warnings = parser.parse(tokens)
 
             if ast is not None:
-                self.assert_docs_dont_crash(blueprint, ast)
-                self.assert_completions_dont_crash(blueprint, ast, tokens)
+                self.assert_ast_doesnt_crash(blueprint, tokens, ast)
 
             if errors:
                 raise errors

From 62f74178f7c9168d578c5295190a0976eed43e85 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 25 Jul 2023 18:40:05 -0500
Subject: [PATCH 158/290] lsp: Implement "go to definition"

---
 blueprintcompiler/ast_utils.py       | 14 ++++++++++----
 blueprintcompiler/language/common.py |  1 +
 blueprintcompiler/language/values.py | 10 ++++++++++
 blueprintcompiler/lsp.py             | 16 ++++++++++++++++
 blueprintcompiler/lsp_utils.py       | 15 +++++++++++++++
 blueprintcompiler/parse_tree.py      |  2 ++
 blueprintcompiler/tokenizer.py       | 10 ++++++++++
 7 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 59331f9..81958aa 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -22,7 +22,7 @@ from collections import ChainMap, defaultdict
 from functools import cached_property
 
 from .errors import *
-from .lsp_utils import DocumentSymbol, SemanticToken
+from .lsp_utils import DocumentSymbol, SemanticToken, LocationLink
 from .tokenizer import Range
 
 TType = T.TypeVar("TType")
@@ -185,9 +185,8 @@ class AstNode:
                 return getattr(self, name)
 
         for child in self.children:
-            if child.group.start <= idx < child.group.end:
-                docs = child.get_docs(idx)
-                if docs is not None:
+            if idx in child.range:
+                if docs := child.get_docs(idx):
                     return docs
 
         return None
@@ -196,6 +195,13 @@ class AstNode:
         for child in self.children:
             yield from child.get_semantic_tokens()
 
+    def get_reference(self, idx: int) -> T.Optional[LocationLink]:
+        for child in self.children:
+            if idx in child.range:
+                if ref := child.get_reference(idx):
+                    return ref
+        return None
+
     @property
     def document_symbol(self) -> T.Optional[DocumentSymbol]:
         return None
diff --git a/blueprintcompiler/language/common.py b/blueprintcompiler/language/common.py
index e1bfa36..8a6ce9b 100644
--- a/blueprintcompiler/language/common.py
+++ b/blueprintcompiler/language/common.py
@@ -50,6 +50,7 @@ from ..lsp_utils import (
     Completion,
     CompletionItemKind,
     DocumentSymbol,
+    LocationLink,
     SemanticToken,
     SemanticTokenType,
     SymbolKind,
diff --git a/blueprintcompiler/language/values.py b/blueprintcompiler/language/values.py
index 888d6a1..b9d719f 100644
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@@ -339,6 +339,16 @@ class IdentLiteral(AstNode):
             token = self.group.tokens["value"]
             yield SemanticToken(token.start, token.end, SemanticTokenType.EnumMember)
 
+    def get_reference(self, _idx: int) -> T.Optional[LocationLink]:
+        ref = self.context[ScopeCtx].objects.get(self.ident)
+        if ref is None and self.root.is_legacy_template(self.ident):
+            ref = self.root.template
+
+        if ref:
+            return LocationLink(self.range, ref.range, ref.ranges["id"])
+        else:
+            return None
+
 
 class Literal(AstNode):
     grammar = AnyOf(
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index ec161a8..a7e5f9b 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -204,6 +204,7 @@ class LanguageServer:
                     "codeActionProvider": {},
                     "hoverProvider": True,
                     "documentSymbolProvider": True,
+                    "definitionProvider": True,
                 },
                 "serverInfo": {
                     "name": "Blueprint",
@@ -389,6 +390,21 @@ class LanguageServer:
 
         self._send_response(id, [to_json(symbol) for symbol in symbols])
 
+    @command("textDocument/definition")
+    def definition(self, id, params):
+        open_file = self._open_files[params["textDocument"]["uri"]]
+        idx = utils.pos_to_idx(
+            params["position"]["line"], params["position"]["character"], open_file.text
+        )
+        definition = open_file.ast.get_reference(idx)
+        if definition is None:
+            self._send_response(id, None)
+        else:
+            self._send_response(
+                id,
+                definition.to_json(open_file.uri),
+            )
+
     def _send_file_updates(self, open_file: OpenFile):
         self._send_notification(
             "textDocument/publishDiagnostics",
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 2225ba2..9da8461 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -169,3 +169,18 @@ class DocumentSymbol:
     selection_range: Range
     detail: T.Optional[str] = None
     children: T.List["DocumentSymbol"] = field(default_factory=list)
+
+
+@dataclass
+class LocationLink:
+    origin_selection_range: Range
+    target_range: Range
+    target_selection_range: Range
+
+    def to_json(self, target_uri: str):
+        return {
+            "originSelectionRange": self.origin_selection_range.to_json(),
+            "targetUri": target_uri,
+            "targetRange": self.target_range.to_json(),
+            "targetSelectionRange": self.target_selection_range.to_json(),
+        }
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index b29bd96..a8efddb 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -81,6 +81,8 @@ class ParseGroup:
 
         self.keys[key] = val
         self.tokens[key] = token
+        if token:
+            self.set_range(key, token.range)
 
     def set_range(self, key: str, range: Range):
         assert_true(key not in self.ranges)
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 64abf0f..e1066ac 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -24,6 +24,7 @@ from dataclasses import dataclass
 from enum import Enum
 
 from .errors import CompileError, CompilerBugError
+from . import utils
 
 
 class TokenType(Enum):
@@ -127,3 +128,12 @@ class Range:
         if b is None:
             return a
         return Range(min(a.start, b.start), max(a.end, b.end), a.original_text)
+
+    def __contains__(self, other: T.Union[int, "Range"]) -> bool:
+        if isinstance(other, int):
+            return self.start <= other <= self.end
+        else:
+            return self.start <= other.start and self.end >= other.end
+
+    def to_json(self):
+        return utils.idxs_to_range(self.start, self.end, self.original_text)

From a9cb423b3b387c7bb3687b838118c256d7b86b88 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 25 Jul 2023 18:52:18 -0500
Subject: [PATCH 159/290] lsp: Add missing semantic highlight

---
 blueprintcompiler/language/gtk_scale.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/blueprintcompiler/language/gtk_scale.py b/blueprintcompiler/language/gtk_scale.py
index 504e290..a2c9168 100644
--- a/blueprintcompiler/language/gtk_scale.py
+++ b/blueprintcompiler/language/gtk_scale.py
@@ -68,6 +68,14 @@ class ExtScaleMark(AstNode):
             self.label.string if self.label else None,
         )
 
+    def get_semantic_tokens(self) -> T.Iterator[SemanticToken]:
+        if range := self.ranges["position"]:
+            yield SemanticToken(
+                range.start,
+                range.end,
+                SemanticTokenType.EnumMember,
+            )
+
     @docs("position")
     def position_docs(self) -> T.Optional[str]:
         if member := self.root.gir.get_type("PositionType", "Gtk").members.get(

From 56274d7c1faa430cb8747009d974fec4d1b4a321 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 25 Jul 2023 18:54:58 -0500
Subject: [PATCH 160/290] completions: Fix signal completion

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

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index b189bf1..56db53a 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -158,7 +158,7 @@ def signal_completer(ast_node, match_variables):
             yield Completion(
                 signal,
                 CompletionItemKind.Property,
-                snippet=f"{signal} => ${{1:{name}_{signal.replace('-', '_')}}}()$0;",
+                snippet=f"{signal} => \$${{1:{name}_{signal.replace('-', '_')}}}()$0;",
             )
 
 

From 3bcc9f4cbd2158fa7b90fb3280dbb1b7e03ddc33 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 25 Jul 2023 20:01:41 -0500
Subject: [PATCH 161/290] Use the new Range class in more places

---
 blueprintcompiler/ast_utils.py         | 35 ++++++--------
 blueprintcompiler/errors.py            | 21 ++++----
 blueprintcompiler/language/contexts.py |  3 +-
 blueprintcompiler/language/ui.py       |  3 +-
 blueprintcompiler/lsp.py               | 67 ++++++++++++--------------
 blueprintcompiler/main.py              |  6 +--
 blueprintcompiler/parse_tree.py        | 19 +++++---
 blueprintcompiler/parser.py            |  2 +-
 blueprintcompiler/tokenizer.py         | 19 ++++++--
 tests/test_samples.py                  |  6 +--
 10 files changed, 91 insertions(+), 90 deletions(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 81958aa..56501e7 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -229,20 +229,23 @@ class AstNode:
                         error,
                         references=[
                             ErrorReference(
-                                child.group.start,
-                                child.group.end,
+                                child.range,
                                 "previous declaration was here",
                             )
                         ],
                     )
 
 
-def validate(token_name=None, end_token_name=None, skip_incomplete=False):
+def validate(
+    token_name: T.Optional[str] = None,
+    end_token_name: T.Optional[str] = None,
+    skip_incomplete: bool = False,
+):
     """Decorator for functions that validate an AST node. Exceptions raised
     during validation are marked with range information from the tokens."""
 
     def decorator(func):
-        def inner(self):
+        def inner(self: AstNode):
             if skip_incomplete and self.incomplete:
                 return
 
@@ -254,22 +257,14 @@ def validate(token_name=None, end_token_name=None, skip_incomplete=False):
                 if self.incomplete:
                     return
 
-                # This mess of code sets the error's start and end positions
-                # from the tokens passed to the decorator, if they have not
-                # already been set
-                if e.start is None:
-                    if token := self.group.tokens.get(token_name):
-                        e.start = token.start
-                    else:
-                        e.start = self.group.start
-
-                if e.end is None:
-                    if token := self.group.tokens.get(end_token_name):
-                        e.end = token.end
-                    elif token := self.group.tokens.get(token_name):
-                        e.end = token.end
-                    else:
-                        e.end = self.group.end
+                if e.range is None:
+                    e.range = (
+                        Range.join(
+                            self.ranges[token_name],
+                            self.ranges[end_token_name],
+                        )
+                        or self.range
+                    )
 
                 # Re-raise the exception
                 raise e
diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index e89ec31..773122a 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -23,6 +23,7 @@ import typing as T
 from dataclasses import dataclass
 
 from . import utils
+from .tokenizer import Range
 from .utils import Colors
 
 
@@ -36,8 +37,7 @@ class PrintableError(Exception):
 
 @dataclass
 class ErrorReference:
-    start: int
-    end: int
+    range: Range
     message: str
 
 
@@ -50,8 +50,7 @@ class CompileError(PrintableError):
     def __init__(
         self,
         message: str,
-        start: T.Optional[int] = None,
-        end: T.Optional[int] = None,
+        range: T.Optional[Range] = None,
         did_you_mean: T.Optional[T.Tuple[str, T.List[str]]] = None,
         hints: T.Optional[T.List[str]] = None,
         actions: T.Optional[T.List["CodeAction"]] = None,
@@ -61,8 +60,7 @@ class CompileError(PrintableError):
         super().__init__(message)
 
         self.message = message
-        self.start = start
-        self.end = end
+        self.range = range
         self.hints = hints or []
         self.actions = actions or []
         self.references = references or []
@@ -92,9 +90,9 @@ class CompileError(PrintableError):
             self.hint("Are your dependencies up to date?")
 
     def pretty_print(self, filename: str, code: str, stream=sys.stdout) -> None:
-        assert self.start is not None
+        assert self.range is not None
 
-        line_num, col_num = utils.idx_to_pos(self.start + 1, code)
+        line_num, col_num = utils.idx_to_pos(self.range.start + 1, code)
         line = code.splitlines(True)[line_num]
 
         # Display 1-based line numbers
@@ -110,7 +108,7 @@ at {filename} line {line_num} column {col_num}:
             stream.write(f"{Colors.FAINT}hint: {hint}{Colors.CLEAR}\n")
 
         for ref in self.references:
-            line_num, col_num = utils.idx_to_pos(ref.start + 1, code)
+            line_num, col_num = utils.idx_to_pos(ref.range.start + 1, code)
             line = code.splitlines(True)[line_num]
             line_num += 1
 
@@ -138,14 +136,15 @@ class UpgradeWarning(CompileWarning):
 
 
 class UnexpectedTokenError(CompileError):
-    def __init__(self, start, end) -> None:
-        super().__init__("Unexpected tokens", start, end)
+    def __init__(self, range: Range) -> None:
+        super().__init__("Unexpected tokens", range)
 
 
 @dataclass
 class CodeAction:
     title: str
     replace_with: str
+    edit_range: T.Optional[Range] = None
 
 
 class MultipleErrors(PrintableError):
diff --git a/blueprintcompiler/language/contexts.py b/blueprintcompiler/language/contexts.py
index 2f8e22e..c5e97b3 100644
--- a/blueprintcompiler/language/contexts.py
+++ b/blueprintcompiler/language/contexts.py
@@ -70,8 +70,7 @@ class ScopeCtx:
                 ):
                     raise CompileError(
                         f"Duplicate object ID '{obj.tokens['id']}'",
-                        token.start,
-                        token.end,
+                        token.range,
                     )
             passed[obj.tokens["id"]] = obj
 
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index 1b7e6e9..3ce23da 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -62,8 +62,7 @@ class UI(AstNode):
                 else:
                     gir_ctx.not_found_namespaces.add(i.namespace)
             except CompileError as e:
-                e.start = i.group.tokens["namespace"].start
-                e.end = i.group.tokens["version"].end
+                e.range = i.range
                 self._gir_errors.append(e)
 
         return gir_ctx
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index a7e5f9b..19c02e5 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -24,10 +24,12 @@ import traceback
 import typing as T
 
 from . import decompiler, parser, tokenizer, utils, xml_reader
+from .ast_utils import AstNode
 from .completions import complete
-from .errors import CompileError, MultipleErrors, PrintableError
+from .errors import CompileError, MultipleErrors
 from .lsp_utils import *
 from .outputs.xml import XmlOutput
+from .tokenizer import Token
 
 
 def printerr(*args, **kwargs):
@@ -43,16 +45,16 @@ def command(json_method: str):
 
 
 class OpenFile:
-    def __init__(self, uri: str, text: str, version: int):
+    def __init__(self, uri: str, text: str, version: int) -> None:
         self.uri = uri
         self.text = text
         self.version = version
-        self.ast = None
-        self.tokens = None
+        self.ast: T.Optional[AstNode] = None
+        self.tokens: T.Optional[list[Token]] = None
 
         self._update()
 
-    def apply_changes(self, changes):
+    def apply_changes(self, changes) -> None:
         for change in changes:
             if "range" not in change:
                 self.text = change["text"]
@@ -70,8 +72,8 @@ class OpenFile:
             self.text = self.text[:start] + change["text"] + self.text[end:]
         self._update()
 
-    def _update(self):
-        self.diagnostics = []
+    def _update(self) -> None:
+        self.diagnostics: list[CompileError] = []
         try:
             self.tokens = tokenizer.tokenize(self.text)
             self.ast, errors, warnings = parser.parse(self.tokens)
@@ -327,14 +329,17 @@ class LanguageServer:
     def code_actions(self, id, params):
         open_file = self._open_files[params["textDocument"]["uri"]]
 
-        range_start = utils.pos_to_idx(
-            params["range"]["start"]["line"],
-            params["range"]["start"]["character"],
-            open_file.text,
-        )
-        range_end = utils.pos_to_idx(
-            params["range"]["end"]["line"],
-            params["range"]["end"]["character"],
+        range = Range(
+            utils.pos_to_idx(
+                params["range"]["start"]["line"],
+                params["range"]["start"]["character"],
+                open_file.text,
+            ),
+            utils.pos_to_idx(
+                params["range"]["end"]["line"],
+                params["range"]["end"]["character"],
+                open_file.text,
+            ),
             open_file.text,
         )
 
@@ -342,16 +347,14 @@ class LanguageServer:
             {
                 "title": action.title,
                 "kind": "quickfix",
-                "diagnostics": [
-                    self._create_diagnostic(open_file.text, open_file.uri, diagnostic)
-                ],
+                "diagnostics": [self._create_diagnostic(open_file.uri, diagnostic)],
                 "edit": {
                     "changes": {
                         open_file.uri: [
                             {
-                                "range": utils.idxs_to_range(
-                                    diagnostic.start, diagnostic.end, open_file.text
-                                ),
+                                "range": action.edit_range.to_json()
+                                if action.edit_range
+                                else diagnostic.range.to_json(),
                                 "newText": action.replace_with,
                             }
                         ]
@@ -359,7 +362,7 @@ class LanguageServer:
                 },
             }
             for diagnostic in open_file.diagnostics
-            if not (diagnostic.end < range_start or diagnostic.start > range_end)
+            if range.overlaps(diagnostic.range)
             for action in diagnostic.actions
         ]
 
@@ -374,14 +377,8 @@ class LanguageServer:
             result = {
                 "name": symbol.name,
                 "kind": symbol.kind,
-                "range": utils.idxs_to_range(
-                    symbol.range.start, symbol.range.end, open_file.text
-                ),
-                "selectionRange": utils.idxs_to_range(
-                    symbol.selection_range.start,
-                    symbol.selection_range.end,
-                    open_file.text,
-                ),
+                "range": symbol.range.to_json(),
+                "selectionRange": symbol.selection_range.to_json(),
                 "children": [to_json(child) for child in symbol.children],
             }
             if symbol.detail is not None:
@@ -411,22 +408,22 @@ class LanguageServer:
             {
                 "uri": open_file.uri,
                 "diagnostics": [
-                    self._create_diagnostic(open_file.text, open_file.uri, err)
+                    self._create_diagnostic(open_file.uri, err)
                     for err in open_file.diagnostics
                 ],
             },
         )
 
-    def _create_diagnostic(self, text: str, uri: str, err: CompileError):
+    def _create_diagnostic(self, uri: str, err: CompileError):
         message = err.message
 
-        assert err.start is not None and err.end is not None
+        assert err.range is not None
 
         for hint in err.hints:
             message += "\nhint: " + hint
 
         result = {
-            "range": utils.idxs_to_range(err.start, err.end, text),
+            "range": err.range.to_json(),
             "message": message,
             "severity": DiagnosticSeverity.Warning
             if isinstance(err, CompileWarning)
@@ -441,7 +438,7 @@ class LanguageServer:
                 {
                     "location": {
                         "uri": uri,
-                        "range": utils.idxs_to_range(ref.start, ref.end, text),
+                        "range": ref.range.to_json(),
                     },
                     "message": ref.message,
                 }
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index db9fb65..416db47 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -24,8 +24,8 @@ import os
 import sys
 import typing as T
 
-from . import decompiler, interactive_port, parser, tokenizer
-from .errors import CompilerBugError, MultipleErrors, PrintableError, report_bug
+from . import interactive_port, parser, tokenizer
+from .errors import CompilerBugError, CompileError, PrintableError, report_bug
 from .gir import add_typelib_search_path
 from .lsp import LanguageServer
 from .outputs import XmlOutput
@@ -157,7 +157,7 @@ class BlueprintApp:
     def cmd_port(self, opts):
         interactive_port.run(opts)
 
-    def _compile(self, data: str) -> T.Tuple[str, T.List[PrintableError]]:
+    def _compile(self, data: str) -> T.Tuple[str, T.List[CompileError]]:
         tokens = tokenizer.tokenize(data)
         ast, errors, warnings = parser.parse(tokens)
 
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index a8efddb..8f3ef31 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -224,11 +224,11 @@ class ParseContext:
         if (
             len(self.errors)
             and isinstance((err := self.errors[-1]), UnexpectedTokenError)
-            and err.end == start
+            and err.range.end == start
         ):
-            err.end = end
+            err.range.end = end
         else:
-            self.errors.append(UnexpectedTokenError(start, end))
+            self.errors.append(UnexpectedTokenError(Range(start, end, self.text)))
 
     def is_eof(self) -> bool:
         return self.index >= len(self.tokens) or self.peek_token().type == TokenType.EOF
@@ -281,10 +281,11 @@ class Err(ParseNode):
             start_idx = ctx.start
             while ctx.tokens[start_idx].type in SKIP_TOKENS:
                 start_idx += 1
-
             start_token = ctx.tokens[start_idx]
-            end_token = ctx.tokens[ctx.index]
-            raise CompileError(self.message, start_token.start, end_token.end)
+
+            raise CompileError(
+                self.message, Range(start_token.start, start_token.start, ctx.text)
+            )
         return True
 
 
@@ -324,7 +325,9 @@ class Fail(ParseNode):
 
             start_token = ctx.tokens[start_idx]
             end_token = ctx.tokens[ctx.index]
-            raise CompileError(self.message, start_token.start, end_token.end)
+            raise CompileError(
+                self.message, Range.join(start_token.range, end_token.range)
+            )
         return True
 
 
@@ -373,7 +376,7 @@ class Statement(ParseNode):
 
         token = ctx.peek_token()
         if str(token) != ";":
-            ctx.errors.append(CompileError("Expected `;`", token.start, token.end))
+            ctx.errors.append(CompileError("Expected `;`", token.range))
         else:
             ctx.next_token()
         return True
diff --git a/blueprintcompiler/parser.py b/blueprintcompiler/parser.py
index a9cc0ae..89e1533 100644
--- a/blueprintcompiler/parser.py
+++ b/blueprintcompiler/parser.py
@@ -26,7 +26,7 @@ from .tokenizer import TokenType
 
 def parse(
     tokens: T.List[Token],
-) -> T.Tuple[T.Optional[UI], T.Optional[MultipleErrors], T.List[PrintableError]]:
+) -> T.Tuple[T.Optional[UI], T.Optional[MultipleErrors], T.List[CompileError]]:
     """Parses a list of tokens into an abstract syntax tree."""
 
     try:
diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index e1066ac..1ab6def 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -23,7 +23,6 @@ import typing as T
 from dataclasses import dataclass
 from enum import Enum
 
-from .errors import CompileError, CompilerBugError
 from . import utils
 
 
@@ -69,6 +68,8 @@ class Token:
         return Range(self.start, self.end, self.string)
 
     def get_number(self) -> T.Union[int, float]:
+        from .errors import CompileError, CompilerBugError
+
         if self.type != TokenType.NUMBER:
             raise CompilerBugError()
 
@@ -81,12 +82,12 @@ class Token:
             else:
                 return int(string)
         except:
-            raise CompileError(
-                f"{str(self)} is not a valid number literal", self.start, self.end
-            )
+            raise CompileError(f"{str(self)} is not a valid number literal", self.range)
 
 
 def _tokenize(ui_ml: str):
+    from .errors import CompileError
+
     i = 0
     while i < len(ui_ml):
         matched = False
@@ -101,7 +102,8 @@ def _tokenize(ui_ml: str):
 
         if not matched:
             raise CompileError(
-                "Could not determine what kind of syntax is meant here", i, i
+                "Could not determine what kind of syntax is meant here",
+                Range(i, i, ui_ml),
             )
 
     yield Token(TokenType.EOF, i, i, ui_ml)
@@ -117,6 +119,10 @@ class Range:
     end: int
     original_text: str
 
+    @property
+    def length(self) -> int:
+        return self.end - self.start
+
     @property
     def text(self) -> str:
         return self.original_text[self.start : self.end]
@@ -137,3 +143,6 @@ class Range:
 
     def to_json(self):
         return utils.idxs_to_range(self.start, self.end, self.original_text)
+
+    def overlaps(self, other: "Range") -> bool:
+        return not (self.end < other.start or self.start > other.end)
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 9ad8cc0..9d891f6 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -113,9 +113,9 @@ class TestSamples(unittest.TestCase):
                 raise MultipleErrors(warnings)
         except PrintableError as e:
 
-            def error_str(error):
-                line, col = utils.idx_to_pos(error.start + 1, blueprint)
-                len = error.end - error.start
+            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):

From 35ee058192cd0a22dbbed15de7aa61bff9ae51e0 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 25 Jul 2023 20:02:03 -0500
Subject: [PATCH 162/290] lsp: Add code action to add missing imports

---
 blueprintcompiler/gir.py            | 27 +++++++++++++++++++++++++--
 blueprintcompiler/language/types.py | 11 ++++++++++-
 blueprintcompiler/language/ui.py    | 12 ++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 3642bd6..635ef7c 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -18,7 +18,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 import os
-import sys
 import typing as T
 from functools import cached_property
 
@@ -29,6 +28,7 @@ from gi.repository import GIRepository  # type: ignore
 
 from . import typelib, xml_reader
 from .errors import CompileError, CompilerBugError
+from .lsp_utils import CodeAction
 
 _namespace_cache: T.Dict[str, "Namespace"] = {}
 _xml_cache = {}
@@ -65,6 +65,27 @@ def get_namespace(namespace: str, version: str) -> "Namespace":
     return _namespace_cache[filename]
 
 
+_available_namespaces: list[tuple[str, str]] = []
+
+
+def get_available_namespaces() -> T.List[T.Tuple[str, str]]:
+    if len(_available_namespaces):
+        return _available_namespaces
+
+    search_paths: list[str] = [
+        *GIRepository.Repository.get_search_path(),
+        *_user_search_paths,
+    ]
+
+    for search_path in search_paths:
+        for filename in os.listdir(search_path):
+            if filename.endswith(".typelib"):
+                namespace, version = filename.removesuffix(".typelib").rsplit("-", 1)
+                _available_namespaces.append((namespace, version))
+
+    return _available_namespaces
+
+
 def get_xml(namespace: str, version: str):
     search_paths = []
 
@@ -1011,9 +1032,11 @@ class GirContext:
         ns = ns or "Gtk"
 
         if ns not in self.namespaces and ns not in self.not_found_namespaces:
+            all_available = list(set(ns for ns, _version in get_available_namespaces()))
+
             raise CompileError(
                 f"Namespace {ns} was not imported",
-                did_you_mean=(ns, self.namespaces.keys()),
+                did_you_mean=(ns, all_available),
             )
 
     def validate_type(self, name: str, ns: str) -> None:
diff --git a/blueprintcompiler/language/types.py b/blueprintcompiler/language/types.py
index e7b1867..b3fb586 100644
--- a/blueprintcompiler/language/types.py
+++ b/blueprintcompiler/language/types.py
@@ -55,7 +55,16 @@ class TypeName(AstNode):
     @validate("namespace")
     def gir_ns_exists(self):
         if not self.tokens["extern"]:
-            self.root.gir.validate_ns(self.tokens["namespace"])
+            try:
+                self.root.gir.validate_ns(self.tokens["namespace"])
+            except CompileError as e:
+                ns = self.tokens["namespace"]
+                e.actions = [
+                    self.root.import_code_action(n, version)
+                    for n, version in gir.get_available_namespaces()
+                    if n == ns
+                ]
+                raise e
 
     @validate()
     def deprecated(self) -> None:
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index 3ce23da..34ba193 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -99,6 +99,18 @@ class UI(AstNode):
             and self.template.class_name.glib_type_name == id
         )
 
+    def import_code_action(self, ns: str, version: str) -> CodeAction:
+        if len(self.children[Import]):
+            pos = self.children[Import][-1].range.end
+        else:
+            pos = self.children[GtkDirective][0].range.end
+
+        return CodeAction(
+            f"Import {ns} {version}",
+            f"\nusing {ns} {version};",
+            Range(pos, pos, self.group.text),
+        )
+
     @context(ScopeCtx)
     def scope_ctx(self) -> ScopeCtx:
         return ScopeCtx(node=self)

From bfa2f56e1f3281bf80f566be44f2e6eda5bf92bd Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 25 Jul 2023 20:07:37 -0500
Subject: [PATCH 163/290] Sort imports

---
 blueprintcompiler/ast_utils.py | 2 +-
 blueprintcompiler/main.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index 56501e7..ce15faf 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -22,7 +22,7 @@ from collections import ChainMap, defaultdict
 from functools import cached_property
 
 from .errors import *
-from .lsp_utils import DocumentSymbol, SemanticToken, LocationLink
+from .lsp_utils import DocumentSymbol, LocationLink, SemanticToken
 from .tokenizer import Range
 
 TType = T.TypeVar("TType")
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 416db47..306dd7d 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -25,7 +25,7 @@ import sys
 import typing as T
 
 from . import interactive_port, parser, tokenizer
-from .errors import CompilerBugError, CompileError, PrintableError, report_bug
+from .errors import CompileError, CompilerBugError, PrintableError, report_bug
 from .gir import add_typelib_search_path
 from .lsp import LanguageServer
 from .outputs import XmlOutput

From 582502c1b4afc53831f52bcecb2cbc891e2efdea Mon Sep 17 00:00:00 2001
From: Ivan Kalinin <z00000000z@list.ru>
Date: Sun, 13 Aug 2023 10:42:03 +0300
Subject: [PATCH 164/290] completions: fix property value completion

---
 blueprintcompiler/completions.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index 56db53a..386f2d7 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -130,13 +130,14 @@ def property_completer(ast_node, match_variables):
     matches=[[(TokenType.IDENT, None), (TokenType.OP, ":")]],
 )
 def prop_value_completer(ast_node, match_variables):
-    if isinstance(ast_node.value_type, gir.Enumeration):
-        for name, member in ast_node.value_type.members.items():
-            yield Completion(name, CompletionItemKind.EnumMember, docs=member.doc)
+    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)
 
-    elif isinstance(ast_node.value_type, gir.BoolType):
-        yield Completion("true", CompletionItemKind.Constant)
-        yield Completion("false", CompletionItemKind.Constant)
+        elif isinstance(vt.value_type, gir.BoolType):
+            yield Completion("true", CompletionItemKind.Constant)
+            yield Completion("false", CompletionItemKind.Constant)
 
 
 @completer(

From bcac78845612db336a3929f8a54dad5dd80d2390 Mon Sep 17 00:00:00 2001
From: z00000000z <z00000000z@list.ru>
Date: Wed, 23 Aug 2023 16:21:37 +0000
Subject: [PATCH 165/290] completions: property_completer improvements

---
 blueprintcompiler/completions.py              | 68 ++++++++++++++-----
 blueprintcompiler/completions_utils.py        |  4 +-
 .../language/adw_message_dialog.py            |  2 +-
 blueprintcompiler/language/gtk_a11y.py        |  4 +-
 .../language/gtk_combo_box_text.py            |  2 +-
 blueprintcompiler/language/gtk_file_filter.py |  2 +-
 blueprintcompiler/language/gtk_layout.py      |  2 +-
 blueprintcompiler/language/gtk_menu.py        |  4 +-
 blueprintcompiler/language/gtk_scale.py       |  4 +-
 blueprintcompiler/language/gtk_size_group.py  |  2 +-
 blueprintcompiler/language/gtk_string_list.py |  2 +-
 blueprintcompiler/language/gtk_styles.py      |  2 +-
 blueprintcompiler/lsp.py                      |  6 +-
 blueprintcompiler/lsp_utils.py                |  2 +
 tests/test_samples.py                         |  3 +-
 15 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/blueprintcompiler/completions.py b/blueprintcompiler/completions.py
index 386f2d7..0a43388 100644
--- a/blueprintcompiler/completions.py
+++ b/blueprintcompiler/completions.py
@@ -31,13 +31,13 @@ Pattern = T.List[T.Tuple[TokenType, T.Optional[str]]]
 
 
 def _complete(
-    ast_node: AstNode, tokens: T.List[Token], idx: int, token_idx: int
+    lsp, ast_node: AstNode, tokens: T.List[Token], idx: int, token_idx: int
 ) -> T.Iterator[Completion]:
     for child in ast_node.children:
         if child.group.start <= idx and (
             idx < child.group.end or (idx == child.group.end and child.incomplete)
         ):
-            yield from _complete(child, tokens, idx, token_idx)
+            yield from _complete(lsp, child, tokens, idx, token_idx)
             return
 
     prev_tokens: T.List[Token] = []
@@ -50,11 +50,11 @@ def _complete(
         token_idx -= 1
 
     for completer in ast_node.completers:
-        yield from completer(prev_tokens, ast_node)
+        yield from completer(prev_tokens, ast_node, lsp)
 
 
 def complete(
-    ast_node: AstNode, tokens: T.List[Token], idx: int
+    lsp, ast_node: AstNode, tokens: T.List[Token], idx: int
 ) -> T.Iterator[Completion]:
     token_idx = 0
     # find the current token
@@ -67,11 +67,11 @@ def complete(
         idx = tokens[token_idx].start
         token_idx -= 1
 
-    yield from _complete(ast_node, tokens, idx, token_idx)
+    yield from _complete(lsp, ast_node, tokens, idx, token_idx)
 
 
 @completer([language.GtkDirective])
-def using_gtk(ast_node, match_variables):
+def using_gtk(lsp, ast_node, match_variables):
     yield Completion("using Gtk 4.0;", CompletionItemKind.Keyword)
 
 
@@ -79,7 +79,7 @@ def using_gtk(ast_node, match_variables):
     applies_in=[language.UI, language.ObjectContent, language.Template],
     matches=new_statement_patterns,
 )
-def namespace(ast_node, match_variables):
+def namespace(lsp, ast_node, match_variables):
     yield Completion("Gtk", CompletionItemKind.Module, text="Gtk.")
     for ns in ast_node.root.children[language.Import]:
         if ns.gir_namespace is not None:
@@ -97,7 +97,7 @@ def namespace(ast_node, match_variables):
         [(TokenType.IDENT, None), (TokenType.OP, ".")],
     ],
 )
-def object_completer(ast_node, match_variables):
+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():
@@ -108,7 +108,7 @@ def object_completer(ast_node, match_variables):
     applies_in=[language.UI, language.ObjectContent, language.Template],
     matches=new_statement_patterns,
 )
-def gtk_object_completer(ast_node, match_variables):
+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():
@@ -119,17 +119,52 @@ def gtk_object_completer(ast_node, match_variables):
     applies_in=[language.ObjectContent],
     matches=new_statement_patterns,
 )
-def property_completer(ast_node, match_variables):
+def property_completer(lsp, ast_node, match_variables):
     if ast_node.gir_class and not isinstance(ast_node.gir_class, gir.ExternType):
-        for prop in ast_node.gir_class.properties:
-            yield Completion(prop, CompletionItemKind.Property, snippet=f"{prop}: $0;")
+        for prop_name, prop in ast_node.gir_class.properties.items():
+            if (
+                isinstance(prop.type, gir.BoolType)
+                and lsp.client_supports_completion_choice
+            ):
+                yield Completion(
+                    prop_name,
+                    CompletionItemKind.Property,
+                    sort_text=f"0 {prop_name}",
+                    snippet=f"{prop_name}: ${{1|true,false|}};",
+                )
+            elif isinstance(prop.type, gir.StringType):
+                yield Completion(
+                    prop_name,
+                    CompletionItemKind.Property,
+                    sort_text=f"0 {prop_name}",
+                    snippet=f'{prop_name}: "$0";',
+                )
+            elif (
+                isinstance(prop.type, gir.Enumeration)
+                and len(prop.type.members) <= 10
+                and lsp.client_supports_completion_choice
+            ):
+                choices = ",".join(prop.type.members.keys())
+                yield Completion(
+                    prop_name,
+                    CompletionItemKind.Property,
+                    sort_text=f"0 {prop_name}",
+                    snippet=f"{prop_name}: ${{1|{choices}|}};",
+                )
+            else:
+                yield Completion(
+                    prop_name,
+                    CompletionItemKind.Property,
+                    sort_text=f"0 {prop_name}",
+                    snippet=f"{prop_name}: $0;",
+                )
 
 
 @completer(
     applies_in=[language.Property, language.BaseAttribute],
     matches=[[(TokenType.IDENT, None), (TokenType.OP, ":")]],
 )
-def prop_value_completer(ast_node, match_variables):
+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():
@@ -144,7 +179,7 @@ def prop_value_completer(ast_node, match_variables):
     applies_in=[language.ObjectContent],
     matches=new_statement_patterns,
 )
-def signal_completer(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:
             if not isinstance(ast_node.parent, language.Object):
@@ -158,13 +193,14 @@ def signal_completer(ast_node, match_variables):
                 )
             yield Completion(
                 signal,
-                CompletionItemKind.Property,
+                CompletionItemKind.Event,
+                sort_text=f"1 {signal}",
                 snippet=f"{signal} => \$${{1:{name}_{signal.replace('-', '_')}}}()$0;",
             )
 
 
 @completer(applies_in=[language.UI], matches=new_statement_patterns)
-def template_completer(ast_node, match_variables):
+def template_completer(lsp, ast_node, match_variables):
     yield Completion(
         "template",
         CompletionItemKind.Snippet,
diff --git a/blueprintcompiler/completions_utils.py b/blueprintcompiler/completions_utils.py
index 2aae874..52e325d 100644
--- a/blueprintcompiler/completions_utils.py
+++ b/blueprintcompiler/completions_utils.py
@@ -44,7 +44,7 @@ def applies_to(*ast_types):
 
 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):
+        def inner(prev_tokens: T.List[Token], ast_node, lsp):
             # For completers that apply in ObjectContent nodes, we can further
             # check that the object is the right class
             if applies_in_subclass is not None:
@@ -77,7 +77,7 @@ def completer(applies_in: T.List, matches: T.List = [], applies_in_subclass=None
             if not any_match:
                 return
 
-            yield from func(ast_node, match_variables)
+            yield from func(lsp, ast_node, match_variables)
 
         for c in applies_in:
             c.completers.append(inner)
diff --git a/blueprintcompiler/language/adw_message_dialog.py b/blueprintcompiler/language/adw_message_dialog.py
index fb2be66..9b3d41c 100644
--- a/blueprintcompiler/language/adw_message_dialog.py
+++ b/blueprintcompiler/language/adw_message_dialog.py
@@ -141,7 +141,7 @@ class ExtAdwMessageDialog(AstNode):
     applies_in_subclass=("Adw", "MessageDialog"),
     matches=new_statement_patterns,
 )
-def style_completer(ast_node, match_variables):
+def style_completer(lsp, ast_node, match_variables):
     yield Completion(
         "responses", CompletionItemKind.Keyword, snippet="responses [\n\t$0\n]"
     )
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index e9850f5..2ad8097 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -204,7 +204,7 @@ class ExtAccessibility(AstNode):
     applies_in=[ObjectContent],
     matches=new_statement_patterns,
 )
-def a11y_completer(ast_node, match_variables):
+def a11y_completer(lsp, ast_node, match_variables):
     yield Completion(
         "accessibility", CompletionItemKind.Snippet, snippet="accessibility {\n  $0\n}"
     )
@@ -214,7 +214,7 @@ def a11y_completer(ast_node, match_variables):
     applies_in=[ExtAccessibility],
     matches=new_statement_patterns,
 )
-def a11y_name_completer(ast_node, match_variables):
+def a11y_name_completer(lsp, ast_node, match_variables):
     for name, type in get_types(ast_node.root.gir).items():
         yield Completion(
             name,
diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index 4c6fda9..e514e4a 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/blueprintcompiler/language/gtk_combo_box_text.py
@@ -87,5 +87,5 @@ class ExtComboBoxItems(AstNode):
     applies_in_subclass=("Gtk", "ComboBoxText"),
     matches=new_statement_patterns,
 )
-def items_completer(ast_node, match_variables):
+def items_completer(lsp, ast_node, match_variables):
     yield Completion("items", CompletionItemKind.Snippet, snippet="items [$0]")
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 1be83e8..8dcbcb8 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -104,7 +104,7 @@ ext_file_filter_suffixes = create_node("suffixes", "suffix")
     applies_in_subclass=("Gtk", "FileFilter"),
     matches=new_statement_patterns,
 )
-def file_filter_completer(ast_node, match_variables):
+def file_filter_completer(lsp, ast_node, match_variables):
     yield Completion(
         "mime-types", CompletionItemKind.Snippet, snippet='mime-types ["$0"]'
     )
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index 892e0c6..508609d 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/blueprintcompiler/language/gtk_layout.py
@@ -89,7 +89,7 @@ class ExtLayout(AstNode):
     applies_in_subclass=("Gtk", "Widget"),
     matches=new_statement_patterns,
 )
-def layout_completer(ast_node, match_variables):
+def layout_completer(lsp, ast_node, match_variables):
     yield Completion("layout", CompletionItemKind.Snippet, snippet="layout {\n  $0\n}")
 
 
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index e1bbd57..844c309 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -221,7 +221,7 @@ from .ui import UI
     applies_in=[UI],
     matches=new_statement_patterns,
 )
-def menu_completer(ast_node, match_variables):
+def menu_completer(lsp, ast_node, match_variables):
     yield Completion("menu", CompletionItemKind.Snippet, snippet="menu {\n  $0\n}")
 
 
@@ -229,7 +229,7 @@ def menu_completer(ast_node, match_variables):
     applies_in=[Menu],
     matches=new_statement_patterns,
 )
-def menu_content_completer(ast_node, match_variables):
+def menu_content_completer(lsp, ast_node, match_variables):
     yield Completion(
         "submenu", CompletionItemKind.Snippet, snippet="submenu {\n  $0\n}"
     )
diff --git a/blueprintcompiler/language/gtk_scale.py b/blueprintcompiler/language/gtk_scale.py
index a2c9168..ac4b77c 100644
--- a/blueprintcompiler/language/gtk_scale.py
+++ b/blueprintcompiler/language/gtk_scale.py
@@ -129,14 +129,14 @@ class ExtScaleMarks(AstNode):
     applies_in_subclass=("Gtk", "Scale"),
     matches=new_statement_patterns,
 )
-def complete_marks(ast_node, match_variables):
+def complete_marks(lsp, ast_node, match_variables):
     yield Completion("marks", CompletionItemKind.Keyword, snippet="marks [\n\t$0\n]")
 
 
 @completer(
     applies_in=[ExtScaleMarks],
 )
-def complete_mark(ast_node, match_variables):
+def complete_mark(lsp, ast_node, match_variables):
     yield Completion("mark", CompletionItemKind.Keyword, snippet="mark ($0),")
 
 
diff --git a/blueprintcompiler/language/gtk_size_group.py b/blueprintcompiler/language/gtk_size_group.py
index 60af861..baa4c30 100644
--- a/blueprintcompiler/language/gtk_size_group.py
+++ b/blueprintcompiler/language/gtk_size_group.py
@@ -94,5 +94,5 @@ class ExtSizeGroupWidgets(AstNode):
     applies_in_subclass=("Gtk", "SizeGroup"),
     matches=new_statement_patterns,
 )
-def size_group_completer(ast_node, match_variables):
+def size_group_completer(lsp, ast_node, match_variables):
     yield Completion("widgets", CompletionItemKind.Snippet, snippet="widgets [$0]")
diff --git a/blueprintcompiler/language/gtk_string_list.py b/blueprintcompiler/language/gtk_string_list.py
index 37a46ec..be01262 100644
--- a/blueprintcompiler/language/gtk_string_list.py
+++ b/blueprintcompiler/language/gtk_string_list.py
@@ -71,5 +71,5 @@ class ExtStringListStrings(AstNode):
     applies_in_subclass=("Gtk", "StringList"),
     matches=new_statement_patterns,
 )
-def strings_completer(ast_node, match_variables):
+def strings_completer(lsp, ast_node, match_variables):
     yield Completion("strings", CompletionItemKind.Snippet, snippet="strings [$0]")
diff --git a/blueprintcompiler/language/gtk_styles.py b/blueprintcompiler/language/gtk_styles.py
index 26c0e74..236dde0 100644
--- a/blueprintcompiler/language/gtk_styles.py
+++ b/blueprintcompiler/language/gtk_styles.py
@@ -76,7 +76,7 @@ class ExtStyles(AstNode):
     applies_in_subclass=("Gtk", "Widget"),
     matches=new_statement_patterns,
 )
-def style_completer(ast_node, match_variables):
+def style_completer(lsp, ast_node, match_variables):
     yield Completion("styles", CompletionItemKind.Keyword, snippet='styles ["$0"]')
 
 
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 19c02e5..2281059 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -115,6 +115,7 @@ class LanguageServer:
 
     def __init__(self):
         self.client_capabilities = {}
+        self.client_supports_completion_choice = False
         self._open_files: T.Dict[str, OpenFile] = {}
 
     def run(self):
@@ -187,6 +188,9 @@ class LanguageServer:
         from . import main
 
         self.client_capabilities = params.get("capabilities", {})
+        self.client_supports_completion_choice = params.get("clientInfo", {}).get(
+            "name"
+        ) in ["Visual Studio Code", "VSCodium"]
         self._send_response(
             id,
             {
@@ -271,7 +275,7 @@ class LanguageServer:
         idx = utils.pos_to_idx(
             params["position"]["line"], params["position"]["character"], open_file.text
         )
-        completions = complete(open_file.ast, open_file.tokens, idx)
+        completions = complete(self, open_file.ast, open_file.tokens, idx)
         self._send_response(
             id, [completion.to_json(True) for completion in completions]
         )
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 9da8461..33ae923 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -80,6 +80,7 @@ class Completion:
     kind: CompletionItemKind
     signature: T.Optional[str] = None
     deprecated: bool = False
+    sort_text: T.Optional[str] = None
     docs: T.Optional[str] = None
     text: T.Optional[str] = None
     snippet: T.Optional[str] = None
@@ -103,6 +104,7 @@ class Completion:
             if self.docs
             else None,
             "deprecated": self.deprecated,
+            "sortText": self.sort_text,
             "insertText": insert_text,
             "insertTextFormat": insert_text_format,
         }
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 9d891f6..226e762 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -35,6 +35,7 @@ from blueprintcompiler.errors import (
     MultipleErrors,
     PrintableError,
 )
+from blueprintcompiler.lsp import LanguageServer
 from blueprintcompiler.outputs.xml import XmlOutput
 from blueprintcompiler.tokenizer import Token, TokenType, tokenize
 
@@ -44,7 +45,7 @@ class TestSamples(unittest.TestCase):
         for i in range(len(text)):
             ast.get_docs(i)
         for i in range(len(text)):
-            list(complete(ast, tokens, i))
+            list(complete(LanguageServer(), ast, tokens, i))
         ast.get_document_symbols()
 
     def assert_sample(self, name, skip_run=False):

From a8512d83f30133493f454896b49983f732225922 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Wed, 30 Aug 2023 13:49:18 +0200
Subject: [PATCH 166/290] doc: Cleanup the Flatpak module

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

diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index 89355b7..5689163 100644
--- a/docs/flatpak.rst
+++ b/docs/flatpak.rst
@@ -12,6 +12,7 @@ a module in your flatpak manifest:
    {
      "name": "blueprint-compiler",
      "buildsystem": "meson",
+     "cleanup": ["*"],
      "sources": [
        {
          "type": "git",

From 0f5be1b0512bdd755a2901c66447db9f5fcf5bff Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 31 Aug 2023 14:58:29 -0500
Subject: [PATCH 167/290] docs: Use correct lexer name for code blocks

---
 docs/index.rst                   |  2 +-
 docs/packaging.rst               |  2 +-
 docs/reference/diagnostics.rst   |  4 ++--
 docs/reference/document_root.rst |  6 +++---
 docs/reference/expressions.rst   |  4 ++--
 docs/reference/extensions.rst    | 18 +++++++++---------
 docs/reference/menus.rst         |  4 ++--
 docs/reference/objects.rst       | 14 +++++++-------
 docs/reference/templates.rst     |  6 +++---
 docs/reference/values.rst        | 10 +++++-----
 docs/translations.rst            |  4 ++--
 11 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index e277add..06547c2 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -22,7 +22,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
    packaging
 
 
-.. code-block::
+.. code-block:: blueprint
 
    using Gtk 4.0;
 
diff --git a/docs/packaging.rst b/docs/packaging.rst
index 4f248e6..78bb2c2 100644
--- a/docs/packaging.rst
+++ b/docs/packaging.rst
@@ -13,7 +13,7 @@ GObject Introspection
 
 Blueprint files can import GObject Introspection namespaces like this:
 
-.. code-block::
+.. code-block:: blueprint
 
    using Gtk 4.0;
    using Adw 1;
diff --git a/docs/reference/diagnostics.rst b/docs/reference/diagnostics.rst
index b8fee83..2c0af59 100644
--- a/docs/reference/diagnostics.rst
+++ b/docs/reference/diagnostics.rst
@@ -166,14 +166,14 @@ version_conflict
 ----------------
 This error occurs when two versions of a namespace are imported (possibly transitively) in the same file. For example, this will cause a version conflict:
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    using Gtk 4.0;
    using Gtk 3.0;
 
 But so will this:
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    using Gtk 4.0;
    using Handy 1;
diff --git a/docs/reference/document_root.rst b/docs/reference/document_root.rst
index af5357d..13dea58 100644
--- a/docs/reference/document_root.rst
+++ b/docs/reference/document_root.rst
@@ -17,7 +17,7 @@ A blueprint document consists of a :ref:`GTK declaration<Syntax GtkDecl>`, one s
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    // Gtk Declaration
    using Gtk 4.0;
@@ -43,7 +43,7 @@ Every blueprint file begins with the line ``using Gtk 4.0;``, which declares the
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    using Gtk 4.0;
 
@@ -68,7 +68,7 @@ The compiler requires typelib files for these libraries to be installed. They ar
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    // Import libadwaita
    using Adw 1;
diff --git a/docs/reference/expressions.rst b/docs/reference/expressions.rst
index 042aec7..1ba50ee 100644
--- a/docs/reference/expressions.rst
+++ b/docs/reference/expressions.rst
@@ -6,7 +6,7 @@ Expressions make your user interface code *reactive*. This means when your
 application's data changes, the user interface reacts to the change
 automatically.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    label: bind MyAppWindow.account.username;
    /*     ^               ^       ^
@@ -81,7 +81,7 @@ Cast Expressions
 
 Cast expressions allow Blueprint to know the type of an expression when it can't otherwise determine it.
 
-.. code-block:: blueprintui
+.. 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
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index fb5a46b..9675038 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -78,7 +78,7 @@ Valid in `Adw.MessageDialog <https://gnome.pages.gitlab.gnome.org/libadwaita/doc
 
 The ``responses`` block defines the buttons that will be added to the dialog. The ``destructive`` or ``suggested`` flag sets the appearance of the button, and the ``disabled`` flag can be used to disable the button.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    using Adw 1;
 
@@ -106,7 +106,7 @@ Valid in `Gtk.ComboBoxText <https://docs.gtk.org/gtk4/class.ComboBoxText.html>`_
 
 The ``items`` block defines the items that will be added to the combo box. The optional ID can be used to refer to the item rather than its label.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    ComboBoxText {
      items [
@@ -133,7 +133,7 @@ Valid in `Gtk.FileFilter <https://docs.gtk.org/gtk4/class.FileFilter.html>`_.
 
 The ``mime-types``, ``patterns``, and ``suffixes`` blocks define the items that will be added to the file filter. The ``mime-types`` block accepts mime types (including wildcards for subtypes, such as ``image/*``). The ``patterns`` block accepts glob patterns, and the ``suffixes`` block accepts file extensions.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    FileFilter {
      mime-types [ "text/plain", "image/*" ]
@@ -156,7 +156,7 @@ Valid in `Gtk.Widget <https://docs.gtk.org/gtk4/class.Widget.html>`_.
 
 The ``layout`` block describes how the widget should be positioned within its parent. The available properties depend on the parent widget's layout manager.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Grid {
      Button {
@@ -196,7 +196,7 @@ The ``template`` block defines the template that will be used to create list ite
 
 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.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    ListView {
      factory: BuilderListItemFactory {
@@ -244,7 +244,7 @@ Valid in `Gtk.SizeGroup <https://docs.gtk.org/gtk4/class.SizeGroup.html>`_.
 
 The ``widgets`` block defines the widgets that will be added to the size group.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Box {
      Button button1 {}
@@ -270,7 +270,7 @@ Valid in `Gtk.StringList <https://docs.gtk.org/gtk4/class.StringList.html>`_.
 
 The ``strings`` block defines the strings in the string list.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    StringList {
      strings ["violin", "guitar", _("harp")]
@@ -291,7 +291,7 @@ Valid in any `Gtk.Widget <https://docs.gtk.org/gtk4/class.Widget.html>`_.
 
 The ``styles`` block defines CSS classes that will be added to the widget.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Button {
      styles ["suggested-action"]
@@ -327,7 +327,7 @@ The ``action response`` extension sets the ``action`` child type for the child a
 
 No more than one child of a dialog or infobar may have the ``default`` flag.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Dialog {
     [action response=ok default]
diff --git a/docs/reference/menus.rst b/docs/reference/menus.rst
index 525458b..2d7bfea 100644
--- a/docs/reference/menus.rst
+++ b/docs/reference/menus.rst
@@ -21,7 +21,7 @@ Menus, such as the application menu, are defined using the ``menu`` keyword. Men
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    menu my_menu {
      submenu {
@@ -53,7 +53,7 @@ The most common menu attributes are ``label``, ``action``, and ``icon``. Because
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    menu {
      item ("label")
diff --git a/docs/reference/objects.rst b/docs/reference/objects.rst
index fe4d1a7..699db49 100644
--- a/docs/reference/objects.rst
+++ b/docs/reference/objects.rst
@@ -24,7 +24,7 @@ Optionally, objects may have an ID to provide a handle for other parts of the bl
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Label label1 {
      label: "Hello, world!";
@@ -69,7 +69,7 @@ A property's value can be another object, either inline or referenced by ID.
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Label {
      label: "text";
@@ -102,7 +102,7 @@ Optionally, you can provide an object ID to use when connecting the signal.
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Button {
      clicked => $on_button_clicked();
@@ -141,7 +141,7 @@ Examples
 Add children to a container
 +++++++++++++++++++++++++++
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Button {
      Image {}
@@ -150,7 +150,7 @@ Add children to a container
 Child types
 +++++++++++
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    HeaderBar {
      [start]
@@ -165,7 +165,7 @@ Child types
 Child extensions
 ++++++++++++++++
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Dialog {
      // Here, a child extension annotation defines the button's response.
@@ -176,7 +176,7 @@ Child extensions
 Internal children
 +++++++++++++++++
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Dialog {
      [internal-child content_area]
diff --git a/docs/reference/templates.rst b/docs/reference/templates.rst
index fa4c264..180979f 100644
--- a/docs/reference/templates.rst
+++ b/docs/reference/templates.rst
@@ -15,7 +15,7 @@ Widget subclassing is one of the primary techniques for structuring an applicati
 
 You could implement this with the following blueprint:
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    using Gtk 4.0;
 
@@ -39,7 +39,7 @@ We can solve these problems by giving each widget its own blueprint file, which
 
 For this to work, we need to specify in the blueprint which object is the one being instantiated. We do this with a template block:
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    using Gtk 4.0;
 
@@ -56,7 +56,7 @@ This blueprint can only be used by the ``MapsHeaderBar`` constructor. Instantiat
 
 This ``MapsHeaderBar`` class, along with its blueprint template, can then be referenced in another blueprint:
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    using Gtk 4.0;
 
diff --git a/docs/reference/values.rst b/docs/reference/values.rst
index 035408f..a50293d 100644
--- a/docs/reference/values.rst
+++ b/docs/reference/values.rst
@@ -45,7 +45,7 @@ The type of a ``typeof<>`` literal is `GType <https://docs.gtk.org/gobject/alias
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Gio.ListStore {
      item-type: typeof<GObject.Object>;
@@ -66,7 +66,7 @@ Flags are used to specify a set of options. One or more of the available flag va
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Adw.TabView {
      shortcuts: control_tab | control_shift_tab;
@@ -85,7 +85,7 @@ Translated Strings
 
 Use ``_("...")`` to mark strings as translatable. You can put a comment for translators on the line above if needed.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Gtk.Label label {
      /* Translators: This is the main text of the welcome screen */
@@ -94,7 +94,7 @@ Use ``_("...")`` to mark strings as translatable. You can put a comment for tran
 
 Use ``C_("context", "...")`` to add a *message context* to a string to disambiguate it, in case the same string appears in different places. Remember, two strings might be the same in one language but different in another depending on context.
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    Gtk.Label label {
      /* Translators: This is a section in the preferences window */
@@ -118,7 +118,7 @@ The simplest bindings connect to a property of another object in the blueprint.
 Example
 ~~~~~~~
 
-.. code-block:: blueprintui
+.. code-block:: blueprint
 
    /* Use bindings to show a label when a switch
     * is active, without any application code */
diff --git a/docs/translations.rst b/docs/translations.rst
index b143d36..7ebf929 100644
--- a/docs/translations.rst
+++ b/docs/translations.rst
@@ -5,7 +5,7 @@ Translations
 Blueprint files can be translated with xgettext. To mark a string as translated,
 use the following syntax:
 
-.. code-block::
+.. code-block:: blueprint
 
    _("translated string")
 
@@ -34,7 +34,7 @@ conflicts. Two strings that are the same in English, but appear in different
 contexts, might be different in another language! To disambiguate, use ``C_``
 instead of ``_`` and add a context string as the first argument:
 
-.. code-block::
+.. code-block:: blueprint
 
    C_("shortcuts window", "Quit")
 

From 3cd5daf025ac71752a1f6b83d588b52407e4103a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 7 Sep 2023 12:13:05 -0500
Subject: [PATCH 168/290] Fix a crash found by the fuzzer

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

diff --git a/blueprintcompiler/language/gtkbuilder_child.py b/blueprintcompiler/language/gtkbuilder_child.py
index 52c8ad4..3f19fa5 100644
--- a/blueprintcompiler/language/gtkbuilder_child.py
+++ b/blueprintcompiler/language/gtkbuilder_child.py
@@ -88,7 +88,7 @@ class Child(AstNode):
                 hints = [
                     "only Gio.ListStore or Gtk.Buildable implementors can have children"
                 ]
-                if "child" in gir_class.properties:
+                if hasattr(gir_class, "properties") and "child" in gir_class.properties:
                     hints.append(
                         "did you mean to assign this object to the 'child' property?"
                     )

From 0c0219551026ec9aec5487891e07d1ced3a31112 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 13 Sep 2023 08:31:22 -0600
Subject: [PATCH 169/290] Handle big endian bitfields correctly

---
 blueprintcompiler/gir.py     |  5 +++--
 blueprintcompiler/typelib.py | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 635ef7c..9ad5699 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -18,6 +18,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 import os
+import sys
 import typing as T
 from functools import cached_property
 
@@ -948,8 +949,8 @@ class Repository(GirNode):
             return self.lookup_namespace(ns).get_type(dir_entry.DIR_ENTRY_NAME)
 
     def _resolve_type_id(self, type_id: int) -> GirType:
-        if type_id & 0xFFFFFF == 0:
-            type_id = (type_id >> 27) & 0x1F
+        if type_id & (0xFFFFFF if sys.byteorder == "little" else 0xFFFFFF00) == 0:
+            type_id = ((type_id >> 27) if sys.byteorder == "little" else type_id) & 0x1F
             # simple type
             if type_id == typelib.TYPE_BOOLEAN:
                 return BoolType()
diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index c8a3ff3..cfb750b 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -61,7 +61,14 @@ class Field:
     def __init__(self, offset: int, type: str, shift=0, mask=None):
         self._offset = offset
         self._type = type
-        self._shift = shift
+        if not mask or sys.byteorder == "little":
+            self._shift = shift
+        elif self._type == "u8" or self._type == "i8":
+            self._shift = 7 - shift
+        elif self._type == "u16" or self._type == "i16":
+            self._shift = 15 - shift
+        else:
+            self._shift = 31 - shift
         self._mask = (1 << mask) - 1 if mask else None
         self._name = f"{offset}__{type}__{shift}__{mask}"
 
@@ -174,7 +181,7 @@ class Typelib:
     OBJ_FINAL = Field(0x02, "u16", 3, 1)
     OBJ_GTYPE_NAME = Field(0x08, "string")
     OBJ_PARENT = Field(0x10, "dir_entry")
-    OBJ_GTYPE_STRUCT = Field(0x14, "string")
+    OBJ_GTYPE_STRUCT = Field(0x12, "string")
     OBJ_N_INTERFACES = Field(0x14, "u16")
     OBJ_N_FIELDS = Field(0x16, "u16")
     OBJ_N_PROPERTIES = Field(0x18, "u16")
@@ -259,7 +266,9 @@ class Typelib:
 
     def _int(self, size, signed) -> int:
         return int.from_bytes(
-            self._typelib_file[self._offset : self._offset + size], sys.byteorder
+            self._typelib_file[self._offset : self._offset + size],
+            sys.byteorder,
+            signed=signed,
         )
 
 

From 057c767fbb595bb31d025c76547045273948aab1 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 14 Sep 2023 10:19:49 -0500
Subject: [PATCH 170/290] typelib: Fix byte order issue

---
 blueprintcompiler/typelib.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/typelib.py b/blueprintcompiler/typelib.py
index cfb750b..145bf57 100644
--- a/blueprintcompiler/typelib.py
+++ b/blueprintcompiler/typelib.py
@@ -64,11 +64,11 @@ class Field:
         if not mask or sys.byteorder == "little":
             self._shift = shift
         elif self._type == "u8" or self._type == "i8":
-            self._shift = 7 - shift
+            self._shift = 8 - (shift + mask)
         elif self._type == "u16" or self._type == "i16":
-            self._shift = 15 - shift
+            self._shift = 16 - (shift + mask)
         else:
-            self._shift = 31 - shift
+            self._shift = 32 - (shift + mask)
         self._mask = (1 << mask) - 1 if mask else None
         self._name = f"{offset}__{type}__{shift}__{mask}"
 

From 80cb57cb88a532e24f5b66d940d28f11f059f899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Capypara=20K=C3=B6pcke?= <hello@capypara.de>
Date: Sun, 10 Sep 2023 11:57:41 +0200
Subject: [PATCH 171/290] batch-compile: Fix mixing relative+absolute paths

---
 blueprintcompiler/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 306dd7d..4666d78 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -124,9 +124,11 @@ class BlueprintApp:
 
         for file in opts.inputs:
             data = file.read()
+            file_abs = os.path.abspath(file.name)
+            input_dir_abs = os.path.abspath(opts.input_dir)
 
             try:
-                if not os.path.commonpath([file.name, opts.input_dir]):
+                if not os.path.commonpath([file_abs, input_dir_abs]):
                     print(
                         f"{Colors.RED}{Colors.BOLD}error: input file '{file.name}' is not in input directory '{opts.input_dir}'{Colors.CLEAR}"
                     )

From cf136ab09ffc1c901d467d21d506ef51718e470e Mon Sep 17 00:00:00 2001
From: Urtsi Santsi <urtsi.santsi@proton.me>
Date: Sat, 2 Sep 2023 02:11:09 +0300
Subject: [PATCH 172/290] Add notice that the file is generated Fixes #123

---
 blueprintcompiler/lsp.py                     |  2 +-
 blueprintcompiler/outputs/xml/xml_emitter.py | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 2281059..9ef6f57 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -291,7 +291,7 @@ class LanguageServer:
         xml = None
         try:
             output = XmlOutput()
-            xml = output.emit(open_file.ast)
+            xml = output.emit(open_file.ast, generated_notice=False)
         except:
             printerr(traceback.format_exc())
             self._send_error(id, ErrorCode.RequestFailed, "Could not compile document")
diff --git a/blueprintcompiler/outputs/xml/xml_emitter.py b/blueprintcompiler/outputs/xml/xml_emitter.py
index 44013da..ca87a49 100644
--- a/blueprintcompiler/outputs/xml/xml_emitter.py
+++ b/blueprintcompiler/outputs/xml/xml_emitter.py
@@ -25,9 +25,18 @@ from blueprintcompiler.language.types import ClassName
 
 
 class XmlEmitter:
-    def __init__(self, indent=2):
+    def __init__(self, indent=2, generated_notice=True):
         self.indent = indent
         self.result = '<?xml version="1.0" encoding="UTF-8"?>'
+        if generated_notice:
+            self.result += (
+                "\n"
+                "<!--\n"
+                "DO NOT EDIT!\n"
+                "This file was @generated by blueprint-compiler. Instead, edit the\n"
+                "corresponding .blp file and regenerate this file with blueprint-compiler.\n"
+                "-->"
+            )
         self._tag_stack = []
         self._needs_newline = False
 

From cc66b05a8709abfb1685717958c1b74a46165e9c Mon Sep 17 00:00:00 2001
From: Urtsi Santsi <urtsi.santsi@proton.me>
Date: Sat, 2 Sep 2023 02:42:11 +0300
Subject: [PATCH 173/290] Add generated notice to test files

---
 tests/samples/accessibility.ui           |  5 +++++
 tests/samples/action_widgets.ui          |  5 +++++
 tests/samples/adw_breakpoint.ui          |  5 +++++
 tests/samples/child_type.ui              |  5 +++++
 tests/samples/combo_box_text.ui          |  5 +++++
 tests/samples/comments.ui                |  5 +++++
 tests/samples/enum.ui                    |  5 +++++
 tests/samples/expr_closure.ui            |  5 +++++
 tests/samples/expr_closure_args.ui       |  5 +++++
 tests/samples/expr_lookup.ui             |  5 +++++
 tests/samples/file_filter.ui             |  5 +++++
 tests/samples/flags.ui                   |  5 +++++
 tests/samples/id_prop.ui                 |  5 +++++
 tests/samples/issue_119.ui               |  5 +++++
 tests/samples/layout.ui                  |  5 +++++
 tests/samples/list_factory.ui            | 10 ++++++++++
 tests/samples/menu.ui                    |  5 +++++
 tests/samples/numbers.ui                 |  5 +++++
 tests/samples/object_prop.ui             |  5 +++++
 tests/samples/parseable.ui               |  5 +++++
 tests/samples/placeholder.ui             |  5 +++++
 tests/samples/property.ui                |  5 +++++
 tests/samples/property_binding.ui        |  5 +++++
 tests/samples/responses.ui               |  5 +++++
 tests/samples/scale_marks.ui             |  5 +++++
 tests/samples/signal.ui                  |  5 +++++
 tests/samples/size_group.ui              |  5 +++++
 tests/samples/string_list.ui             |  5 +++++
 tests/samples/strings.ui                 |  5 +++++
 tests/samples/style.ui                   |  5 +++++
 tests/samples/subscope.ui                | 10 ++++++++++
 tests/samples/template.ui                |  5 +++++
 tests/samples/template_bind_property.ui  |  5 +++++
 tests/samples/template_binding.ui        |  5 +++++
 tests/samples/template_binding_extern.ui |  5 +++++
 tests/samples/template_id.ui             |  5 +++++
 tests/samples/template_no_parent.ui      |  5 +++++
 tests/samples/template_simple_binding.ui |  5 +++++
 tests/samples/translated.ui              |  5 +++++
 tests/samples/typeof.ui                  |  5 +++++
 tests/samples/uint.ui                    |  5 +++++
 tests/samples/unchecked_class.ui         |  5 +++++
 tests/samples/using.ui                   |  5 +++++
 43 files changed, 225 insertions(+)

diff --git a/tests/samples/accessibility.ui b/tests/samples/accessibility.ui
index 321f20f..7732a14 100644
--- a/tests/samples/accessibility.ui
+++ b/tests/samples/accessibility.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/action_widgets.ui b/tests/samples/action_widgets.ui
index 91b6e64..ac730a2 100644
--- a/tests/samples/action_widgets.ui
+++ b/tests/samples/action_widgets.ui
@@ -1,4 +1,9 @@
 <?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="GtkDialog">
diff --git a/tests/samples/adw_breakpoint.ui b/tests/samples/adw_breakpoint.ui
index b2d5ec3..f667958 100644
--- a/tests/samples/adw_breakpoint.ui
+++ b/tests/samples/adw_breakpoint.ui
@@ -1,4 +1,9 @@
 <?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" id="label"></object>
diff --git a/tests/samples/child_type.ui b/tests/samples/child_type.ui
index df9386e..56f03eb 100644
--- a/tests/samples/child_type.ui
+++ b/tests/samples/child_type.ui
@@ -1,4 +1,9 @@
 <?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="GtkWindow">
diff --git a/tests/samples/combo_box_text.ui b/tests/samples/combo_box_text.ui
index bb234d3..c160d80 100644
--- a/tests/samples/combo_box_text.ui
+++ b/tests/samples/combo_box_text.ui
@@ -1,4 +1,9 @@
 <?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="GtkComboBoxText">
diff --git a/tests/samples/comments.ui b/tests/samples/comments.ui
index b916a09..bd3378a 100644
--- a/tests/samples/comments.ui
+++ b/tests/samples/comments.ui
@@ -1,4 +1,9 @@
 <?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="GObject"></object>
diff --git a/tests/samples/enum.ui b/tests/samples/enum.ui
index d2cda1e..e6ad9d4 100644
--- a/tests/samples/enum.ui
+++ b/tests/samples/enum.ui
@@ -1,4 +1,9 @@
 <?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="GtkScrolledWindow">
diff --git a/tests/samples/expr_closure.ui b/tests/samples/expr_closure.ui
index 1581d65..46300da 100644
--- a/tests/samples/expr_closure.ui
+++ b/tests/samples/expr_closure.ui
@@ -1,4 +1,9 @@
 <?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" id="my-label">
diff --git a/tests/samples/expr_closure_args.ui b/tests/samples/expr_closure_args.ui
index 1b539ac..6c702d9 100644
--- a/tests/samples/expr_closure_args.ui
+++ b/tests/samples/expr_closure_args.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/expr_lookup.ui b/tests/samples/expr_lookup.ui
index 91d7590..16172d4 100644
--- a/tests/samples/expr_lookup.ui
+++ b/tests/samples/expr_lookup.ui
@@ -1,4 +1,9 @@
 <?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="GtkOverlay">
diff --git a/tests/samples/file_filter.ui b/tests/samples/file_filter.ui
index 1cb0114..6ac8717 100644
--- a/tests/samples/file_filter.ui
+++ b/tests/samples/file_filter.ui
@@ -1,4 +1,9 @@
 <?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="GtkFileFilter">
diff --git a/tests/samples/flags.ui b/tests/samples/flags.ui
index 56fbf31..2f0a26e 100644
--- a/tests/samples/flags.ui
+++ b/tests/samples/flags.ui
@@ -1,4 +1,9 @@
 <?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="GApplication">
diff --git a/tests/samples/id_prop.ui b/tests/samples/id_prop.ui
index 4940824..cece573 100644
--- a/tests/samples/id_prop.ui
+++ b/tests/samples/id_prop.ui
@@ -1,4 +1,9 @@
 <?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="GtkScale">
diff --git a/tests/samples/issue_119.ui b/tests/samples/issue_119.ui
index 2e039b5..b574549 100644
--- a/tests/samples/issue_119.ui
+++ b/tests/samples/issue_119.ui
@@ -1,4 +1,9 @@
 <?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="GtkAdjustment">
diff --git a/tests/samples/layout.ui b/tests/samples/layout.ui
index 027d010..a8c294f 100644
--- a/tests/samples/layout.ui
+++ b/tests/samples/layout.ui
@@ -1,4 +1,9 @@
 <?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="GtkGrid">
diff --git a/tests/samples/list_factory.ui b/tests/samples/list_factory.ui
index 447a53a..a1e7c27 100644
--- a/tests/samples/list_factory.ui
+++ b/tests/samples/list_factory.ui
@@ -1,10 +1,20 @@
 <?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"?>
+<!--
+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/menu.ui b/tests/samples/menu.ui
index 3b19896..71c3fd2 100644
--- a/tests/samples/menu.ui
+++ b/tests/samples/menu.ui
@@ -1,4 +1,9 @@
 <?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"/>
   <menu id="my-menu">
diff --git a/tests/samples/numbers.ui b/tests/samples/numbers.ui
index 813afe4..b0f9a6b 100644
--- a/tests/samples/numbers.ui
+++ b/tests/samples/numbers.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/object_prop.ui b/tests/samples/object_prop.ui
index 5224073..d338a66 100644
--- a/tests/samples/object_prop.ui
+++ b/tests/samples/object_prop.ui
@@ -1,4 +1,9 @@
 <?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="GtkRange">
diff --git a/tests/samples/parseable.ui b/tests/samples/parseable.ui
index 231a25c..c24ee2c 100644
--- a/tests/samples/parseable.ui
+++ b/tests/samples/parseable.ui
@@ -1,4 +1,9 @@
 <?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="GtkShortcut">
diff --git a/tests/samples/placeholder.ui b/tests/samples/placeholder.ui
index 82d4360..4e703e2 100644
--- a/tests/samples/placeholder.ui
+++ b/tests/samples/placeholder.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/property.ui b/tests/samples/property.ui
index ba8089d..1bf9e9c 100644
--- a/tests/samples/property.ui
+++ b/tests/samples/property.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/property_binding.ui b/tests/samples/property_binding.ui
index c496366..d14e50d 100644
--- a/tests/samples/property_binding.ui
+++ b/tests/samples/property_binding.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/responses.ui b/tests/samples/responses.ui
index ba26de5..48122ca 100644
--- a/tests/samples/responses.ui
+++ b/tests/samples/responses.ui
@@ -1,4 +1,9 @@
 <?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="AdwMessageDialog">
diff --git a/tests/samples/scale_marks.ui b/tests/samples/scale_marks.ui
index 719f888..36956f5 100644
--- a/tests/samples/scale_marks.ui
+++ b/tests/samples/scale_marks.ui
@@ -1,4 +1,9 @@
 <?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="GtkScale">
diff --git a/tests/samples/signal.ui b/tests/samples/signal.ui
index b361d69..8163ca3 100644
--- a/tests/samples/signal.ui
+++ b/tests/samples/signal.ui
@@ -1,4 +1,9 @@
 <?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="GtkEntry">
diff --git a/tests/samples/size_group.ui b/tests/samples/size_group.ui
index 218b023..a222485 100644
--- a/tests/samples/size_group.ui
+++ b/tests/samples/size_group.ui
@@ -1,4 +1,9 @@
 <?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="GtkSizeGroup">
diff --git a/tests/samples/string_list.ui b/tests/samples/string_list.ui
index 156bc09..74de992 100644
--- a/tests/samples/string_list.ui
+++ b/tests/samples/string_list.ui
@@ -1,4 +1,9 @@
 <?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="GtkStringList" id="greetings">
diff --git a/tests/samples/strings.ui b/tests/samples/strings.ui
index b8ca96a..1dea963 100644
--- a/tests/samples/strings.ui
+++ b/tests/samples/strings.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/style.ui b/tests/samples/style.ui
index a216fdb..c625a3f 100644
--- a/tests/samples/style.ui
+++ b/tests/samples/style.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/subscope.ui b/tests/samples/subscope.ui
index 61bdc18..693a774 100644
--- a/tests/samples/subscope.ui
+++ b/tests/samples/subscope.ui
@@ -1,8 +1,18 @@
 <?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="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">
diff --git a/tests/samples/template.ui b/tests/samples/template.ui
index aebec5e..ea9c8b4 100644
--- a/tests/samples/template.ui
+++ b/tests/samples/template.ui
@@ -1,4 +1,9 @@
 <?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" parent="GtkApplicationWindow">
diff --git a/tests/samples/template_bind_property.ui b/tests/samples/template_bind_property.ui
index eb55547..8dac57b 100644
--- a/tests/samples/template_bind_property.ui
+++ b/tests/samples/template_bind_property.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/template_binding.ui b/tests/samples/template_binding.ui
index 7c8b49d..e8b2455 100644
--- a/tests/samples/template_binding.ui
+++ b/tests/samples/template_binding.ui
@@ -1,4 +1,9 @@
 <?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" parent="GtkBox">
diff --git a/tests/samples/template_binding_extern.ui b/tests/samples/template_binding_extern.ui
index 2bbc88f..f67b09c 100644
--- a/tests/samples/template_binding_extern.ui
+++ b/tests/samples/template_binding_extern.ui
@@ -1,4 +1,9 @@
 <?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" parent="MyParentClass">
diff --git a/tests/samples/template_id.ui b/tests/samples/template_id.ui
index c7791b2..352cd2e 100644
--- a/tests/samples/template_id.ui
+++ b/tests/samples/template_id.ui
@@ -1,4 +1,9 @@
 <?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" parent="GtkButton">
diff --git a/tests/samples/template_no_parent.ui b/tests/samples/template_no_parent.ui
index ea2263e..1f06584 100644
--- a/tests/samples/template_no_parent.ui
+++ b/tests/samples/template_no_parent.ui
@@ -1,4 +1,9 @@
 <?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="GtkListItem"></template>
diff --git a/tests/samples/template_simple_binding.ui b/tests/samples/template_simple_binding.ui
index 41788e4..d858a86 100644
--- a/tests/samples/template_simple_binding.ui
+++ b/tests/samples/template_simple_binding.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/translated.ui b/tests/samples/translated.ui
index 6f84d40..66102a0 100644
--- a/tests/samples/translated.ui
+++ b/tests/samples/translated.ui
@@ -1,4 +1,9 @@
 <?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">
diff --git a/tests/samples/typeof.ui b/tests/samples/typeof.ui
index 4c45869..4157496 100644
--- a/tests/samples/typeof.ui
+++ b/tests/samples/typeof.ui
@@ -1,4 +1,9 @@
 <?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="GListStore">
diff --git a/tests/samples/uint.ui b/tests/samples/uint.ui
index d64f298..f96f15f 100644
--- a/tests/samples/uint.ui
+++ b/tests/samples/uint.ui
@@ -1,4 +1,9 @@
 <?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="GtkFlowBox">
diff --git a/tests/samples/unchecked_class.ui b/tests/samples/unchecked_class.ui
index 6518cfe..9c5ac34 100644
--- a/tests/samples/unchecked_class.ui
+++ b/tests/samples/unchecked_class.ui
@@ -1,4 +1,9 @@
 <?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="MyComponent" id="component">
diff --git a/tests/samples/using.ui b/tests/samples/using.ui
index 5b81551..28dbb01 100644
--- a/tests/samples/using.ui
+++ b/tests/samples/using.ui
@@ -1,4 +1,9 @@
 <?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="GObject"></object>

From 1371dec4942c51c2cdf03a48a1245c4616624201 Mon Sep 17 00:00:00 2001
From: Urtsi Santsi <urtsi.santsi@proton.me>
Date: Sat, 2 Sep 2023 04:23:45 +0300
Subject: [PATCH 174/290] Use the updated test repo

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed26158..6a33444 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 9bfb9325d75a9985310230f119579f07df519e60
+    - git checkout 71522af3607e08143671ee0d224e65e9b9eb9f30
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'

From bc798c544c28ba392b71cc143d9435a588eb66aa Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Wed, 27 Sep 2023 10:51:48 -0500
Subject: [PATCH 175/290] docs: Fix grammar for bindings

Binding flags were missing from the documented grammar. Also added prose
documentation about the available flags.
---
 docs/reference/values.rst | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/docs/reference/values.rst b/docs/reference/values.rst
index a50293d..7c61d78 100644
--- a/docs/reference/values.rst
+++ b/docs/reference/values.rst
@@ -104,17 +104,32 @@ Use ``C_("context", "...")`` to add a *message context* to a string to disambigu
 
 .. _Syntax Binding:
 
-Expression Bindings
--------------------
+Bindings
+--------
 
 .. rst-class:: grammar-block
 
-   Binding = 'bind' :ref:`Expression<Syntax Expression>`
+   Binding = 'bind' :ref:`Expression<Syntax Expression>` (BindingFlag)*
+   BindingFlag = 'inverted' | 'bidirectional' | '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.
 
 The simplest bindings connect to a property of another object in the blueprint. When that other property changes, the bound property updates as well. More advanced bindings can do multi-step property lookups and can even call application code to compute values. See :ref:`the expressions page<Syntax Expression>`.
 
+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.
+- ``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
+~~~~~~~~~~~~~~~~
+
+Bindings with more complex expressions are implemented with `Gtk.Expression <https://docs.gtk.org/gtk4/class.Expression.html>`_. These bindings do not support flags.
+
 Example
 ~~~~~~~
 
@@ -126,13 +141,10 @@ Example
    Switch advanced_feature {}
 
    Label warning {
-     visible: bind-property advanced_feature.active;
+     visible: bind advanced_feature.active;
      label: _("This is an advanced feature. Use with caution!");
    }
 
-.. code-block: blueprintui
-
-
 
 .. _Syntax ObjectValue:
 

From ea92838cf318a5a6e8f9334ccdef063470cc4d96 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 28 Sep 2023 14:41:12 -0500
Subject: [PATCH 176/290] Parse escape sequences instead of using replace

That way we can warn about invalid sequences. Also, the previous code had at least one subtle bug (`\\\\'`).
---
 blueprintcompiler/decompiler.py             | 11 +----
 blueprintcompiler/parse_tree.py             | 22 +++++----
 blueprintcompiler/utils.py                  | 52 +++++++++++++++++++++
 tests/sample_errors/bad_escape_sequence.blp |  5 ++
 tests/sample_errors/bad_escape_sequence.err |  1 +
 tests/samples/strings.blp                   |  2 +-
 tests/samples/strings.ui                    |  4 +-
 7 files changed, 76 insertions(+), 21 deletions(-)
 create mode 100644 tests/sample_errors/bad_escape_sequence.blp
 create mode 100644 tests/sample_errors/bad_escape_sequence.err

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 98e00af..550f60b 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -23,7 +23,7 @@ from dataclasses import dataclass
 from enum import Enum
 
 from .gir import *
-from .utils import Colors
+from .utils import Colors, escape_quote
 from .xml_reader import Element, parse, parse_string
 
 __all__ = ["decompile"]
@@ -253,15 +253,6 @@ def decompiler(tag, cdata=False):
     return decorator
 
 
-def escape_quote(string: str) -> str:
-    return (
-        string.replace("\\", "\\\\")
-        .replace("'", "\\'")
-        .replace('"', '\\"')
-        .replace("\n", "\\n")
-    )
-
-
 @decompiler("interface")
 def decompile_interface(ctx, gir):
     return gir
diff --git a/blueprintcompiler/parse_tree.py b/blueprintcompiler/parse_tree.py
index 8f3ef31..fff6e4a 100644
--- a/blueprintcompiler/parse_tree.py
+++ b/blueprintcompiler/parse_tree.py
@@ -22,6 +22,7 @@
 import typing as T
 from enum import Enum
 
+from . import utils
 from .ast_utils import AstNode
 from .errors import (
     CompileError,
@@ -573,14 +574,19 @@ class UseQuoted(ParseNode):
         if token.type != TokenType.QUOTED:
             return False
 
-        string = (
-            str(token)[1:-1]
-            .replace("\\n", "\n")
-            .replace('\\"', '"')
-            .replace("\\\\", "\\")
-            .replace("\\'", "'")
-        )
-        ctx.set_group_val(self.key, string, token)
+        unescaped = None
+
+        try:
+            unescaped = utils.unescape_quote(str(token))
+        except utils.UnescapeError as e:
+            start = ctx.tokens[ctx.index - 1].start
+            range = Range(start + e.start, start + e.end, ctx.text)
+            ctx.errors.append(
+                CompileError(f"Invalid escape sequence '{range.text}'", range)
+            )
+
+        ctx.set_group_val(self.key, unescaped, token)
+
         return True
 
 
diff --git a/blueprintcompiler/utils.py b/blueprintcompiler/utils.py
index 4c4b44a..6d03a9e 100644
--- a/blueprintcompiler/utils.py
+++ b/blueprintcompiler/utils.py
@@ -18,6 +18,7 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 import typing as T
+from dataclasses import dataclass
 
 
 class Colors:
@@ -98,3 +99,54 @@ def idxs_to_range(start: int, end: int, text: str):
             "character": end_c,
         },
     }
+
+
+@dataclass
+class UnescapeError(Exception):
+    start: int
+    end: int
+
+
+def escape_quote(string: str) -> str:
+    return (
+        string.replace("\\", "\\\\")
+        .replace("'", "\\'")
+        .replace('"', '\\"')
+        .replace("\n", "\\n")
+        .replace("\t", "\\t")
+    )
+
+
+def unescape_quote(string: str) -> str:
+    string = string[1:-1]
+
+    REPLACEMENTS = {
+        "\\": "\\",
+        "n": "\n",
+        "t": "\t",
+        '"': '"',
+        "'": "'",
+    }
+
+    result = ""
+    i = 0
+    while i < len(string):
+        c = string[i]
+        if c == "\\":
+            i += 1
+
+            if i >= len(string):
+                from .errors import CompilerBugError
+
+                raise CompilerBugError()
+
+            if r := REPLACEMENTS.get(string[i]):
+                result += r
+            else:
+                raise UnescapeError(i, i + 2)
+        else:
+            result += c
+
+        i += 1
+
+    return result
diff --git a/tests/sample_errors/bad_escape_sequence.blp b/tests/sample_errors/bad_escape_sequence.blp
new file mode 100644
index 0000000..4b109c6
--- /dev/null
+++ b/tests/sample_errors/bad_escape_sequence.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: '***** \f *****';
+}
diff --git a/tests/sample_errors/bad_escape_sequence.err b/tests/sample_errors/bad_escape_sequence.err
new file mode 100644
index 0000000..e4ec183
--- /dev/null
+++ b/tests/sample_errors/bad_escape_sequence.err
@@ -0,0 +1 @@
+4,17,2,Invalid escape sequence '\f'
\ No newline at end of file
diff --git a/tests/samples/strings.blp b/tests/samples/strings.blp
index ef237ae..08bb418 100644
--- a/tests/samples/strings.blp
+++ b/tests/samples/strings.blp
@@ -1,5 +1,5 @@
 using Gtk 4.0;
 
 Label {
-  label: "Test 1 2 3\n & 4 \"5\' 6";
+  label: "\\\\'Test 1 2 3\n & 4 \"5\' 6 \t";
 }
diff --git a/tests/samples/strings.ui b/tests/samples/strings.ui
index 1dea963..e7fef2e 100644
--- a/tests/samples/strings.ui
+++ b/tests/samples/strings.ui
@@ -7,7 +7,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GtkLabel">
-    <property name="label">Test 1 2 3
- &amp; 4 "5' 6</property>
+    <property name="label">\\'Test 1 2 3
+ &amp; 4 "5' 6 	</property>
   </object>
 </interface>

From 3d5a5521aac5a8d727d736f9d9e8de924b2fd119 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 28 Sep 2023 14:51:16 -0500
Subject: [PATCH 177/290] decompiler: Use single quotes

---
 blueprintcompiler/decompiler.py               | 14 +++++++-------
 blueprintcompiler/language/gtk_a11y.py        |  2 +-
 blueprintcompiler/language/gtk_file_filter.py |  6 +++---
 blueprintcompiler/utils.py                    | 13 ++++++++-----
 tests/samples/accessibility_dec.blp           |  2 +-
 tests/samples/file_filter.blp                 | 10 +++++-----
 tests/samples/layout_dec.blp                  |  4 ++--
 tests/samples/menu_dec.blp                    | 16 ++++++++--------
 tests/samples/responses.blp                   |  6 +++---
 tests/samples/scale_marks.blp                 |  2 +-
 tests/samples/strings_dec.blp                 |  5 +++++
 tests/samples/template.blp                    |  2 +-
 tests/samples/translated.blp                  |  4 ++--
 tests/samples/unchecked_class_dec.blp         |  2 +-
 tests/test_samples.py                         |  2 +-
 15 files changed, 49 insertions(+), 41 deletions(-)
 create mode 100644 tests/samples/strings_dec.blp

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 550f60b..2663a09 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -138,7 +138,7 @@ class DecompileCtx:
             return value.replace("-", "_")
 
         if type is None:
-            self.print(f'{name}: "{escape_quote(value)}";')
+            self.print(f"{name}: {escape_quote(value)};")
         elif type.assignable_to(FloatType()):
             self.print(f"{name}: {value};")
         elif type.assignable_to(BoolType()):
@@ -157,7 +157,7 @@ class DecompileCtx:
                 self.gir.namespaces["Gtk"].lookup_type("Gtk.ShortcutTrigger")
             )
         ):
-            self.print(f'{name}: "{escape_quote(value)}";')
+            self.print(f"{name}: {escape_quote(value)};")
         elif value == self.template_class:
             self.print(f"{name}: template;")
         elif type.assignable_to(
@@ -170,7 +170,7 @@ class DecompileCtx:
         elif isinstance(type, Enumeration):
             self.print(f"{name}: {get_enum_name(value)};")
         else:
-            self.print(f'{name}: "{escape_quote(value)}";')
+            self.print(f"{name}: {escape_quote(value)};")
 
 
 def _decompile_element(
@@ -280,11 +280,11 @@ def decompile_translatable(
             comments = f"/* Translators: {comments} */"
 
         if context is not None:
-            return comments, f'C_("{escape_quote(context)}", "{escape_quote(string)}")'
+            return comments, f"C_({escape_quote(context)}, {escape_quote(string)})"
         else:
-            return comments, f'_("{escape_quote(string)}")'
+            return comments, f"_({escape_quote(string)})"
     else:
-        return comments, f'"{escape_quote(string)}"'
+        return comments, f"{escape_quote(string)}"
 
 
 @decompiler("property", cdata=True)
@@ -325,7 +325,7 @@ def decompile_property(
             ctx.print(comments)
         ctx.print(f"{name}: {translatable};")
     elif gir is None or gir.properties.get(name) is None:
-        ctx.print(f'{name}: "{escape_quote(cdata)}";')
+        ctx.print(f"{name}: {escape_quote(cdata)};")
     else:
         ctx.print_attribute(name, cdata, gir.properties.get(name).type)
     return gir
diff --git a/blueprintcompiler/language/gtk_a11y.py b/blueprintcompiler/language/gtk_a11y.py
index 2ad8097..a4c3415 100644
--- a/blueprintcompiler/language/gtk_a11y.py
+++ b/blueprintcompiler/language/gtk_a11y.py
@@ -231,7 +231,7 @@ def decompile_relation(ctx, gir, name, cdata):
 @decompiler("state", cdata=True)
 def decompile_state(ctx, gir, name, cdata, translatable="false"):
     if decompile.truthy(translatable):
-        ctx.print(f'{name}: _("{escape_quote(cdata)}");')
+        ctx.print(f"{name}: _({escape_quote(cdata)});")
     else:
         ctx.print_attribute(name, cdata, get_types(ctx.gir).get(name))
 
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 8dcbcb8..482d6e1 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/blueprintcompiler/language/gtk_file_filter.py
@@ -119,7 +119,7 @@ def decompile_mime_types(ctx, gir):
 
 @decompiler("mime-type", cdata=True)
 def decompile_mime_type(ctx, gir, cdata):
-    ctx.print(f'"{cdata}",')
+    ctx.print(f"{escape_quote(cdata)},")
 
 
 @decompiler("patterns")
@@ -129,7 +129,7 @@ def decompile_patterns(ctx, gir):
 
 @decompiler("pattern", cdata=True)
 def decompile_pattern(ctx, gir, cdata):
-    ctx.print(f'"{cdata}",')
+    ctx.print(f"{escape_quote(cdata)},")
 
 
 @decompiler("suffixes")
@@ -139,4 +139,4 @@ def decompile_suffixes(ctx, gir):
 
 @decompiler("suffix", cdata=True)
 def decompile_suffix(ctx, gir, cdata):
-    ctx.print(f'"{cdata}",')
+    ctx.print(f"{escape_quote(cdata)},")
diff --git a/blueprintcompiler/utils.py b/blueprintcompiler/utils.py
index 6d03a9e..25803d7 100644
--- a/blueprintcompiler/utils.py
+++ b/blueprintcompiler/utils.py
@@ -109,11 +109,14 @@ class UnescapeError(Exception):
 
 def escape_quote(string: str) -> str:
     return (
-        string.replace("\\", "\\\\")
-        .replace("'", "\\'")
-        .replace('"', '\\"')
-        .replace("\n", "\\n")
-        .replace("\t", "\\t")
+        "'"
+        + (
+            string.replace("\\", "\\\\")
+            .replace("'", "\\'")
+            .replace("\n", "\\n")
+            .replace("\t", "\\t")
+        )
+        + "'"
     )
 
 
diff --git a/tests/samples/accessibility_dec.blp b/tests/samples/accessibility_dec.blp
index a603e25..eedb6cd 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/file_filter.blp b/tests/samples/file_filter.blp
index 3a52c3f..e9866d9 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/layout_dec.blp b/tests/samples/layout_dec.blp
index b0e66e0..3754fe1 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/menu_dec.blp b/tests/samples/menu_dec.blp
index 14b4df3..44c244f 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/responses.blp b/tests/samples/responses.blp
index d7032a7..be8c03b 100644
--- a/tests/samples/responses.blp
+++ b/tests/samples/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/scale_marks.blp b/tests/samples/scale_marks.blp
index a766cfa..f75930c 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/strings_dec.blp b/tests/samples/strings_dec.blp
new file mode 100644
index 0000000..576ddb4
--- /dev/null
+++ b/tests/samples/strings_dec.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: '\\\\\'Test 1 2 3\n & 4 "5\' 6 \t';
+}
diff --git a/tests/samples/template.blp b/tests/samples/template.blp
index fa2f041..fb019d3 100644
--- a/tests/samples/template.blp
+++ b/tests/samples/template.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 
 template $TestTemplate : ApplicationWindow {
-  test-property: "Hello, world";
+  test-property: 'Hello, world';
   test-signal => $on_test_signal();
 }
 
diff --git a/tests/samples/translated.blp b/tests/samples/translated.blp
index c7d4cd7..8c837d7 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/unchecked_class_dec.blp b/tests/samples/unchecked_class_dec.blp
index dbbfe14..d9df875 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 226e762..a91a594 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -229,7 +229,7 @@ class TestSamples(unittest.TestCase):
         self.assert_decompile("responses")
         self.assert_decompile("scale_marks")
         self.assert_decompile("signal")
-        self.assert_decompile("strings")
+        self.assert_decompile("strings_dec")
         self.assert_decompile("style_dec")
         self.assert_decompile("template")
         self.assert_decompile("translated")

From 7c072c0a32bd217dd639d4911bdde20cdaab7b44 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 28 Sep 2023 17:13:02 -0500
Subject: [PATCH 178/290] tests: Use assertEqual instead of custom diff code

---
 tests/test_samples.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/tests/test_samples.py b/tests/test_samples.py
index a91a594..38b72d6 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -18,7 +18,6 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 
-import difflib  # I love Python
 import unittest
 from pathlib import Path
 
@@ -41,6 +40,10 @@ from blueprintcompiler.tokenizer import Token, TokenType, tokenize
 
 
 class TestSamples(unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.maxDiff = None
+
     def assert_ast_doesnt_crash(self, text, tokens, ast):
         for i in range(len(text)):
             ast.get_docs(i)
@@ -74,10 +77,7 @@ class TestSamples(unittest.TestCase):
 
             xml = XmlOutput()
             actual = xml.emit(ast)
-            if actual.strip() != expected.strip():  # pragma: no cover
-                diff = difflib.unified_diff(expected.splitlines(), actual.splitlines())
-                print("\n".join(diff))
-                raise AssertionError()
+            self.assertEqual(actual.strip(), expected.strip())
 
             self.assert_ast_doesnt_crash(blueprint, tokens, ast)
         except PrintableError as e:  # pragma: no cover
@@ -126,10 +126,7 @@ class TestSamples(unittest.TestCase):
             else:  # pragma: no cover
                 raise AssertionError()
 
-            if actual.strip() != expected.strip():  # pragma: no cover
-                diff = difflib.unified_diff(expected.splitlines(), actual.splitlines())
-                print("\n".join(diff))
-                raise AssertionError()
+            self.assertEqual(actual.strip(), expected.strip())
         else:  # pragma: no cover
             raise AssertionError("Expected a compiler error, but none was emitted")
 
@@ -144,10 +141,7 @@ class TestSamples(unittest.TestCase):
 
             actual = decompiler.decompile(ui_path)
 
-            if actual.strip() != expected.strip():  # pragma: no cover
-                diff = difflib.unified_diff(expected.splitlines(), actual.splitlines())
-                print("\n".join(diff))
-                raise AssertionError()
+            self.assertEqual(actual.strip(), expected.strip())
         except PrintableError as e:  # pragma: no cover
             e.pretty_print(name + ".blp", blueprint)
             raise AssertionError()

From 09bed9a9f53e11218be9b7c70dac516986e2ecdb Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 28 Sep 2023 18:17:43 -0500
Subject: [PATCH 179/290] tokenizer: Fix QUOTED regex

unescape_quote() assumed that a QUOTED token wouldn't end in the middle
of an escape sequence, but that assumption could fail (a bug found by
the fuzzer).
---
 blueprintcompiler/tokenizer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 1ab6def..33ae272 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -39,8 +39,8 @@ class TokenType(Enum):
 
 _tokens = [
     (TokenType.IDENT, r"[A-Za-z_][\d\w\-_]*"),
-    (TokenType.QUOTED, r'"(\\"|[^"\n])*"'),
-    (TokenType.QUOTED, r"'(\\'|[^'\n])*'"),
+    (TokenType.QUOTED, r'"(\\.|[^\\"\n])*"'),
+    (TokenType.QUOTED, r"'(\\.|[^\\'\n])*'"),
     (TokenType.NUMBER, r"0x[A-Za-z0-9_]+"),
     (TokenType.NUMBER, r"[\d_]+(\.[\d_]+)?"),
     (TokenType.NUMBER, r"\.[\d_]+"),

From 9543b7813815b59834d85c114a0fca5488dd4593 Mon Sep 17 00:00:00 2001
From: gregorni <gregorniehl@web.de>
Date: Thu, 26 Oct 2023 23:45:34 +0000
Subject: [PATCH 180/290] Add justfile

---
 justfile | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 justfile

diff --git a/justfile b/justfile
new file mode 100644
index 0000000..5c956db
--- /dev/null
+++ b/justfile
@@ -0,0 +1,22 @@
+default: black isort
+
+# Format with black formatter
+black:
+    black blueprintcompiler/
+
+# Sort imports using isort
+isort:
+    isort blueprintcompiler/ --profile black
+
+
+# Run all tests
+test: mypy unittest
+
+# Check typings with mypy
+mypy:
+    mypy --python-version=3.9 blueprintcompiler/
+
+# Test code with unittest
+unittest:
+    python3 -m unittest
+

From 2faa9207ded3871b6b87364c9175798760b418af Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 26 Oct 2023 18:50:07 -0500
Subject: [PATCH 181/290] tokenizer: Allow escaped newlines

The docs said multi-line strings were possible by escaping the newline
character, but this was not actually implemented.

Fixes #132.
---
 blueprintcompiler/tokenizer.py     |  4 ++--
 blueprintcompiler/utils.py         |  1 +
 tests/samples/multiline_string.blp |  6 ++++++
 tests/samples/multiline_string.ui  | 13 +++++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 tests/samples/multiline_string.blp
 create mode 100644 tests/samples/multiline_string.ui

diff --git a/blueprintcompiler/tokenizer.py b/blueprintcompiler/tokenizer.py
index 33ae272..6cc0761 100644
--- a/blueprintcompiler/tokenizer.py
+++ b/blueprintcompiler/tokenizer.py
@@ -39,8 +39,8 @@ class TokenType(Enum):
 
 _tokens = [
     (TokenType.IDENT, r"[A-Za-z_][\d\w\-_]*"),
-    (TokenType.QUOTED, r'"(\\.|[^\\"\n])*"'),
-    (TokenType.QUOTED, r"'(\\.|[^\\'\n])*'"),
+    (TokenType.QUOTED, r'"(\\(.|\n)|[^\\"\n])*"'),
+    (TokenType.QUOTED, r"'(\\(.|\n)|[^\\'\n])*'"),
     (TokenType.NUMBER, r"0x[A-Za-z0-9_]+"),
     (TokenType.NUMBER, r"[\d_]+(\.[\d_]+)?"),
     (TokenType.NUMBER, r"\.[\d_]+"),
diff --git a/blueprintcompiler/utils.py b/blueprintcompiler/utils.py
index 25803d7..6f2bd40 100644
--- a/blueprintcompiler/utils.py
+++ b/blueprintcompiler/utils.py
@@ -124,6 +124,7 @@ def unescape_quote(string: str) -> str:
     string = string[1:-1]
 
     REPLACEMENTS = {
+        "\n": "\n",
         "\\": "\\",
         "n": "\n",
         "t": "\t",
diff --git a/tests/samples/multiline_string.blp b/tests/samples/multiline_string.blp
new file mode 100644
index 0000000..ec4c8f8
--- /dev/null
+++ b/tests/samples/multiline_string.blp
@@ -0,0 +1,6 @@
+using Gtk 4.0;
+
+Label {
+  label: "Hello,\
+world!";
+}
diff --git a/tests/samples/multiline_string.ui b/tests/samples/multiline_string.ui
new file mode 100644
index 0000000..38750d7
--- /dev/null
+++ b/tests/samples/multiline_string.ui
@@ -0,0 +1,13 @@
+<?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">Hello,
+world!</property>
+  </object>
+</interface>

From 4fa64cdf33cb64dbb74ed677292b59b893352010 Mon Sep 17 00:00:00 2001
From: Gregor Niehl <gregorniehl@web.de>
Date: Fri, 3 Nov 2023 06:48:28 -0500
Subject: [PATCH 182/290] Add a formatter

---
 blueprintcompiler/formatter.py  | 225 ++++++++++++++++++++++++++++++++
 blueprintcompiler/lsp.py        |  35 +++++
 blueprintcompiler/lsp_utils.py  |   9 ++
 blueprintcompiler/main.py       | 138 +++++++++++++++++++-
 docs/conf.py                    |  19 ++-
 tests/formatting/correct1.blp   |  71 ++++++++++
 tests/formatting/in1.blp        |   1 +
 tests/formatting/in2.blp        |  40 ++++++
 tests/formatting/out.blp        |  28 ++++
 tests/formatting/string_in.blp  |   5 +
 tests/formatting/string_out.blp |   5 +
 tests/test_formatter.py         |  48 +++++++
 12 files changed, 613 insertions(+), 11 deletions(-)
 create mode 100644 blueprintcompiler/formatter.py
 create mode 100644 tests/formatting/correct1.blp
 create mode 100644 tests/formatting/in1.blp
 create mode 100644 tests/formatting/in2.blp
 create mode 100644 tests/formatting/out.blp
 create mode 100644 tests/formatting/string_in.blp
 create mode 100644 tests/formatting/string_out.blp
 create mode 100644 tests/test_formatter.py

diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py
new file mode 100644
index 0000000..0f09679
--- /dev/null
+++ b/blueprintcompiler/formatter.py
@@ -0,0 +1,225 @@
+# formatter.py
+#
+# Copyright 2023 Gregor Niehl <gregorniehl@web.de>
+#
+# 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 re
+from enum import Enum
+
+from . import tokenizer, utils
+from .tokenizer import TokenType
+
+OPENING_TOKENS = ("{", "[")
+CLOSING_TOKENS = ("}", "]")
+
+NEWLINE_AFTER = tuple(";") + OPENING_TOKENS + CLOSING_TOKENS
+
+NO_WHITESPACE_BEFORE = (",", ":", "::", ";", ")", ".", ">", "]", "=")
+NO_WHITESPACE_AFTER = ("C_", "_", "(", ".", "$", "<", "::", "[", "=")
+
+# NO_WHITESPACE_BEFORE takes precedence over WHITESPACE_AFTER
+WHITESPACE_AFTER = (":", ",", ">", ")", "|", "=>")
+WHITESPACE_BEFORE = ("{", "|")
+
+
+class LineType(Enum):
+    STATEMENT = 0
+    BLOCK_OPEN = 1
+    BLOCK_CLOSE = 2
+    CHILD_TYPE = 3
+    COMMENT = 4
+
+
+class Formatter:
+    def format(data, tab_size=2, insert_space=True):
+        indent_levels = 0
+        tokens = tokenizer.tokenize(data)
+        end_str = ""
+        last_not_whitespace = tokens[0]
+        current_line = ""
+        prev_line_type = None
+        is_child_type = False
+        indent_item = " " * tab_size if insert_space else "\t"
+        watch_parentheses = False
+        parentheses_balance = 0
+        bracket_tracker = [None]
+
+        def commit_current_line(
+            line_type=prev_line_type, redo_whitespace=False, newlines_before=1
+        ):
+            nonlocal end_str, current_line, prev_line_type
+
+            indent_whitespace = indent_levels * indent_item
+            whitespace_to_add = "\n" + indent_whitespace
+
+            if redo_whitespace or newlines_before != 1:
+                end_str = end_str.strip() + ("\n" * newlines_before)
+                if newlines_before > 0:
+                    end_str += indent_whitespace
+
+            end_str += current_line + whitespace_to_add
+
+            current_line = ""
+            prev_line_type = line_type
+
+        for item in tokens:
+            if item.type != TokenType.WHITESPACE:
+                str_item = str(item)
+
+                whitespace_required = (
+                    str_item in WHITESPACE_BEFORE
+                    or str(last_not_whitespace) in WHITESPACE_AFTER
+                )
+                whitespace_blockers = (
+                    str_item in NO_WHITESPACE_BEFORE
+                    or str(last_not_whitespace) in NO_WHITESPACE_AFTER
+                )
+
+                this_or_last_is_ident = (
+                    item.type == TokenType.IDENT
+                    or last_not_whitespace.type == TokenType.IDENT
+                )
+                current_line_is_empty = len(current_line) == 0
+                just_one_word_on_line = re.match(r"^([A-Za-z_\-])+$", current_line)
+                is_short_object_def = str_item == "(" and not just_one_word_on_line
+
+                any_blockers = (
+                    whitespace_blockers or current_line_is_empty or is_short_object_def
+                )
+
+                if (whitespace_required or this_or_last_is_ident) and not any_blockers:
+                    current_line += " "
+
+                current_line += str_item
+
+                if str_item in ["[", "("]:
+                    bracket_tracker.append(str_item)
+                elif str_item in ["]", ")"]:
+                    bracket_tracker.pop()
+
+                needs_newline_treatment = (
+                    str_item in NEWLINE_AFTER or item.type == TokenType.COMMENT
+                )
+                if needs_newline_treatment:
+                    if str_item in OPENING_TOKENS:
+                        list_or_child_type = str_item == "["
+                        if list_or_child_type:
+                            is_child_type = current_line.startswith("[")
+
+                            if is_child_type:
+                                if str(last_not_whitespace) not in OPENING_TOKENS:
+                                    end_str = (
+                                        end_str.strip()
+                                        + "\n\n"
+                                        + (indent_item * indent_levels)
+                                    )
+                                last_not_whitespace = item
+                                continue
+
+                        indent_levels += 1
+                        keep_same_indent = not prev_line_type in [
+                            LineType.CHILD_TYPE,
+                            LineType.COMMENT,
+                            LineType.BLOCK_OPEN,
+                        ]
+                        if keep_same_indent:
+                            end_str = (
+                                end_str.strip()
+                                + "\n\n"
+                                + (indent_item * (indent_levels - 1))
+                            )
+                        commit_current_line(LineType.BLOCK_OPEN)
+
+                    elif str_item == "]" and is_child_type:
+                        commit_current_line(LineType.CHILD_TYPE, False)
+                        is_child_type = False
+
+                    elif str_item in CLOSING_TOKENS:
+                        if str_item == "]" and last_not_whitespace != ",":
+                            current_line = current_line[:-1]
+                            commit_current_line()
+                            current_line = "]"
+
+                        indent_levels -= 1
+                        commit_current_line(LineType.BLOCK_CLOSE, True)
+
+                    elif str_item == ";":
+                        line_type = LineType.STATEMENT
+                        if len(current_line) == 1:
+                            newlines = 0
+                            line_type = LineType.BLOCK_CLOSE
+                        elif prev_line_type == LineType.BLOCK_CLOSE:
+                            newlines = 2
+                        else:
+                            newlines = 1
+
+                        commit_current_line(line_type, newlines_before=newlines)
+
+                    elif item.type == TokenType.COMMENT:
+                        require_extra_newline = [
+                            LineType.BLOCK_CLOSE,
+                            LineType.STATEMENT,
+                            LineType.COMMENT,
+                        ]
+
+                        single_line_comment = str_item.startswith("//")
+                        if (
+                            single_line_comment
+                            and prev_line_type == LineType.BLOCK_CLOSE
+                        ) or (
+                            not single_line_comment
+                            and prev_line_type in require_extra_newline
+                        ):
+                            newlines = 2
+                        else:
+                            newlines = 1
+
+                        commit_current_line(LineType.COMMENT, newlines_before=newlines)
+
+                    else:
+                        commit_current_line()
+
+                elif str_item == "(" and (
+                    re.match("^([A-Za-z_\-])+\s*\(", current_line) or watch_parentheses
+                ):
+                    watch_parentheses = True
+                    parentheses_balance += 1
+
+                elif str_item == ")" and watch_parentheses:
+                    parentheses_balance -= 1
+                    all_parentheses_closed = parentheses_balance == 0
+                    if all_parentheses_closed:
+                        commit_current_line(
+                            newlines_before=2
+                            if prev_line_type == LineType.BLOCK_CLOSE
+                            else 1
+                        )
+                        watch_parentheses = False
+
+                tracker_is_empty = len(bracket_tracker) > 0
+                if tracker_is_empty:
+                    last_in_tracker = bracket_tracker[-1]
+                    is_list_comma = last_in_tracker == "[" and str_item == ","
+                    if is_list_comma:
+                        last_was_list_item = end_str.strip()[-1] not in ["[", ","]
+                        if last_was_list_item:
+                            end_str = end_str.strip()
+                        commit_current_line()
+
+                last_not_whitespace = item
+
+        return end_str
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 9ef6f57..62d3dcc 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -22,11 +22,13 @@ import json
 import sys
 import traceback
 import typing as T
+from difflib import SequenceMatcher
 
 from . import decompiler, parser, tokenizer, utils, xml_reader
 from .ast_utils import AstNode
 from .completions import complete
 from .errors import CompileError, MultipleErrors
+from .formatter import Formatter
 from .lsp_utils import *
 from .outputs.xml import XmlOutput
 from .tokenizer import Token
@@ -211,6 +213,7 @@ class LanguageServer:
                     "hoverProvider": True,
                     "documentSymbolProvider": True,
                     "definitionProvider": True,
+                    "documentFormattingProvider": True,
                 },
                 "serverInfo": {
                     "name": "Blueprint",
@@ -280,6 +283,38 @@ class LanguageServer:
             id, [completion.to_json(True) for completion in completions]
         )
 
+    @command("textDocument/formatting")
+    def formatting(self, id, params):
+        open_file = self._open_files[params["textDocument"]["uri"]]
+
+        if open_file.text is None:
+            self._send_error(id, ErrorCode.RequestFailed, "Document is not open")
+            return
+
+        try:
+            formatted_blp = Format.format(
+                open_file.text,
+                params["options"]["tabSize"],
+                params["options"]["insertSpaces"],
+            )
+        except PrintableError:
+            self._send_error(id, ErrorCode.RequestFailed, "Could not format document")
+            return
+
+        lst = []
+        for tag, i1, i2, j1, j2 in SequenceMatcher(
+            None, open_file.text, formatted_blp
+        ).get_opcodes():
+            if tag in ("replace", "insert", "delete"):
+                lst.append(
+                    TextEdit(
+                        Range(i1, i2, open_file.text),
+                        "" if tag == "delete" else formatted_blp[j1:j2],
+                    ).to_json()
+                )
+
+        self._send_response(id, lst)
+
     @command("textDocument/x-blueprint-compile")
     def compile(self, id, params):
         open_file = self._open_files[params["textDocument"]["uri"]]
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 33ae923..60ddd4e 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -186,3 +186,12 @@ class LocationLink:
             "targetRange": self.target_range.to_json(),
             "targetSelectionRange": self.target_selection_range.to_json(),
         }
+
+
+@dataclass
+class TextEdit:
+    range: Range
+    newText: str
+
+    def to_json(self):
+        return {"range": self.range.to_json(), "newText": self.newText}
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index 4666d78..c9ee944 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -19,13 +19,14 @@
 
 
 import argparse
-import json
+import difflib
 import os
 import sys
 import typing as T
 
 from . import interactive_port, parser, tokenizer
 from .errors import CompileError, CompilerBugError, PrintableError, report_bug
+from .formatter import Formatter
 from .gir import add_typelib_search_path
 from .lsp import LanguageServer
 from .outputs import XmlOutput
@@ -66,6 +67,36 @@ class BlueprintApp:
             type=argparse.FileType("r"),
         )
 
+        format = self.add_subcommand(
+            "format", "Format given blueprint files", self.cmd_format
+        )
+        format.add_argument(
+            "-f",
+            "--fix",
+            help="Apply the edits to the files",
+            default=False,
+            action="store_true",
+        )
+        format.add_argument(
+            "-t",
+            "--tabs",
+            help="Use tabs instead of spaces",
+            default=False,
+            action="store_true",
+        )
+        format.add_argument(
+            "-s",
+            "--spaces-num",
+            help="How many spaces should be used per indent",
+            default=2,
+            type=int,
+        )
+        format.add_argument(
+            "inputs",
+            nargs="+",
+            metavar="filenames",
+        )
+
         port = self.add_subcommand("port", "Interactive porting tool", self.cmd_port)
 
         lsp = self.add_subcommand(
@@ -152,6 +183,111 @@ class BlueprintApp:
                 e.pretty_print(file.name, data)
                 sys.exit(1)
 
+    def cmd_format(self, opts):
+        input_files = []
+        missing_files = []
+        panic = False
+        formatted_files = 0
+        skipped_files = 0
+
+        for path in opts.inputs:
+            if os.path.isfile(path):
+                input_files.append(path)
+            elif os.path.isdir(path):
+                for root, subfolders, files in os.walk(path):
+                    for file in files:
+                        if file.endswith(".blp"):
+                            input_files.append(os.path.join(root, file))
+            else:
+                missing_files.append(path)
+
+        for file in input_files:
+            with open(file, "r+") as file:
+                data = file.read()
+                errored = False
+
+                try:
+                    self._compile(data)
+                except:
+                    errored = True
+
+                formatted_str = Formatter.format(data, opts.spaces_num, not opts.tabs)
+
+                if data != formatted_str:
+                    happened = "Would format"
+
+                    if opts.fix and not errored:
+                        file.seek(0)
+                        file.truncate()
+                        file.write(formatted_str)
+                        happened = "Formatted"
+
+                    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")
+
+                    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"
+                        panic = True
+                        skipped_files += 1
+                    else:
+                        to_print += f"{happened} {file.name}"
+                        formatted_files += 1
+
+                    print(to_print)
+                    print(Colors.CLEAR)
+
+        missing_num = len(missing_files)
+        summary = ""
+
+        if missing_num > 0:
+            print(
+                f"{Colors.BOLD}{Colors.RED}Could not find files:{Colors.CLEAR}{Colors.BOLD}"
+            )
+            for path in missing_files:
+                print(f"  {path}")
+            print(Colors.CLEAR)
+            panic = True
+
+        def would_be(verb):
+            return verb if opts.fix else f"would be {verb}"
+
+        def how_many(count, bold=True):
+            string = f"{Colors.BLUE}{count} {'files' if count != 1 else 'file'}{Colors.CLEAR}"
+            return Colors.BOLD + string + Colors.BOLD if bold else Colors.CLEAR + string
+
+        if formatted_files > 0:
+            summary += f"{how_many(formatted_files)} {would_be('formatted')}, "
+            panic = panic or not opts.fix
+
+        left_files = len(input_files) - formatted_files - skipped_files
+        summary += f"{how_many(left_files, False)} {would_be('left unchanged')}"
+
+        if skipped_files > 0:
+            summary += f", {how_many(skipped_files)} {would_be('skipped')}"
+
+        if missing_num > 0:
+            summary += f", {how_many(missing_num)} not found"
+
+        print(summary + Colors.CLEAR)
+
+        if panic:
+            sys.exit(1)
+
     def cmd_lsp(self, opts):
         langserv = LanguageServer()
         langserv.run()
diff --git a/docs/conf.py b/docs/conf.py
index b5676c2..a397da7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -17,9 +17,9 @@
 
 # -- Project information -----------------------------------------------------
 
-project = 'Blueprint'
-copyright = '2021-2023, James Westman'
-author = 'James Westman'
+project = "Blueprint"
+copyright = "2021-2023, James Westman"
+author = "James Westman"
 
 
 # -- General configuration ---------------------------------------------------
@@ -27,16 +27,15 @@ author = 'James Westman'
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = [
-]
+extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 
 # -- Options for HTML output -------------------------------------------------
@@ -44,11 +43,11 @@ exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'furo'
+html_theme = "furo"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
-html_css_files = ['styles.css']
+html_css_files = ["styles.css"]
diff --git a/tests/formatting/correct1.blp b/tests/formatting/correct1.blp
new file mode 100644
index 0000000..2cb4f23
--- /dev/null
+++ b/tests/formatting/correct1.blp
@@ -0,0 +1,71 @@
+using Gtk 4.0;
+using Adw 1;
+
+template $MyTemplate: Label {
+  /**
+   * A list of strings.
+   */
+  StringList {
+    // comment
+    strings [
+      "Hello",
+      C_("Greeting", "World"),
+    ]
+  }
+
+  object: Button {
+    label: "Click me";
+  };
+
+  flags: a | b;
+
+  [child]
+  Label {
+  }
+
+  [child]
+  Label label2 {
+  }
+
+  // Single line comment.
+
+  /**
+   * Multiline comment.
+   */
+  // Single line comment.
+  value: bind 1.0 as <double>;
+  as: 1;
+  signal => $on_signal() after;
+}
+
+Dialog {
+  [action response=ok]
+  $MyButton {
+  }
+}
+
+menu menu {
+  item ("test")
+
+  item {
+    label: "test";
+  }
+
+  item ("test")
+}
+
+Adw.MessageDialog {
+  responses [
+    save: "Save" suggested disabled,
+  ]
+}
+
+Adw.Breakpoint {
+  condition ("width < 100")
+
+  setters {
+    label2.label: _("Hello, world!");
+    label2.visible: false;
+    label2.extra-menu: null;
+  }
+}
diff --git a/tests/formatting/in1.blp b/tests/formatting/in1.blp
new file mode 100644
index 0000000..f77a3f4
--- /dev/null
+++ b/tests/formatting/in1.blp
@@ -0,0 +1 @@
+using Gtk 4.0;using Adw 1;Overlay{Label label{label:_("'Hello World!' \"\n\t\"");}[overlay]Button{notify::icon-name=>$on_icon_name_changed(label)swapped;styles["destructive"]}visible:bind $isVisible(label.visible,my-menu)as<bool>;width-request:bind label.width-request no-sync-create;}menu my-menu{item(_("Label"), "action-name", "icon-name")item{action:"win.format";}}
\ No newline at end of file
diff --git a/tests/formatting/in2.blp b/tests/formatting/in2.blp
new file mode 100644
index 0000000..137871a
--- /dev/null
+++ b/tests/formatting/in2.blp
@@ -0,0 +1,40 @@
+using Gtk 4.0;
+
+    using Adw 1;
+
+Overlay {
+
+Label
+label
+{
+label
+:
+_
+(
+"'Hello World!' \"\n\t\""
+)
+;
+}
+[
+    overlay
+] Button
+{ notify
+:: icon-name
+=> $ on_icon_name_changed ( label )
+swapped ;
+styles
+[ "destructive" ]
+}
+visible
+: bind $ isVisible ( label.visible ,
+my-menu ) as
+ < bool > ; width-request : bind label . width-request no-sync-create ; }
+                menu my-menu
+{ item ( _ ( "Label" ) , "action-name" , "icon-name" ) item { action : "win.format" ; } }
+
+
+
+
+
+
+
diff --git a/tests/formatting/out.blp b/tests/formatting/out.blp
new file mode 100644
index 0000000..9d9a8b4
--- /dev/null
+++ b/tests/formatting/out.blp
@@ -0,0 +1,28 @@
+using Gtk 4.0;
+using Adw 1;
+
+Overlay {
+  Label label {
+    label: _("'Hello World!' \"\n\t\"");
+  }
+
+  [overlay]
+  Button {
+    notify::icon-name => $on_icon_name_changed(label) swapped;
+
+    styles [
+      "destructive"
+    ]
+  }
+
+  visible: bind $isVisible(label.visible, my-menu) as <bool>;
+  width-request: bind label.width-request no-sync-create;
+}
+
+menu my-menu {
+  item (_("Label"), "action-name", "icon-name")
+
+  item {
+    action: "win.format";
+  }
+}
diff --git a/tests/formatting/string_in.blp b/tests/formatting/string_in.blp
new file mode 100644
index 0000000..451d879
--- /dev/null
+++ b/tests/formatting/string_in.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: "\"'\'\t\n\\'";
+}
diff --git a/tests/formatting/string_out.blp b/tests/formatting/string_out.blp
new file mode 100644
index 0000000..451d879
--- /dev/null
+++ b/tests/formatting/string_out.blp
@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Label {
+  label: "\"'\'\t\n\\'";
+}
diff --git a/tests/test_formatter.py b/tests/test_formatter.py
new file mode 100644
index 0000000..81ec861
--- /dev/null
+++ b/tests/test_formatter.py
@@ -0,0 +1,48 @@
+# test_formatter.py
+#
+# Copyright 2023 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
+from pathlib import Path
+
+from blueprintcompiler.formatter import Formatter
+
+
+class TestFormatter(unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.maxDiff = None
+
+    def assert_format_test(self, input_file, expected_file):
+        print("assert_format_test({}, {})".format(input_file, expected_file))
+        with open((Path(__file__).parent / f"formatting/{input_file}").resolve()) as f:
+            input_data = f.read()
+        with open(
+            (Path(__file__).parent / f"formatting/{expected_file}").resolve()
+        ) as f:
+            expected = f.read()
+
+        actual = Formatter.format(input_data)
+        self.assertEqual(actual, expected)
+
+    def test_formatter(self):
+        self.assert_format_test("in1.blp", "out.blp")
+        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")

From ceb70271fd2de49d3e769d08746985f84320dc66 Mon Sep 17 00:00:00 2001
From: JCWasmx86 <jcwasmx86@t-online.de>
Date: Fri, 3 Nov 2023 15:26:08 +0000
Subject: [PATCH 183/290] lsp: Fix classname

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

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 62d3dcc..7dc7daf 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -292,7 +292,7 @@ class LanguageServer:
             return
 
         try:
-            formatted_blp = Format.format(
+            formatted_blp = Formatter.format(
                 open_file.text,
                 params["options"]["tabSize"],
                 params["options"]["insertSpaces"],

From 3c424d03a4752f9c9d5c1d7c3d7a7fdef0ccb181 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Fri, 3 Nov 2023 22:42:27 +0100
Subject: [PATCH 184/290] lsp: Fix bad argument for compile

---
 blueprintcompiler/lsp.py                  | 2 +-
 blueprintcompiler/outputs/xml/__init__.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index 7dc7daf..c168e93 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -326,7 +326,7 @@ class LanguageServer:
         xml = None
         try:
             output = XmlOutput()
-            xml = output.emit(open_file.ast, generated_notice=False)
+            xml = output.emit(open_file.ast, indent=2, generated_notice=False)
         except:
             printerr(traceback.format_exc())
             self._send_error(id, ErrorCode.RequestFailed, "Could not compile document")
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 12b4e18..3eaf7b8 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -6,8 +6,8 @@ from .xml_emitter import XmlEmitter
 
 
 class XmlOutput(OutputFormat):
-    def emit(self, ui: UI) -> str:
-        xml = XmlEmitter()
+    def emit(self, ui: UI, indent=2, generated_notice=True) -> str:
+        xml = XmlEmitter(indent, generated_notice)
         self._emit_ui(ui, xml)
         return xml.result
 

From 703e2626dd7afc5d4c729c11808b6c720010c0af Mon Sep 17 00:00:00 2001
From: Gregor Niehl <gregorniehl@web.de>
Date: Sat, 4 Nov 2023 13:51:22 +0100
Subject: [PATCH 185/290] Formatter: Close empty objects on same line

---
 blueprintcompiler/formatter.py | 3 +++
 tests/formatting/correct1.blp  | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py
index 0f09679..c907adb 100644
--- a/blueprintcompiler/formatter.py
+++ b/blueprintcompiler/formatter.py
@@ -153,6 +153,9 @@ class Formatter:
                             current_line = current_line[:-1]
                             commit_current_line()
                             current_line = "]"
+                        elif str(last_not_whitespace) in OPENING_TOKENS:
+                            end_str = end_str.strip()
+                            commit_current_line(LineType.BLOCK_CLOSE, True, 0)
 
                         indent_levels -= 1
                         commit_current_line(LineType.BLOCK_CLOSE, True)
diff --git a/tests/formatting/correct1.blp b/tests/formatting/correct1.blp
index 2cb4f23..42d55fa 100644
--- a/tests/formatting/correct1.blp
+++ b/tests/formatting/correct1.blp
@@ -20,12 +20,10 @@ template $MyTemplate: Label {
   flags: a | b;
 
   [child]
-  Label {
-  }
+  Label {}
 
   [child]
-  Label label2 {
-  }
+  Label label2 {}
 
   // Single line comment.
 
@@ -40,8 +38,7 @@ template $MyTemplate: Label {
 
 Dialog {
   [action response=ok]
-  $MyButton {
-  }
+  $MyButton {}
 }
 
 menu menu {

From d39257cabf34737680031c77e1c1919872f26bab Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 4 Nov 2023 15:57:31 -0500
Subject: [PATCH 186/290] formatter: Ensure the file ends with one newline

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

diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py
index c907adb..2514b28 100644
--- a/blueprintcompiler/formatter.py
+++ b/blueprintcompiler/formatter.py
@@ -225,4 +225,4 @@ class Formatter:
 
                 last_not_whitespace = item
 
-        return end_str
+        return end_str.strip() + "\n"

From 80aaee374d332b0c7e04a132cce9c472d6427a1e Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sat, 4 Nov 2023 16:54:03 -0500
Subject: [PATCH 187/290] formatter: Tweak whitespace in special cases

---
 blueprintcompiler/formatter.py | 11 +++++++----
 tests/formatting/correct1.blp  |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py
index 2514b28..68e4107 100644
--- a/blueprintcompiler/formatter.py
+++ b/blueprintcompiler/formatter.py
@@ -83,10 +83,12 @@ class Formatter:
                 whitespace_required = (
                     str_item in WHITESPACE_BEFORE
                     or str(last_not_whitespace) in WHITESPACE_AFTER
+                    or (str_item == "(" and end_str.endswith(": bind"))
                 )
                 whitespace_blockers = (
                     str_item in NO_WHITESPACE_BEFORE
-                    or str(last_not_whitespace) in NO_WHITESPACE_AFTER
+                    or (str(last_not_whitespace) in NO_WHITESPACE_AFTER)
+                    or (str_item == "<" and str(last_not_whitespace) == "typeof")
                 )
 
                 this_or_last_is_ident = (
@@ -94,11 +96,12 @@ class Formatter:
                     or last_not_whitespace.type == TokenType.IDENT
                 )
                 current_line_is_empty = len(current_line) == 0
-                just_one_word_on_line = re.match(r"^([A-Za-z_\-])+$", current_line)
-                is_short_object_def = str_item == "(" and not just_one_word_on_line
+                is_function = str_item == "(" and not re.match(
+                    r"^([A-Za-z_\-])+(: bind)?$", current_line
+                )
 
                 any_blockers = (
-                    whitespace_blockers or current_line_is_empty or is_short_object_def
+                    whitespace_blockers or current_line_is_empty or is_function
                 )
 
                 if (whitespace_required or this_or_last_is_ident) and not any_blockers:
diff --git a/tests/formatting/correct1.blp b/tests/formatting/correct1.blp
index 42d55fa..c1370d0 100644
--- a/tests/formatting/correct1.blp
+++ b/tests/formatting/correct1.blp
@@ -31,9 +31,10 @@ template $MyTemplate: Label {
    * Multiline comment.
    */
   // Single line comment.
-  value: bind 1.0 as <double>;
+  value: bind (1.0) as <double>;
   as: 1;
   signal => $on_signal() after;
+  type_value: typeof<$MyTemplate>;
 }
 
 Dialog {

From 9cfacb98984f7aba499b6e75824e7484148b1aaa Mon Sep 17 00:00:00 2001
From: gregorni <gregorniehl@web.de>
Date: Wed, 13 Dec 2023 01:36:18 +0000
Subject: [PATCH 188/290] Apply isort and black formatting everywhere

---
 .gitlab-ci.yml | 6 +++---
 justfile       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a33444..bcac278 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,9 +6,9 @@ build:
   image: registry.gitlab.gnome.org/jwestman/blueprint-compiler
   stage: build
   script:
-    - black --check --diff blueprintcompiler tests
-    - isort --check --diff --profile black blueprintcompiler tests
-    - mypy --python-version=3.9 blueprintcompiler
+    - black --check --diff ./ tests
+    - isort --check --diff --profile black ./ tests
+    - mypy --python-version=3.9 blueprintcompiler/
     - G_DEBUG=fatal-warnings xvfb-run coverage run -m unittest
     - coverage report
     - coverage html
diff --git a/justfile b/justfile
index 5c956db..37d85b5 100644
--- a/justfile
+++ b/justfile
@@ -2,11 +2,11 @@ default: black isort
 
 # Format with black formatter
 black:
-    black blueprintcompiler/
+    black ./
 
 # Sort imports using isort
 isort:
-    isort blueprintcompiler/ --profile black
+    isort ./ --profile black
 
 
 # Run all tests

From c5fa33363f45c32922344a8a3e32fa5f8f92b708 Mon Sep 17 00:00:00 2001
From: gregorni <gregorniehl@web.de>
Date: Wed, 13 Dec 2023 02:12:50 +0000
Subject: [PATCH 189/290] formatter: Handle Inline comments

---
 blueprintcompiler/formatter.py | 260 +++++++++++++++++----------------
 tests/formatting/correct1.blp  |   2 +-
 2 files changed, 133 insertions(+), 129 deletions(-)

diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py
index 68e4107..d391510 100644
--- a/blueprintcompiler/formatter.py
+++ b/blueprintcompiler/formatter.py
@@ -57,6 +57,7 @@ class Formatter:
         watch_parentheses = False
         parentheses_balance = 0
         bracket_tracker = [None]
+        last_whitespace_contains_newline = False
 
         def commit_current_line(
             line_type=prev_line_type, redo_whitespace=False, newlines_before=1
@@ -67,7 +68,7 @@ class Formatter:
             whitespace_to_add = "\n" + indent_whitespace
 
             if redo_whitespace or newlines_before != 1:
-                end_str = end_str.strip() + ("\n" * newlines_before)
+                end_str = end_str.strip() + "\n" * newlines_before
                 if newlines_before > 0:
                     end_str += indent_whitespace
 
@@ -77,155 +78,158 @@ class Formatter:
             prev_line_type = line_type
 
         for item in tokens:
-            if item.type != TokenType.WHITESPACE:
-                str_item = str(item)
+            str_item = str(item)
 
-                whitespace_required = (
-                    str_item in WHITESPACE_BEFORE
-                    or str(last_not_whitespace) in WHITESPACE_AFTER
-                    or (str_item == "(" and end_str.endswith(": bind"))
-                )
-                whitespace_blockers = (
-                    str_item in NO_WHITESPACE_BEFORE
-                    or (str(last_not_whitespace) in NO_WHITESPACE_AFTER)
-                    or (str_item == "<" and str(last_not_whitespace) == "typeof")
-                )
+            if item.type == TokenType.WHITESPACE:
+                last_whitespace_contains_newline = "\n" in str_item
+                continue
 
-                this_or_last_is_ident = (
-                    item.type == TokenType.IDENT
-                    or last_not_whitespace.type == TokenType.IDENT
-                )
-                current_line_is_empty = len(current_line) == 0
-                is_function = str_item == "(" and not re.match(
-                    r"^([A-Za-z_\-])+(: bind)?$", current_line
-                )
+            whitespace_required = (
+                str_item in WHITESPACE_BEFORE
+                or str(last_not_whitespace) in WHITESPACE_AFTER
+                or (str_item == "(" and end_str.endswith(": bind"))
+            )
+            whitespace_blockers = (
+                str_item in NO_WHITESPACE_BEFORE
+                or str(last_not_whitespace) in NO_WHITESPACE_AFTER
+                or (str_item == "<" and str(last_not_whitespace) == "typeof")
+            )
 
-                any_blockers = (
-                    whitespace_blockers or current_line_is_empty or is_function
-                )
+            this_or_last_is_ident = (
+                item.type == TokenType.IDENT
+                or last_not_whitespace.type == TokenType.IDENT
+            )
+            current_line_is_empty = len(current_line) == 0
+            is_function = str_item == "(" and not re.match(
+                r"^([A-Za-z_\-])+(: bind)?$", current_line
+            )
 
-                if (whitespace_required or this_or_last_is_ident) and not any_blockers:
-                    current_line += " "
+            any_blockers = whitespace_blockers or current_line_is_empty or is_function
 
-                current_line += str_item
+            if (whitespace_required or this_or_last_is_ident) and not any_blockers:
+                current_line += " "
 
-                if str_item in ["[", "("]:
-                    bracket_tracker.append(str_item)
-                elif str_item in ["]", ")"]:
-                    bracket_tracker.pop()
+            current_line += str_item
 
-                needs_newline_treatment = (
-                    str_item in NEWLINE_AFTER or item.type == TokenType.COMMENT
-                )
-                if needs_newline_treatment:
-                    if str_item in OPENING_TOKENS:
-                        list_or_child_type = str_item == "["
-                        if list_or_child_type:
-                            is_child_type = current_line.startswith("[")
+            if str_item in ["[", "("]:
+                bracket_tracker.append(str_item)
+            elif str_item in ["]", ")"]:
+                bracket_tracker.pop()
 
-                            if is_child_type:
-                                if str(last_not_whitespace) not in OPENING_TOKENS:
-                                    end_str = (
-                                        end_str.strip()
-                                        + "\n\n"
-                                        + (indent_item * indent_levels)
-                                    )
-                                last_not_whitespace = item
-                                continue
+            needs_newline_treatment = (
+                str_item in NEWLINE_AFTER or item.type == TokenType.COMMENT
+            )
+            if needs_newline_treatment:
+                if str_item in OPENING_TOKENS:
+                    list_or_child_type = str_item == "["
+                    if list_or_child_type:
+                        is_child_type = current_line.startswith("[")
 
-                        indent_levels += 1
-                        keep_same_indent = not prev_line_type in [
-                            LineType.CHILD_TYPE,
-                            LineType.COMMENT,
-                            LineType.BLOCK_OPEN,
-                        ]
-                        if keep_same_indent:
-                            end_str = (
-                                end_str.strip()
-                                + "\n\n"
-                                + (indent_item * (indent_levels - 1))
-                            )
-                        commit_current_line(LineType.BLOCK_OPEN)
+                        if is_child_type:
+                            if str(last_not_whitespace) not in OPENING_TOKENS:
+                                end_str = (
+                                    end_str.strip()
+                                    + "\n\n"
+                                    + (indent_item * indent_levels)
+                                )
+                            last_not_whitespace = item
+                            continue
 
-                    elif str_item == "]" and is_child_type:
-                        commit_current_line(LineType.CHILD_TYPE, False)
-                        is_child_type = False
+                    indent_levels += 1
+                    keep_same_indent = not prev_line_type in [
+                        LineType.CHILD_TYPE,
+                        LineType.COMMENT,
+                        LineType.BLOCK_OPEN,
+                    ]
+                    if keep_same_indent:
+                        end_str = (
+                            end_str.strip() + "\n\n" + indent_item * (indent_levels - 1)
+                        )
+                    commit_current_line(LineType.BLOCK_OPEN)
 
-                    elif str_item in CLOSING_TOKENS:
-                        if str_item == "]" and last_not_whitespace != ",":
-                            current_line = current_line[:-1]
-                            commit_current_line()
-                            current_line = "]"
-                        elif str(last_not_whitespace) in OPENING_TOKENS:
-                            end_str = end_str.strip()
-                            commit_current_line(LineType.BLOCK_CLOSE, True, 0)
+                elif str_item == "]" and is_child_type:
+                    commit_current_line(LineType.CHILD_TYPE, False)
+                    is_child_type = False
 
-                        indent_levels -= 1
-                        commit_current_line(LineType.BLOCK_CLOSE, True)
+                elif str_item in CLOSING_TOKENS:
+                    if str_item == "]" and last_not_whitespace != ",":
+                        current_line = current_line[:-1]
+                        commit_current_line()
+                        current_line = "]"
+                    elif str(last_not_whitespace) in OPENING_TOKENS:
+                        end_str = end_str.strip()
+                        commit_current_line(LineType.BLOCK_CLOSE, True, 0)
 
-                    elif str_item == ";":
-                        line_type = LineType.STATEMENT
-                        if len(current_line) == 1:
+                    indent_levels -= 1
+                    commit_current_line(LineType.BLOCK_CLOSE, True)
+
+                elif str_item == ";":
+                    line_type = LineType.STATEMENT
+                    if len(current_line) == 1:
+                        newlines = 0
+                        line_type = LineType.BLOCK_CLOSE
+                    elif prev_line_type == LineType.BLOCK_CLOSE:
+                        newlines = 2
+                    else:
+                        newlines = 1
+
+                    commit_current_line(line_type, newlines_before=newlines)
+
+                elif item.type == TokenType.COMMENT:
+                    require_extra_newline = [
+                        LineType.BLOCK_CLOSE,
+                        LineType.STATEMENT,
+                        LineType.COMMENT,
+                    ]
+
+                    single_line_comment = str_item.startswith("//")
+                    newlines = 1
+                    if single_line_comment:
+                        if not str_item.startswith("// "):
+                            current_line = f"// {current_line[2:]}"
+
+                        if not last_whitespace_contains_newline:
+                            current_line = " " + current_line
                             newlines = 0
-                            line_type = LineType.BLOCK_CLOSE
                         elif prev_line_type == LineType.BLOCK_CLOSE:
                             newlines = 2
-                        else:
-                            newlines = 1
 
-                        commit_current_line(line_type, newlines_before=newlines)
+                    elif prev_line_type in require_extra_newline:
+                        newlines = 2
 
-                    elif item.type == TokenType.COMMENT:
-                        require_extra_newline = [
-                            LineType.BLOCK_CLOSE,
-                            LineType.STATEMENT,
-                            LineType.COMMENT,
-                        ]
+                    commit_current_line(LineType.COMMENT, newlines_before=newlines)
 
-                        single_line_comment = str_item.startswith("//")
-                        if (
-                            single_line_comment
-                            and prev_line_type == LineType.BLOCK_CLOSE
-                        ) or (
-                            not single_line_comment
-                            and prev_line_type in require_extra_newline
-                        ):
-                            newlines = 2
-                        else:
-                            newlines = 1
+                else:
+                    commit_current_line()
 
-                        commit_current_line(LineType.COMMENT, newlines_before=newlines)
+            elif str_item == "(" and (
+                re.match("^([A-Za-z_\-])+\s*\(", current_line) or watch_parentheses
+            ):
+                watch_parentheses = True
+                parentheses_balance += 1
 
-                    else:
-                        commit_current_line()
+            elif str_item == ")" and watch_parentheses:
+                parentheses_balance -= 1
+                all_parentheses_closed = parentheses_balance == 0
+                if all_parentheses_closed:
+                    commit_current_line(
+                        newlines_before=2
+                        if prev_line_type == LineType.BLOCK_CLOSE
+                        else 1
+                    )
+                    watch_parentheses = False
 
-                elif str_item == "(" and (
-                    re.match("^([A-Za-z_\-])+\s*\(", current_line) or watch_parentheses
-                ):
-                    watch_parentheses = True
-                    parentheses_balance += 1
+            tracker_is_empty = len(bracket_tracker) > 0
+            if tracker_is_empty:
+                last_in_tracker = bracket_tracker[-1]
+                is_list_comma = last_in_tracker == "[" and str_item == ","
+                if is_list_comma:
+                    last_was_list_item = end_str.strip()[-1] not in ["[", ","]
+                    if last_was_list_item:
+                        end_str = end_str.strip()
+                    commit_current_line()
 
-                elif str_item == ")" and watch_parentheses:
-                    parentheses_balance -= 1
-                    all_parentheses_closed = parentheses_balance == 0
-                    if all_parentheses_closed:
-                        commit_current_line(
-                            newlines_before=2
-                            if prev_line_type == LineType.BLOCK_CLOSE
-                            else 1
-                        )
-                        watch_parentheses = False
-
-                tracker_is_empty = len(bracket_tracker) > 0
-                if tracker_is_empty:
-                    last_in_tracker = bracket_tracker[-1]
-                    is_list_comma = last_in_tracker == "[" and str_item == ","
-                    if is_list_comma:
-                        last_was_list_item = end_str.strip()[-1] not in ["[", ","]
-                        if last_was_list_item:
-                            end_str = end_str.strip()
-                        commit_current_line()
-
-                last_not_whitespace = item
+            last_not_whitespace = item
+            last_whitespace_contains_newline = False
 
         return end_str.strip() + "\n"
diff --git a/tests/formatting/correct1.blp b/tests/formatting/correct1.blp
index c1370d0..aedc38a 100644
--- a/tests/formatting/correct1.blp
+++ b/tests/formatting/correct1.blp
@@ -33,7 +33,7 @@ template $MyTemplate: Label {
   // Single line comment.
   value: bind (1.0) as <double>;
   as: 1;
-  signal => $on_signal() after;
+  signal => $on_signal() after; // Inline comment
   type_value: typeof<$MyTemplate>;
 }
 

From e261180dccf3468d5d343b9385678b3cca9fa557 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 12 Dec 2023 19:31:07 -0600
Subject: [PATCH 190/290] language: Add translation-domain

This allows you to set the translation domain of a blueprint file.
---
 .../language/translation_domain.py            | 31 +++++++++++++++++++
 blueprintcompiler/language/ui.py              | 10 ++++++
 blueprintcompiler/outputs/xml/__init__.py     |  5 ++-
 docs/reference/document_root.rst              | 16 +++++++++-
 tests/samples/translation_domain.blp          |  3 ++
 tests/samples/translation_domain.ui           |  9 ++++++
 6 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 blueprintcompiler/language/translation_domain.py
 create mode 100644 tests/samples/translation_domain.blp
 create mode 100644 tests/samples/translation_domain.ui

diff --git a/blueprintcompiler/language/translation_domain.py b/blueprintcompiler/language/translation_domain.py
new file mode 100644
index 0000000..ff20ead
--- /dev/null
+++ b/blueprintcompiler/language/translation_domain.py
@@ -0,0 +1,31 @@
+# translation_domain.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 TranslationDomain(AstNode):
+    grammar = Statement(
+        "translation-domain",
+        UseQuoted("domain"),
+    )
+
+    @property
+    def domain(self):
+        return self.tokens["domain"]
diff --git a/blueprintcompiler/language/ui.py b/blueprintcompiler/language/ui.py
index 34ba193..8aaf359 100644
--- a/blueprintcompiler/language/ui.py
+++ b/blueprintcompiler/language/ui.py
@@ -26,6 +26,7 @@ from .gobject_object import Object
 from .gtk_menu import Menu, menu
 from .gtkbuilder_template import Template
 from .imports import GtkDirective, Import
+from .translation_domain import TranslationDomain
 
 
 class UI(AstNode):
@@ -34,6 +35,7 @@ class UI(AstNode):
     grammar = [
         GtkDirective,
         ZeroOrMore(Import),
+        Optional(TranslationDomain),
         Until(
             AnyOf(
                 Template,
@@ -75,6 +77,14 @@ class UI(AstNode):
     def gtk_decl(self) -> GtkDirective:
         return self.children[GtkDirective][0]
 
+    @property
+    def translation_domain(self) -> T.Optional[TranslationDomain]:
+        domains = self.children[TranslationDomain]
+        if len(domains):
+            return domains[0]
+        else:
+            return None
+
     @property
     def contents(self) -> T.List[T.Union[Object, Template, Menu]]:
         return [
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index 3eaf7b8..b84c5cf 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -12,7 +12,10 @@ class XmlOutput(OutputFormat):
         return xml.result
 
     def _emit_ui(self, ui: UI, xml: XmlEmitter):
-        xml.start_tag("interface")
+        if domain := ui.translation_domain:
+            xml.start_tag("interface", domain=domain.domain)
+        else:
+            xml.start_tag("interface")
 
         self._emit_gtk_directive(ui.gtk_decl, xml)
 
diff --git a/docs/reference/document_root.rst b/docs/reference/document_root.rst
index 13dea58..eaf178d 100644
--- a/docs/reference/document_root.rst
+++ b/docs/reference/document_root.rst
@@ -10,7 +10,7 @@ Document Root
 
 .. rst-class:: grammar-block
 
-   Root = :ref:`GtkDecl<Syntax GtkDecl>` (:ref:`Using<Syntax Using>`)* ( :ref:`Template<Syntax Template>` | :ref:`Menu<Syntax Menu>` | :ref:`Object<Syntax Object>` )* EOF
+   Root = :ref:`GtkDecl<Syntax GtkDecl>` (:ref:`Using<Syntax Using>`)* (:ref:`TranslationDomain<Syntax TranslationDomain>`)? ( :ref:`Template<Syntax Template>` | :ref:`Menu<Syntax Menu>` | :ref:`Object<Syntax Object>` )* EOF
 
 A blueprint document consists of a :ref:`GTK declaration<Syntax GtkDecl>`, one sor more :ref:`imports<Syntax Using>`, and a list of :ref:`objects<Syntax Object>` and/or a :ref:`template<Syntax Template>`.
 
@@ -72,3 +72,17 @@ Example
 
    // Import libadwaita
    using Adw 1;
+
+
+.. _Syntax TranslationDomain:
+
+Translation Domain
+------------------
+
+.. rst-class:: grammar-block
+
+   TranslationDomain = 'translation-domain' <domain::ref:`QUOTED<Syntax QUOTED>`> ';'
+
+The translation domain is used to look up translations for translatable strings in the blueprint file. If no translation domain is specified, strings will be looked up in the program's global domain.
+
+See `Gtk.Builder:translation-domain <https://docs.gtk.org/gtk4/property.Builder.translation-domain.html>`_ for more information.
diff --git a/tests/samples/translation_domain.blp b/tests/samples/translation_domain.blp
new file mode 100644
index 0000000..98d160d
--- /dev/null
+++ b/tests/samples/translation_domain.blp
@@ -0,0 +1,3 @@
+using Gtk 4.0;
+
+translation-domain "blueprint-tests";
diff --git a/tests/samples/translation_domain.ui b/tests/samples/translation_domain.ui
new file mode 100644
index 0000000..d583f23
--- /dev/null
+++ b/tests/samples/translation_domain.ui
@@ -0,0 +1,9 @@
+<?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 domain="blueprint-tests">
+  <requires lib="gtk" version="4.0"/>
+</interface>

From e5cde71fc12698761577b012e9b0a710d28558b2 Mon Sep 17 00:00:00 2001
From: gregorni <gregorniehl@web.de>
Date: Tue, 19 Dec 2023 02:29:09 +0000
Subject: [PATCH 191/290] Tiny formatter improvements

---
 blueprintcompiler/formatter.py | 307 ++++++++++++++++-----------------
 blueprintcompiler/lsp.py       |   5 +-
 blueprintcompiler/main.py      |   5 +-
 tests/test_formatter.py        |   4 +-
 4 files changed, 155 insertions(+), 166 deletions(-)

diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py
index d391510..c003d45 100644
--- a/blueprintcompiler/formatter.py
+++ b/blueprintcompiler/formatter.py
@@ -44,192 +44,183 @@ class LineType(Enum):
     COMMENT = 4
 
 
-class Formatter:
-    def format(data, tab_size=2, insert_space=True):
-        indent_levels = 0
-        tokens = tokenizer.tokenize(data)
-        end_str = ""
-        last_not_whitespace = tokens[0]
+def format(data, tab_size=2, insert_space=True):
+    indent_levels = 0
+    tokens = tokenizer.tokenize(data)
+    end_str = ""
+    last_not_whitespace = tokens[0]
+    current_line = ""
+    prev_line_type = None
+    is_child_type = False
+    indent_item = " " * tab_size if insert_space else "\t"
+    watch_parentheses = False
+    parentheses_balance = 0
+    bracket_tracker = [None]
+    last_whitespace_contains_newline = False
+
+    def commit_current_line(
+        line_type=prev_line_type, redo_whitespace=False, newlines_before=1
+    ):
+        nonlocal end_str, current_line, prev_line_type
+
+        indent_whitespace = indent_levels * indent_item
+        whitespace_to_add = "\n" + indent_whitespace
+
+        if redo_whitespace or newlines_before != 1:
+            end_str = end_str.strip() + "\n" * newlines_before
+            if newlines_before > 0:
+                end_str += indent_whitespace
+
+        end_str += current_line + whitespace_to_add
+
         current_line = ""
-        prev_line_type = None
-        is_child_type = False
-        indent_item = " " * tab_size if insert_space else "\t"
-        watch_parentheses = False
-        parentheses_balance = 0
-        bracket_tracker = [None]
-        last_whitespace_contains_newline = False
+        prev_line_type = line_type
 
-        def commit_current_line(
-            line_type=prev_line_type, redo_whitespace=False, newlines_before=1
-        ):
-            nonlocal end_str, current_line, prev_line_type
+    for item in tokens:
+        str_item = str(item)
 
-            indent_whitespace = indent_levels * indent_item
-            whitespace_to_add = "\n" + indent_whitespace
+        if item.type == TokenType.WHITESPACE:
+            last_whitespace_contains_newline = "\n" in str_item
+            continue
 
-            if redo_whitespace or newlines_before != 1:
-                end_str = end_str.strip() + "\n" * newlines_before
-                if newlines_before > 0:
-                    end_str += indent_whitespace
+        whitespace_required = (
+            str_item in WHITESPACE_BEFORE
+            or str(last_not_whitespace) in WHITESPACE_AFTER
+            or (str_item == "(" and end_str.endswith(": bind"))
+        )
+        whitespace_blockers = (
+            str_item in NO_WHITESPACE_BEFORE
+            or str(last_not_whitespace) in NO_WHITESPACE_AFTER
+            or (str_item == "<" and str(last_not_whitespace) == "typeof")
+        )
 
-            end_str += current_line + whitespace_to_add
+        this_or_last_is_ident = TokenType.IDENT in (item.type, last_not_whitespace.type)
+        current_line_is_empty = len(current_line) == 0
+        is_function = str_item == "(" and not re.match(
+            r"^([A-Za-z_\-])+(: bind)?$", current_line
+        )
 
-            current_line = ""
-            prev_line_type = line_type
+        any_blockers = whitespace_blockers or current_line_is_empty or is_function
+        if (whitespace_required or this_or_last_is_ident) and not any_blockers:
+            current_line += " "
 
-        for item in tokens:
-            str_item = str(item)
+        current_line += str_item
 
-            if item.type == TokenType.WHITESPACE:
-                last_whitespace_contains_newline = "\n" in str_item
-                continue
+        if str_item in ("[", "("):
+            bracket_tracker.append(str_item)
+        elif str_item in ("]", ")"):
+            bracket_tracker.pop()
 
-            whitespace_required = (
-                str_item in WHITESPACE_BEFORE
-                or str(last_not_whitespace) in WHITESPACE_AFTER
-                or (str_item == "(" and end_str.endswith(": bind"))
-            )
-            whitespace_blockers = (
-                str_item in NO_WHITESPACE_BEFORE
-                or str(last_not_whitespace) in NO_WHITESPACE_AFTER
-                or (str_item == "<" and str(last_not_whitespace) == "typeof")
-            )
+        needs_newline_treatment = (
+            str_item in NEWLINE_AFTER or item.type == TokenType.COMMENT
+        )
+        if needs_newline_treatment:
+            if str_item in OPENING_TOKENS:
+                list_or_child_type = str_item == "["
+                if list_or_child_type:
+                    is_child_type = current_line.startswith("[")
 
-            this_or_last_is_ident = (
-                item.type == TokenType.IDENT
-                or last_not_whitespace.type == TokenType.IDENT
-            )
-            current_line_is_empty = len(current_line) == 0
-            is_function = str_item == "(" and not re.match(
-                r"^([A-Za-z_\-])+(: bind)?$", current_line
-            )
+                    if is_child_type:
+                        if str(last_not_whitespace) not in OPENING_TOKENS:
+                            end_str = (
+                                end_str.strip() + "\n\n" + (indent_item * indent_levels)
+                            )
+                        last_not_whitespace = item
+                        continue
 
-            any_blockers = whitespace_blockers or current_line_is_empty or is_function
+                indent_levels += 1
+                keep_same_indent = prev_line_type not in (
+                    LineType.CHILD_TYPE,
+                    LineType.COMMENT,
+                    LineType.BLOCK_OPEN,
+                )
+                if keep_same_indent:
+                    end_str = (
+                        end_str.strip() + "\n\n" + indent_item * (indent_levels - 1)
+                    )
+                commit_current_line(LineType.BLOCK_OPEN)
 
-            if (whitespace_required or this_or_last_is_ident) and not any_blockers:
-                current_line += " "
+            elif str_item == "]" and is_child_type:
+                commit_current_line(LineType.CHILD_TYPE, False)
+                is_child_type = False
 
-            current_line += str_item
+            elif str_item in CLOSING_TOKENS:
+                if str_item == "]" and last_not_whitespace != ",":
+                    current_line = current_line[:-1]
+                    commit_current_line()
+                    current_line = "]"
+                elif str(last_not_whitespace) in OPENING_TOKENS:
+                    end_str = end_str.strip()
+                    commit_current_line(LineType.BLOCK_CLOSE, True, 0)
 
-            if str_item in ["[", "("]:
-                bracket_tracker.append(str_item)
-            elif str_item in ["]", ")"]:
-                bracket_tracker.pop()
+                indent_levels -= 1
+                commit_current_line(LineType.BLOCK_CLOSE, True)
 
-            needs_newline_treatment = (
-                str_item in NEWLINE_AFTER or item.type == TokenType.COMMENT
-            )
-            if needs_newline_treatment:
-                if str_item in OPENING_TOKENS:
-                    list_or_child_type = str_item == "["
-                    if list_or_child_type:
-                        is_child_type = current_line.startswith("[")
+            elif str_item == ";":
+                line_type = LineType.STATEMENT
+                newlines = 1
 
-                        if is_child_type:
-                            if str(last_not_whitespace) not in OPENING_TOKENS:
-                                end_str = (
-                                    end_str.strip()
-                                    + "\n\n"
-                                    + (indent_item * indent_levels)
-                                )
-                            last_not_whitespace = item
-                            continue
+                if len(current_line) == 1:
+                    newlines = 0
+                    line_type = LineType.BLOCK_CLOSE
+                elif prev_line_type == LineType.BLOCK_CLOSE:
+                    newlines = 2
 
-                    indent_levels += 1
-                    keep_same_indent = not prev_line_type in [
-                        LineType.CHILD_TYPE,
-                        LineType.COMMENT,
-                        LineType.BLOCK_OPEN,
-                    ]
-                    if keep_same_indent:
-                        end_str = (
-                            end_str.strip() + "\n\n" + indent_item * (indent_levels - 1)
-                        )
-                    commit_current_line(LineType.BLOCK_OPEN)
+                commit_current_line(line_type, newlines_before=newlines)
 
-                elif str_item == "]" and is_child_type:
-                    commit_current_line(LineType.CHILD_TYPE, False)
-                    is_child_type = False
+            elif item.type == TokenType.COMMENT:
+                require_extra_newline = (
+                    LineType.BLOCK_CLOSE,
+                    LineType.STATEMENT,
+                    LineType.COMMENT,
+                )
 
-                elif str_item in CLOSING_TOKENS:
-                    if str_item == "]" and last_not_whitespace != ",":
-                        current_line = current_line[:-1]
-                        commit_current_line()
-                        current_line = "]"
-                    elif str(last_not_whitespace) in OPENING_TOKENS:
-                        end_str = end_str.strip()
-                        commit_current_line(LineType.BLOCK_CLOSE, True, 0)
+                single_line_comment = str_item.startswith("//")
+                newlines = 1
+                if single_line_comment:
+                    if not str_item.startswith("// "):
+                        current_line = f"// {current_line[2:]}"
 
-                    indent_levels -= 1
-                    commit_current_line(LineType.BLOCK_CLOSE, True)
-
-                elif str_item == ";":
-                    line_type = LineType.STATEMENT
-                    if len(current_line) == 1:
+                    if not last_whitespace_contains_newline:
+                        current_line = " " + current_line
                         newlines = 0
-                        line_type = LineType.BLOCK_CLOSE
                     elif prev_line_type == LineType.BLOCK_CLOSE:
                         newlines = 2
-                    else:
-                        newlines = 1
 
-                    commit_current_line(line_type, newlines_before=newlines)
+                elif prev_line_type in require_extra_newline:
+                    newlines = 2
 
-                elif item.type == TokenType.COMMENT:
-                    require_extra_newline = [
-                        LineType.BLOCK_CLOSE,
-                        LineType.STATEMENT,
-                        LineType.COMMENT,
-                    ]
+                commit_current_line(LineType.COMMENT, newlines_before=newlines)
 
-                    single_line_comment = str_item.startswith("//")
-                    newlines = 1
-                    if single_line_comment:
-                        if not str_item.startswith("// "):
-                            current_line = f"// {current_line[2:]}"
+            else:
+                commit_current_line()
 
-                        if not last_whitespace_contains_newline:
-                            current_line = " " + current_line
-                            newlines = 0
-                        elif prev_line_type == LineType.BLOCK_CLOSE:
-                            newlines = 2
+        elif str_item == "(" and (
+            re.match(r"^([A-Za-z_\-])+\s*\(", current_line) or watch_parentheses
+        ):
+            watch_parentheses = True
+            parentheses_balance += 1
 
-                    elif prev_line_type in require_extra_newline:
-                        newlines = 2
+        elif str_item == ")" and watch_parentheses:
+            parentheses_balance -= 1
+            all_parentheses_closed = parentheses_balance == 0
+            if all_parentheses_closed:
+                commit_current_line(
+                    newlines_before=2 if prev_line_type == LineType.BLOCK_CLOSE else 1
+                )
+                watch_parentheses = False
 
-                    commit_current_line(LineType.COMMENT, newlines_before=newlines)
+        tracker_is_empty = len(bracket_tracker) > 0
+        if tracker_is_empty:
+            last_in_tracker = bracket_tracker[-1]
+            is_list_comma = last_in_tracker == "[" and str_item == ","
+            if is_list_comma:
+                last_was_list_item = end_str.strip()[-1] not in ("[", ",")
+                if last_was_list_item:
+                    end_str = end_str.strip()
+                commit_current_line()
 
-                else:
-                    commit_current_line()
+        last_not_whitespace = item
+        last_whitespace_contains_newline = False
 
-            elif str_item == "(" and (
-                re.match("^([A-Za-z_\-])+\s*\(", current_line) or watch_parentheses
-            ):
-                watch_parentheses = True
-                parentheses_balance += 1
-
-            elif str_item == ")" and watch_parentheses:
-                parentheses_balance -= 1
-                all_parentheses_closed = parentheses_balance == 0
-                if all_parentheses_closed:
-                    commit_current_line(
-                        newlines_before=2
-                        if prev_line_type == LineType.BLOCK_CLOSE
-                        else 1
-                    )
-                    watch_parentheses = False
-
-            tracker_is_empty = len(bracket_tracker) > 0
-            if tracker_is_empty:
-                last_in_tracker = bracket_tracker[-1]
-                is_list_comma = last_in_tracker == "[" and str_item == ","
-                if is_list_comma:
-                    last_was_list_item = end_str.strip()[-1] not in ["[", ","]
-                    if last_was_list_item:
-                        end_str = end_str.strip()
-                    commit_current_line()
-
-            last_not_whitespace = item
-            last_whitespace_contains_newline = False
-
-        return end_str.strip() + "\n"
+    return end_str.strip() + "\n"
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index c168e93..b9522bd 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -24,11 +24,10 @@ import traceback
 import typing as T
 from difflib import SequenceMatcher
 
-from . import decompiler, parser, tokenizer, utils, xml_reader
+from . import decompiler, formatter, parser, tokenizer, utils, xml_reader
 from .ast_utils import AstNode
 from .completions import complete
 from .errors import CompileError, MultipleErrors
-from .formatter import Formatter
 from .lsp_utils import *
 from .outputs.xml import XmlOutput
 from .tokenizer import Token
@@ -292,7 +291,7 @@ class LanguageServer:
             return
 
         try:
-            formatted_blp = Formatter.format(
+            formatted_blp = formatter.format(
                 open_file.text,
                 params["options"]["tabSize"],
                 params["options"]["insertSpaces"],
diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index c9ee944..bffc820 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -24,9 +24,8 @@ import os
 import sys
 import typing as T
 
-from . import interactive_port, parser, tokenizer
+from . import formatter, interactive_port, parser, tokenizer
 from .errors import CompileError, CompilerBugError, PrintableError, report_bug
-from .formatter import Formatter
 from .gir import add_typelib_search_path
 from .lsp import LanguageServer
 from .outputs import XmlOutput
@@ -211,7 +210,7 @@ class BlueprintApp:
                 except:
                     errored = True
 
-                formatted_str = Formatter.format(data, opts.spaces_num, not opts.tabs)
+                formatted_str = formatter.format(data, opts.spaces_num, not opts.tabs)
 
                 if data != formatted_str:
                     happened = "Would format"
diff --git a/tests/test_formatter.py b/tests/test_formatter.py
index 81ec861..4cf9ac8 100644
--- a/tests/test_formatter.py
+++ b/tests/test_formatter.py
@@ -21,7 +21,7 @@
 import unittest
 from pathlib import Path
 
-from blueprintcompiler.formatter import Formatter
+from blueprintcompiler import formatter
 
 
 class TestFormatter(unittest.TestCase):
@@ -38,7 +38,7 @@ class TestFormatter(unittest.TestCase):
         ) as f:
             expected = f.read()
 
-        actual = Formatter.format(input_data)
+        actual = formatter.format(input_data)
         self.assertEqual(actual, expected)
 
     def test_formatter(self):

From 0cdccf5f5418eabe42edeea44b35cb828cab3b5a Mon Sep 17 00:00:00 2001
From: Gregor Niehl <gregorniehl@web.de>
Date: Sun, 17 Dec 2023 16:54:54 +0100
Subject: [PATCH 192/290] Formatter CLI: Error if no files are found

---
 blueprintcompiler/main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/blueprintcompiler/main.py b/blueprintcompiler/main.py
index bffc820..1a9bd98 100644
--- a/blueprintcompiler/main.py
+++ b/blueprintcompiler/main.py
@@ -262,6 +262,10 @@ class BlueprintApp:
             print(Colors.CLEAR)
             panic = True
 
+        if len(input_files) == 0:
+            print(f"{Colors.RED}No Blueprint files found")
+            sys.exit(1)
+
         def would_be(verb):
             return verb if opts.fix else f"would be {verb}"
 

From a8c6d5d342bcc114451245735e0a63227bb2f93b Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 21 Dec 2023 19:37:34 -0600
Subject: [PATCH 193/290] docs: Fix typo

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

diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index 9675038..fd42bad 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -285,7 +285,7 @@ CSS Styles
 .. rst-class:: grammar-block
 
    ExtStyles = 'styles' '[' ExtStylesProp* ']'
-   ExtStylesClass = <name::ref:`QUOTED<Syntax QUOTED>`>
+   ExtStylesProp = <name::ref:`QUOTED<Syntax QUOTED>`>
 
 Valid in any `Gtk.Widget <https://docs.gtk.org/gtk4/class.Widget.html>`_.
 

From 2e9db2eca5bbc9c32ed1c1e398309332b2a24188 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Sun, 24 Dec 2023 21:40:45 -0600
Subject: [PATCH 194/290] errors: Fix bug when compiling empty file

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

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 773122a..73fd45d 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -93,7 +93,7 @@ class CompileError(PrintableError):
         assert self.range is not None
 
         line_num, col_num = utils.idx_to_pos(self.range.start + 1, code)
-        line = code.splitlines(True)[line_num]
+        line = code.splitlines(True)[line_num] if code != "" else ""
 
         # Display 1-based line numbers
         line_num += 1

From cb30bec7b1103cdbab2020248fd8fb482c0411ed Mon Sep 17 00:00:00 2001
From: Gregor Niehl <gregorniehl@web.de>
Date: Fri, 22 Dec 2023 16:48:32 +0100
Subject: [PATCH 195/290] decompiler: Format resulting Blueprints

---
 blueprintcompiler/decompiler.py | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/blueprintcompiler/decompiler.py b/blueprintcompiler/decompiler.py
index 2663a09..7e6c53b 100644
--- a/blueprintcompiler/decompiler.py
+++ b/blueprintcompiler/decompiler.py
@@ -22,6 +22,7 @@ import typing as T
 from dataclasses import dataclass
 from enum import Enum
 
+from . import formatter
 from .gir import *
 from .utils import Colors, escape_quote
 from .xml_reader import Element, parse, parse_string
@@ -68,7 +69,9 @@ class DecompileCtx:
                 for ns, namespace in self.gir.namespaces.items()
             ]
         )
-        return imports + "\n" + self._result
+        full_string = imports + "\n" + self._result
+        formatted_string = formatter.format(full_string)
+        return formatted_string
 
     def type_by_cname(self, cname: str) -> T.Optional[GirType]:
         if type := self.gir.get_type_by_cname(cname):
@@ -96,35 +99,11 @@ class DecompileCtx:
         self._blocks_need_end[-1] = text
 
     def print(self, line: str, newline: bool = True) -> None:
-        if line == "}" or line == "]":
-            self._indent -= 1
-
-        # Add blank lines between different types of lines, for neatness
-        if newline:
-            if line == "}" or line == "]":
-                line_type = LineType.BLOCK_END
-            elif line.endswith("{") or line.endswith("]"):
-                line_type = LineType.BLOCK_START
-            elif line.endswith(";"):
-                line_type = LineType.STMT
-            else:
-                line_type = LineType.NONE
-            if (
-                line_type != self._last_line_type
-                and self._last_line_type != LineType.BLOCK_START
-                and line_type != LineType.BLOCK_END
-            ):
-                self._result += "\n"
-            self._last_line_type = line_type
-
-        self._result += ("  " * self._indent) + line
-        if newline:
-            self._result += "\n"
+        self._result += line
 
         if line.endswith("{") or line.endswith("["):
             if len(self._blocks_need_end):
                 self._blocks_need_end[-1] = _CLOSING[line[-1]]
-            self._indent += 1
 
     def print_attribute(self, name: str, value: str, type: GirType) -> None:
         def get_enum_name(value):

From b79c78bb74585463a636a1ceffa1fabec9ad5267 Mon Sep 17 00:00:00 2001
From: Gregor Niehl <gregorniehl@web.de>
Date: Fri, 22 Dec 2023 16:48:49 +0100
Subject: [PATCH 196/290] tests: Update to reflect current foramtting style

---
 tests/samples/accessibility_dec.blp | 3 +--
 tests/samples/child_type.blp        | 6 ++----
 tests/samples/id_prop.blp           | 3 +--
 tests/samples/placeholder_dec.blp   | 3 +--
 tests/samples/template.blp          | 2 +-
 tests/samples/using.blp             | 3 +--
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/tests/samples/accessibility_dec.blp b/tests/samples/accessibility_dec.blp
index eedb6cd..4a370cb 100644
--- a/tests/samples/accessibility_dec.blp
+++ b/tests/samples/accessibility_dec.blp
@@ -8,5 +8,4 @@ Box {
   }
 }
 
-Label my_label {
-}
+Label my_label {}
diff --git a/tests/samples/child_type.blp b/tests/samples/child_type.blp
index 4e12098..a6a76d5 100644
--- a/tests/samples/child_type.blp
+++ b/tests/samples/child_type.blp
@@ -2,12 +2,10 @@ using Gtk 4.0;
 
 Window {
   [titlebar]
-  HeaderBar {
-  }
+  HeaderBar {}
 }
 
 Dialog {
   [internal-child content_area]
-  Box {
-  }
+  Box {}
 }
diff --git a/tests/samples/id_prop.blp b/tests/samples/id_prop.blp
index 07b19a3..8200868 100644
--- a/tests/samples/id_prop.blp
+++ b/tests/samples/id_prop.blp
@@ -4,5 +4,4 @@ Scale {
   adjustment: adj;
 }
 
-Adjustment adj {
-}
+Adjustment adj {}
diff --git a/tests/samples/placeholder_dec.blp b/tests/samples/placeholder_dec.blp
index 46afd23..ddde6e3 100644
--- a/tests/samples/placeholder_dec.blp
+++ b/tests/samples/placeholder_dec.blp
@@ -1,4 +1,3 @@
 using Gtk 4.0;
 
-Box {
-}
+Box {}
diff --git a/tests/samples/template.blp b/tests/samples/template.blp
index fb019d3..aba76c1 100644
--- a/tests/samples/template.blp
+++ b/tests/samples/template.blp
@@ -1,6 +1,6 @@
 using Gtk 4.0;
 
-template $TestTemplate : ApplicationWindow {
+template $TestTemplate: ApplicationWindow {
   test-property: 'Hello, world';
   test-signal => $on_test_signal();
 }
diff --git a/tests/samples/using.blp b/tests/samples/using.blp
index 87d62d1..8b11013 100644
--- a/tests/samples/using.blp
+++ b/tests/samples/using.blp
@@ -1,5 +1,4 @@
 using Gtk 4.0;
 using GObject 2.0;
 
-GObject.Object {
-}
+GObject.Object {}

From 8a6ad847b6bea13984cefb986c859de8387ba81d Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 8 Jan 2024 19:27:59 -0600
Subject: [PATCH 197/290] docs: Fix typo

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

diff --git a/docs/reference/document_root.rst b/docs/reference/document_root.rst
index eaf178d..ee97d6a 100644
--- a/docs/reference/document_root.rst
+++ b/docs/reference/document_root.rst
@@ -12,7 +12,7 @@ Document Root
 
    Root = :ref:`GtkDecl<Syntax GtkDecl>` (:ref:`Using<Syntax Using>`)* (:ref:`TranslationDomain<Syntax TranslationDomain>`)? ( :ref:`Template<Syntax Template>` | :ref:`Menu<Syntax Menu>` | :ref:`Object<Syntax Object>` )* EOF
 
-A blueprint document consists of a :ref:`GTK declaration<Syntax GtkDecl>`, one sor more :ref:`imports<Syntax Using>`, and a list of :ref:`objects<Syntax Object>` and/or a :ref:`template<Syntax Template>`.
+A blueprint document consists of a :ref:`GTK declaration<Syntax GtkDecl>`, one or more :ref:`imports<Syntax Using>`, and a list of :ref:`objects<Syntax Object>` and/or a :ref:`template<Syntax Template>`.
 
 Example
 ~~~~~~~

From 71a43a4a86547c1959eb546bf48aeb1f5572df45 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Mon, 8 Jan 2024 19:28:14 -0600
Subject: [PATCH 198/290] docs: Add section on referencing templates

---
 docs/reference/templates.rst | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/reference/templates.rst b/docs/reference/templates.rst
index 180979f..a1a9968 100644
--- a/docs/reference/templates.rst
+++ b/docs/reference/templates.rst
@@ -66,14 +66,27 @@ This ``MapsHeaderBar`` class, along with its blueprint template, can then be ref
      }
    }
 
-ID & Parent Parameters
-~~~~~~~~~~~~~~~~~~~~~~
+Type & Parent Parameters
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 The type name that directly follows the ``template`` keyword is the type of the template class. In most cases, this will be an extern type starting with ``$`` and matching the class name in the application code. Templates for use in a `Gtk.BuilderListItemFactory <https://docs.gtk.org/gtk4/class.BuilderListItemFactory.html>`_ use ``ListItem`` as the type name instead.
 
 The parent type is optional, and may only be present if the template type is extern. It enables limited type checking for the properties and signals of the template object.
 
 
+Referencing a Template
+----------------------
+
+To reference the template object in a binding or expression, use the ``template`` keyword:
+
+.. code-block:: blueprint
+
+   template $MyTemplate {
+     prop1: "Hello, world!";
+     prop2: bind template.prop1;
+   }
+
+
 Language Implementations
 ------------------------
 

From 2bf4fa855e4e65a00d6ba6659f052917c922a937 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 25 Jan 2024 19:46:29 -0600
Subject: [PATCH 199/290] docs: Fix typo

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

diff --git a/docs/index.rst b/docs/index.rst
index 06547c2..13f39e5 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!");

From dd2e9a10cb165f06ae432316a4abbb661c2b66cc Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 25 Jan 2024 19:49:00 -0600
Subject: [PATCH 200/290] docs: Fix another upgrade warning

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

diff --git a/docs/index.rst b/docs/index.rst
index 13f39e5..9347c7b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -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 a689150a8b6536fdaa7822585ec661cc83e291ec Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 25 Jan 2024 20:02:02 -0600
Subject: [PATCH 201/290] errors: Print code actions in error message

Previously they were only exposed by the language server, but now the
command line will print the old and new text.
---
 blueprintcompiler/errors.py | 10 ++++++++++
 docs/index.rst              |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/blueprintcompiler/errors.py b/blueprintcompiler/errors.py
index 73fd45d..a28c05d 100644
--- a/blueprintcompiler/errors.py
+++ b/blueprintcompiler/errors.py
@@ -107,6 +107,16 @@ at {filename} line {line_num} column {col_num}:
         for hint in self.hints:
             stream.write(f"{Colors.FAINT}hint: {hint}{Colors.CLEAR}\n")
 
+        for i, action in enumerate(self.actions):
+            old = (
+                action.edit_range.text
+                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"
+            )
+
         for ref in self.references:
             line_num, col_num = utils.idx_to_pos(ref.range.start + 1, code)
             line = code.splitlines(True)[line_num]
diff --git a/docs/index.rst b/docs/index.rst
index 9347c7b..06547c2 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 template.main_text;
+       label: bind MyAppWindow.main_text;
      }
    }
 

From dc4255648724b9664c93da44a20e0fb5c6a87e1c Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 1 Feb 2024 19:33:41 -0600
Subject: [PATCH 202/290] ci: Add glslc to Dockerfile

New GTK dependency.
---
 build-aux/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-aux/Dockerfile b/build-aux/Dockerfile
index d7093ff..617015f 100644
--- a/build-aux/Dockerfile
+++ b/build-aux/Dockerfile
@@ -2,7 +2,7 @@ FROM fedora:latest
 
 RUN dnf install -y meson gcc g++ python3-pip gobject-introspection-devel \
 	python3-devel python3-gobject git diffutils xorg-x11-server-Xvfb \
-	appstream-devel dbus-x11 "dnf-command(builddep)"
+	appstream-devel dbus-x11 "dnf-command(builddep)" glslc
 RUN dnf build-dep -y gtk4 libadwaita
 RUN pip3 install furo mypy sphinx coverage black isort
 

From 652242125175aaf143ab6b0fac871ee25fac8722 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Thu, 1 Feb 2024 19:38:19 -0600
Subject: [PATCH 203/290] Fix formatting

---
 blueprintcompiler/ast_utils.py         |  6 ++----
 blueprintcompiler/interactive_port.py  |  4 +---
 blueprintcompiler/language/gtk_menu.py |  8 +++++---
 blueprintcompiler/lsp.py               | 16 ++++++++++------
 blueprintcompiler/lsp_utils.py         | 14 ++++++++------
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/blueprintcompiler/ast_utils.py b/blueprintcompiler/ast_utils.py
index ce15faf..a63729d 100644
--- a/blueprintcompiler/ast_utils.py
+++ b/blueprintcompiler/ast_utils.py
@@ -38,12 +38,10 @@ class Children:
         return iter(self._children)
 
     @T.overload
-    def __getitem__(self, key: T.Type[TType]) -> T.List[TType]:
-        ...
+    def __getitem__(self, key: T.Type[TType]) -> T.List[TType]: ...
 
     @T.overload
-    def __getitem__(self, key: int) -> "AstNode":
-        ...
+    def __getitem__(self, key: int) -> "AstNode": ...
 
     def __getitem__(self, key):
         if isinstance(key, int):
diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py
index 43bb03f..0c37885 100644
--- a/blueprintcompiler/interactive_port.py
+++ b/blueprintcompiler/interactive_port.py
@@ -301,9 +301,7 @@ def step5(in_files):
                 (
                     Colors.GREEN
                     if line.startswith("+")
-                    else Colors.RED + Colors.FAINT
-                    if line.startswith("-")
-                    else ""
+                    else Colors.RED + Colors.FAINT if line.startswith("-") else ""
                 )
                 + line
                 + Colors.CLEAR
diff --git a/blueprintcompiler/language/gtk_menu.py b/blueprintcompiler/language/gtk_menu.py
index 844c309..4b940af 100644
--- a/blueprintcompiler/language/gtk_menu.py
+++ b/blueprintcompiler/language/gtk_menu.py
@@ -88,9 +88,11 @@ class MenuAttribute(AstNode):
             self.name,
             SymbolKind.Field,
             self.range,
-            self.group.tokens["name"].range
-            if self.group.tokens["name"]
-            else self.range,
+            (
+                self.group.tokens["name"].range
+                if self.group.tokens["name"]
+                else self.range
+            ),
             self.value.range.text,
         )
 
diff --git a/blueprintcompiler/lsp.py b/blueprintcompiler/lsp.py
index b9522bd..cdf0c83 100644
--- a/blueprintcompiler/lsp.py
+++ b/blueprintcompiler/lsp.py
@@ -390,9 +390,11 @@ class LanguageServer:
                     "changes": {
                         open_file.uri: [
                             {
-                                "range": action.edit_range.to_json()
-                                if action.edit_range
-                                else diagnostic.range.to_json(),
+                                "range": (
+                                    action.edit_range.to_json()
+                                    if action.edit_range
+                                    else diagnostic.range.to_json()
+                                ),
                                 "newText": action.replace_with,
                             }
                         ]
@@ -463,9 +465,11 @@ class LanguageServer:
         result = {
             "range": err.range.to_json(),
             "message": message,
-            "severity": DiagnosticSeverity.Warning
-            if isinstance(err, CompileWarning)
-            else DiagnosticSeverity.Error,
+            "severity": (
+                DiagnosticSeverity.Warning
+                if isinstance(err, CompileWarning)
+                else DiagnosticSeverity.Error
+            ),
         }
 
         if isinstance(err, DeprecationWarning):
diff --git a/blueprintcompiler/lsp_utils.py b/blueprintcompiler/lsp_utils.py
index 60ddd4e..34b0949 100644
--- a/blueprintcompiler/lsp_utils.py
+++ b/blueprintcompiler/lsp_utils.py
@@ -97,12 +97,14 @@ class Completion:
             "kind": self.kind,
             "tags": [CompletionItemTag.Deprecated] if self.deprecated else None,
             "detail": self.signature,
-            "documentation": {
-                "kind": "markdown",
-                "value": self.docs,
-            }
-            if self.docs
-            else None,
+            "documentation": (
+                {
+                    "kind": "markdown",
+                    "value": self.docs,
+                }
+                if self.docs
+                else None
+            ),
             "deprecated": self.deprecated,
             "sortText": self.sort_text,
             "insertText": insert_text,

From ba8b4921341c518c09e42853d4610feaf61239c1 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sun, 28 Jan 2024 02:03:29 +0100
Subject: [PATCH 204/290] Add support for Adw.AlertDialog

---
 NEWS.md                                       |  4 ++
 blueprintcompiler/gir.py                      |  7 ++-
 blueprintcompiler/language/__init__.py        |  4 +-
 ...ssage_dialog.py => adw_response_dialog.py} | 38 ++++++++++-----
 blueprintcompiler/outputs/xml/__init__.py     |  2 +-
 docs/reference/extensions.rst                 | 37 +++++++++++++--
 .../adw_alert_dialog_duplicate_flags.blp      |  9 ++++
 .../adw_alert_dialog_duplicate_flags.err      |  2 +
 tests/samples/adw_alertdialog_responses.blp   | 10 ++++
 tests/samples/adw_alertdialog_responses.ui    | 16 +++++++
 ...es.blp => adw_messagedialog_responses.blp} |  0
 ...nses.ui => adw_messagedialog_responses.ui} |  0
 tests/test_samples.py                         | 47 +++++++++++--------
 13 files changed, 136 insertions(+), 40 deletions(-)
 rename blueprintcompiler/language/{adw_message_dialog.py => adw_response_dialog.py} (81%)
 create mode 100644 tests/sample_errors/adw_alert_dialog_duplicate_flags.blp
 create mode 100644 tests/sample_errors/adw_alert_dialog_duplicate_flags.err
 create mode 100644 tests/samples/adw_alertdialog_responses.blp
 create mode 100644 tests/samples/adw_alertdialog_responses.ui
 rename tests/samples/{responses.blp => adw_messagedialog_responses.blp} (100%)
 rename tests/samples/{responses.ui => adw_messagedialog_responses.ui} (100%)

diff --git a/NEWS.md b/NEWS.md
index 706f4f0..ef294b7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+# v0.11.0
+
+- Added support for [Adw.AlertDialog](https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.AlertDialog.html#adwalertdialog-as-gtkbuildable) custom syntax.
+
 # v0.10.0
 
 ## Added
diff --git a/blueprintcompiler/gir.py b/blueprintcompiler/gir.py
index 9ad5699..142bbd2 100644
--- a/blueprintcompiler/gir.py
+++ b/blueprintcompiler/gir.py
@@ -79,7 +79,12 @@ def get_available_namespaces() -> T.List[T.Tuple[str, str]]:
     ]
 
     for search_path in search_paths:
-        for filename in os.listdir(search_path):
+        try:
+            filenames = os.listdir(search_path)
+        except FileNotFoundError:
+            continue
+
+        for filename in filenames:
             if filename.endswith(".typelib"):
                 namespace, version = filename.removesuffix(".typelib").rsplit("-", 1)
                 _available_namespaces.append((namespace, version))
diff --git a/blueprintcompiler/language/__init__.py b/blueprintcompiler/language/__init__.py
index 39d8336..1e183c9 100644
--- a/blueprintcompiler/language/__init__.py
+++ b/blueprintcompiler/language/__init__.py
@@ -3,7 +3,7 @@ from .adw_breakpoint import (
     AdwBreakpointSetter,
     AdwBreakpointSetters,
 )
-from .adw_message_dialog import ExtAdwMessageDialog
+from .adw_response_dialog import ExtAdwResponseDialog
 from .attributes import BaseAttribute
 from .binding import Binding
 from .common import *
@@ -60,7 +60,7 @@ OBJECT_CONTENT_HOOKS.children = [
     AdwBreakpointCondition,
     AdwBreakpointSetters,
     ExtAccessibility,
-    ExtAdwMessageDialog,
+    ExtAdwResponseDialog,
     ExtComboBoxItems,
     ext_file_filter_mime_types,
     ext_file_filter_patterns,
diff --git a/blueprintcompiler/language/adw_message_dialog.py b/blueprintcompiler/language/adw_response_dialog.py
similarity index 81%
rename from blueprintcompiler/language/adw_message_dialog.py
rename to blueprintcompiler/language/adw_response_dialog.py
index 9b3d41c..46172f2 100644
--- a/blueprintcompiler/language/adw_message_dialog.py
+++ b/blueprintcompiler/language/adw_response_dialog.py
@@ -1,4 +1,4 @@
-# adw_message_dialog.py
+# adw_response_dialog.py
 #
 # Copyright 2023 James Westman <james@jwestman.net>
 #
@@ -25,7 +25,7 @@ from .gobject_object import ObjectContent, validate_parent_type
 from .values import StringValue
 
 
-class ExtAdwMessageDialogFlag(AstNode):
+class ExtAdwResponseDialogFlag(AstNode):
     grammar = AnyOf(
         UseExact("flag", "destructive"),
         UseExact("flag", "suggested"),
@@ -51,12 +51,12 @@ class ExtAdwMessageDialogFlag(AstNode):
             )
 
 
-class ExtAdwMessageDialogResponse(AstNode):
+class ExtAdwResponseDialogResponse(AstNode):
     grammar = [
         UseIdent("id"),
         Match(":").expected(),
         to_parse_node(StringValue).expected("a string or translatable string"),
-        ZeroOrMore(ExtAdwMessageDialogFlag),
+        ZeroOrMore(ExtAdwResponseDialogFlag),
     ]
 
     @property
@@ -64,8 +64,8 @@ class ExtAdwMessageDialogResponse(AstNode):
         return self.tokens["id"]
 
     @property
-    def flags(self) -> T.List[ExtAdwMessageDialogFlag]:
-        return self.children[ExtAdwMessageDialogFlag]
+    def flags(self) -> T.List[ExtAdwResponseDialogFlag]:
+        return self.children[ExtAdwResponseDialogFlag]
 
     @property
     def appearance(self) -> T.Optional[str]:
@@ -106,16 +106,16 @@ class ExtAdwMessageDialogResponse(AstNode):
         )
 
 
-class ExtAdwMessageDialog(AstNode):
+class ExtAdwResponseDialog(AstNode):
     grammar = [
         Keyword("responses"),
         Match("[").expected(),
-        Delimited(ExtAdwMessageDialogResponse, ","),
+        Delimited(ExtAdwResponseDialogResponse, ","),
         "]",
     ]
 
     @property
-    def responses(self) -> T.List[ExtAdwMessageDialogResponse]:
+    def responses(self) -> T.List[ExtAdwResponseDialogResponse]:
         return self.children
 
     @property
@@ -128,8 +128,11 @@ class ExtAdwMessageDialog(AstNode):
         )
 
     @validate("responses")
-    def container_is_message_dialog(self):
-        validate_parent_type(self, "Adw", "MessageDialog", "responses")
+    def container_is_message_dialog_or_alert_dialog(self):
+        try:
+            validate_parent_type(self, "Adw", "MessageDialog", "responses")
+        except:
+            validate_parent_type(self, "Adw", "AlertDialog", "responses")
 
     @validate("responses")
     def unique_in_parent(self):
@@ -141,7 +144,18 @@ class ExtAdwMessageDialog(AstNode):
     applies_in_subclass=("Adw", "MessageDialog"),
     matches=new_statement_patterns,
 )
-def style_completer(lsp, ast_node, match_variables):
+def complete_adw_message_dialog(lsp, ast_node, match_variables):
+    yield Completion(
+        "responses", CompletionItemKind.Keyword, snippet="responses [\n\t$0\n]"
+    )
+
+
+@completer(
+    applies_in=[ObjectContent],
+    applies_in_subclass=("Adw", "AlertDialog"),
+    matches=new_statement_patterns,
+)
+def complete_adw_alert_dialog(lsp, ast_node, match_variables):
     yield Completion(
         "responses", CompletionItemKind.Keyword, snippet="responses [\n\t$0\n]"
     )
diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py
index b84c5cf..8707ee6 100644
--- a/blueprintcompiler/outputs/xml/__init__.py
+++ b/blueprintcompiler/outputs/xml/__init__.py
@@ -337,7 +337,7 @@ class XmlOutput(OutputFormat):
                 self._emit_attribute("property", "name", prop.name, prop.value, xml)
             xml.end_tag()
 
-        elif isinstance(extension, ExtAdwMessageDialog):
+        elif isinstance(extension, ExtAdwResponseDialog):
             xml.start_tag("responses")
             for response in extension.responses:
                 xml.start_tag(
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index fd42bad..86cfe62 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -15,7 +15,7 @@ Properties are the main way to set values on objects, but they are limited by th
 .. rst-class:: grammar-block
 
    Extension = :ref:`ExtAccessibility<Syntax ExtAccessibility>`
-   | :ref:`ExtAdwMessageDialog<Syntax ExtAdwMessageDialog>`
+   | :ref:`ExtAdwResponseDialog<Syntax ExtAdwResponseDialog>`
    | :ref:`ExtAdwBreakpoint<Syntax ExtAdwBreakpoint>`
    | :ref:`ExtComboBoxItems<Syntax ExtComboBoxItems>`
    | :ref:`ExtFileFilterMimeTypes<Syntax ExtFileFilter>`
@@ -63,16 +63,16 @@ Defines the condition for a breakpoint and the properties that will be set at th
    The `Adw.Breakpoint:condition <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/property.Breakpoint.condition.html>`_ property has type `Adw.BreakpointCondition <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/struct.BreakpointCondition.html>`_, which GtkBuilder doesn't know how to parse from a string. Therefore, the ``condition`` syntax is used instead.
 
 
-.. _Syntax ExtAdwMessageDialog:
+.. _Syntax ExtAdwResponseDialog:
 
 Adw.MessageDialog Responses
 ----------------------------
 
 .. rst-class:: grammar-block
 
-   ExtAdwMessageDialog = 'responses' '[' (ExtAdwMessageDialogResponse),* ']'
-   ExtAdwMessageDialogResponse = <id::ref:`IDENT<Syntax IDENT>`> ':' :ref:`StringValue<Syntax StringValue>` ExtAdwMessageDialogFlag*
-   ExtAdwMessageDialogFlag = 'destructive' | 'suggested' | 'disabled'
+   ExtAdwResponseDialog = 'responses' '[' (ExtAdwResponseDialogResponse),* ']'
+   ExtAdwResponseDialogResponse = <id::ref:`IDENT<Syntax IDENT>`> ':' :ref:`StringValue<Syntax StringValue>` ExtAdwResponseDialogFlag*
+   ExtAdwResponseDialogFlag = 'destructive' | 'suggested' | 'disabled'
 
 Valid in `Adw.MessageDialog <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1-latest/class.MessageDialog.html>`_.
 
@@ -92,6 +92,33 @@ The ``responses`` block defines the buttons that will be added to the dialog. Th
    }
 
 
+Adw.AlertDialog Responses
+----------------------------
+
+.. rst-class:: grammar-block
+
+   ExtAdwAlertDialog = 'responses' '[' (ExtAdwAlertDialogResponse),* ']'
+   ExtAdwAlertDialogResponse = <id::ref:`IDENT<Syntax IDENT>`> ':' :ref:`StringValue<Syntax StringValue>` ExtAdwAlertDialogFlag*
+   ExtAdwAlertDialogFlag = 'destructive' | 'suggested' | 'disabled'
+
+Valid in `Adw.AlertDialog <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1-latest/class.AlertDialog.html>`_.
+
+The ``responses`` block defines the buttons that will be added to the dialog. The ``destructive`` or ``suggested`` flag sets the appearance of the button, and the ``disabled`` flag can be used to disable the button.
+
+.. code-block:: blueprint
+
+   using Adw 1;
+
+   Adw.AlertDialog {
+     responses [
+       cancel: _("Cancel"),
+       delete: _("Delete") destructive,
+       save: "Save" suggested,
+       wipeHardDrive: "Wipe Hard Drive" destructive disabled,
+     ]
+   }
+
+
 .. _Syntax ExtComboBoxItems:
 
 Gtk.ComboBoxText Items
diff --git a/tests/sample_errors/adw_alert_dialog_duplicate_flags.blp b/tests/sample_errors/adw_alert_dialog_duplicate_flags.blp
new file mode 100644
index 0000000..65fae22
--- /dev/null
+++ b/tests/sample_errors/adw_alert_dialog_duplicate_flags.blp
@@ -0,0 +1,9 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.AlertDialog {
+  responses [
+    cancel: _("Cancel") disabled disabled,
+    ok: _("Ok") destructive suggested,
+  ]
+}
\ No newline at end of file
diff --git a/tests/sample_errors/adw_alert_dialog_duplicate_flags.err b/tests/sample_errors/adw_alert_dialog_duplicate_flags.err
new file mode 100644
index 0000000..91f0a3d
--- /dev/null
+++ b/tests/sample_errors/adw_alert_dialog_duplicate_flags.err
@@ -0,0 +1,2 @@
+6,34,8,Duplicate 'disabled' flag
+7,29,9,'suggested' and 'destructive' are exclusive
\ No newline at end of file
diff --git a/tests/samples/adw_alertdialog_responses.blp b/tests/samples/adw_alertdialog_responses.blp
new file mode 100644
index 0000000..6680aa6
--- /dev/null
+++ b/tests/samples/adw_alertdialog_responses.blp
@@ -0,0 +1,10 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.AlertDialog {
+  responses [
+    cancel: _('Cancel'),
+    discard: _('Discard') destructive,
+    save: 'Save' suggested disabled,
+  ]
+}
\ No newline at end of file
diff --git a/tests/samples/adw_alertdialog_responses.ui b/tests/samples/adw_alertdialog_responses.ui
new file mode 100644
index 0000000..0418751
--- /dev/null
+++ b/tests/samples/adw_alertdialog_responses.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="AdwAlertDialog">
+    <responses>
+      <response id="cancel" translatable="true">Cancel</response>
+      <response id="discard" translatable="true" appearance="destructive">Discard</response>
+      <response id="save" enabled="false" appearance="suggested">Save</response>
+    </responses>
+  </object>
+</interface>
\ No newline at end of file
diff --git a/tests/samples/responses.blp b/tests/samples/adw_messagedialog_responses.blp
similarity index 100%
rename from tests/samples/responses.blp
rename to tests/samples/adw_messagedialog_responses.blp
diff --git a/tests/samples/responses.ui b/tests/samples/adw_messagedialog_responses.ui
similarity index 100%
rename from tests/samples/responses.ui
rename to tests/samples/adw_messagedialog_responses.ui
diff --git a/tests/test_samples.py b/tests/test_samples.py
index 38b72d6..0a525ca 100644
--- a/tests/test_samples.py
+++ b/tests/test_samples.py
@@ -44,6 +44,23 @@ class TestSamples(unittest.TestCase):
         super().__init__(*args, **kwargs)
         self.maxDiff = None
 
+        self.have_adw_1_4 = False
+        self.have_adw_1_5 = False
+
+        try:
+            import gi
+
+            gi.require_version("Adw", "1")
+            from gi.repository import Adw
+
+            Adw.init()
+            if Adw.MINOR_VERSION >= 4:
+                self.have_adw_1_4 = True
+            if Adw.MINOR_VERSION >= 5:
+                self.have_adw_1_5 = True
+        except:
+            pass
+
     def assert_ast_doesnt_crash(self, text, tokens, ast):
         for i in range(len(text)):
             ast.get_docs(i)
@@ -147,22 +164,6 @@ class TestSamples(unittest.TestCase):
             raise AssertionError()
 
     def test_samples(self):
-        have_adw = False
-        have_adw_1_4 = False
-
-        try:
-            import gi
-
-            gi.require_version("Adw", "1")
-            from gi.repository import Adw
-
-            have_adw = True
-            Adw.init()
-            if Adw.MINOR_VERSION >= 4:
-                have_adw_1_4 = True
-        except:
-            pass
-
         # list the samples directory
         samples = [
             f.stem
@@ -172,6 +173,7 @@ class TestSamples(unittest.TestCase):
         samples.sort()
         for sample in samples:
             REQUIRE_ADW_1_4 = ["adw_breakpoint"]
+            REQUIRE_ADW_1_5 = ["adw_alertdialog_responses"]
 
             SKIP_RUN = [
                 "expr_closure",
@@ -189,7 +191,9 @@ class TestSamples(unittest.TestCase):
                 "unchecked_class",
             ]
 
-            if sample in REQUIRE_ADW_1_4 and not have_adw_1_4:
+            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:
                 continue
 
             with self.subTest(sample):
@@ -202,8 +206,11 @@ class TestSamples(unittest.TestCase):
         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 have_adw_1_4:
+            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:
                 continue
 
             with self.subTest(sample_error):
@@ -211,6 +218,9 @@ class TestSamples(unittest.TestCase):
 
     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")
@@ -220,7 +230,6 @@ class TestSamples(unittest.TestCase):
         self.assert_decompile("property")
         self.assert_decompile("property_binding_dec")
         self.assert_decompile("placeholder_dec")
-        self.assert_decompile("responses")
         self.assert_decompile("scale_marks")
         self.assert_decompile("signal")
         self.assert_decompile("strings_dec")

From 05d6ff1fd78b665a9ae6b1f63035d129cd18860f Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Tue, 30 Jan 2024 11:02:34 +0100
Subject: [PATCH 205/290] Disable completer if applies_in_subclass type is not
 found

https://gitlab.gnome.org/jwestman/blueprint-compiler/-/merge_requests/177#note_1990521
---
 blueprintcompiler/completions_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprintcompiler/completions_utils.py b/blueprintcompiler/completions_utils.py
index 52e325d..03bec0f 100644
--- a/blueprintcompiler/completions_utils.py
+++ b/blueprintcompiler/completions_utils.py
@@ -51,7 +51,7 @@ def completer(applies_in: T.List, matches: T.List = [], applies_in_subclass=None
                 type = ast_node.root.gir.get_type(
                     applies_in_subclass[1], applies_in_subclass[0]
                 )
-                if ast_node.gir_class and not ast_node.gir_class.assignable_to(type):
+                if not ast_node.gir_class or not ast_node.gir_class.assignable_to(type):
                     return
 
             any_match = len(matches) == 0

From d47955c5a20b2f7cf85ff25a00b02160883aa0b1 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Fri, 9 Feb 2024 12:38:44 +0100
Subject: [PATCH 206/290] Document AdwMessageDialog and AdwAlertDialog
 separately

---
 NEWS.md                       |  4 ---
 docs/reference/extensions.rst | 61 ++++++++++++++++++-----------------
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index ef294b7..706f4f0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,7 +1,3 @@
-# v0.11.0
-
-- Added support for [Adw.AlertDialog](https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.AlertDialog.html#adwalertdialog-as-gtkbuildable) custom syntax.
-
 # v0.10.0
 
 ## Added
diff --git a/docs/reference/extensions.rst b/docs/reference/extensions.rst
index 86cfe62..744326f 100644
--- a/docs/reference/extensions.rst
+++ b/docs/reference/extensions.rst
@@ -15,7 +15,8 @@ Properties are the main way to set values on objects, but they are limited by th
 .. rst-class:: grammar-block
 
    Extension = :ref:`ExtAccessibility<Syntax ExtAccessibility>`
-   | :ref:`ExtAdwResponseDialog<Syntax ExtAdwResponseDialog>`
+   | :ref:`ExtAdwAlertDialog<Syntax ExtAdwAlertDialog>`
+   | :ref:`ExtAdwMessageDialog<Syntax ExtAdwMessageDialog>`
    | :ref:`ExtAdwBreakpoint<Syntax ExtAdwBreakpoint>`
    | :ref:`ExtComboBoxItems<Syntax ExtComboBoxItems>`
    | :ref:`ExtFileFilterMimeTypes<Syntax ExtFileFilter>`
@@ -63,34 +64,7 @@ Defines the condition for a breakpoint and the properties that will be set at th
    The `Adw.Breakpoint:condition <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/property.Breakpoint.condition.html>`_ property has type `Adw.BreakpointCondition <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/struct.BreakpointCondition.html>`_, which GtkBuilder doesn't know how to parse from a string. Therefore, the ``condition`` syntax is used instead.
 
 
-.. _Syntax ExtAdwResponseDialog:
-
-Adw.MessageDialog Responses
-----------------------------
-
-.. rst-class:: grammar-block
-
-   ExtAdwResponseDialog = 'responses' '[' (ExtAdwResponseDialogResponse),* ']'
-   ExtAdwResponseDialogResponse = <id::ref:`IDENT<Syntax IDENT>`> ':' :ref:`StringValue<Syntax StringValue>` ExtAdwResponseDialogFlag*
-   ExtAdwResponseDialogFlag = 'destructive' | 'suggested' | 'disabled'
-
-Valid in `Adw.MessageDialog <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1-latest/class.MessageDialog.html>`_.
-
-The ``responses`` block defines the buttons that will be added to the dialog. The ``destructive`` or ``suggested`` flag sets the appearance of the button, and the ``disabled`` flag can be used to disable the button.
-
-.. code-block:: blueprint
-
-   using Adw 1;
-
-   Adw.MessageDialog {
-     responses [
-       cancel: _("Cancel"),
-       delete: _("Delete") destructive,
-       save: "Save" suggested,
-       wipeHardDrive: "Wipe Hard Drive" destructive disabled,
-     ]
-   }
-
+.. _Syntax ExtAdwAlertDialog:
 
 Adw.AlertDialog Responses
 ----------------------------
@@ -119,6 +93,35 @@ The ``responses`` block defines the buttons that will be added to the dialog. Th
    }
 
 
+.. _Syntax ExtAdwMessageDialog:
+
+Adw.MessageDialog Responses
+----------------------------
+
+.. rst-class:: grammar-block
+
+   ExtAdwMessageDialog = 'responses' '[' (ExtAdwMessageDialogResponse),* ']'
+   ExtAdwMessageDialogResponse = <id::ref:`IDENT<Syntax IDENT>`> ':' :ref:`StringValue<Syntax StringValue>` ExtAdwMessageDialogFlag*
+   ExtAdwMessageDialogFlag = 'destructive' | 'suggested' | 'disabled'
+
+Valid in `Adw.MessageDialog <https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1-latest/class.MessageDialog.html>`_.
+
+The ``responses`` block defines the buttons that will be added to the dialog. The ``destructive`` or ``suggested`` flag sets the appearance of the button, and the ``disabled`` flag can be used to disable the button.
+
+.. code-block:: blueprint
+
+   using Adw 1;
+
+   Adw.MessageDialog {
+     responses [
+       cancel: _("Cancel"),
+       delete: _("Delete") destructive,
+       save: "Save" suggested,
+       wipeHardDrive: "Wipe Hard Drive" destructive disabled,
+     ]
+   }
+
+
 .. _Syntax ExtComboBoxItems:
 
 Gtk.ComboBoxText Items

From aa19e06d2825aefa7c7e67fdd57d83b6592c7099 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Thu, 21 Mar 2024 15:28:20 +0100
Subject: [PATCH 207/290] docs: Add more apps making use of Blueprint

---
 docs/index.rst | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index 06547c2..20e71b6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -81,33 +81,67 @@ Built with Blueprint
 - `AdwSteamGtk <https://github.com/Foldex/AdwSteamGtk>`_
 - `Blurble <https://gitlab.gnome.org/World/Blurble>`_
 - `Bottles <https://github.com/bottlesdevs/Bottles>`_
+- `Cartridges <https://github.com/kra-mo/cartridges>`_
+- `Cavalier <https://github.com/NickvisionApps/Cavalier>`_
+- `Chance <https://zelikos.dev/apps/rollit>`_
 - `Commit <https://github.com/sonnyp/Commit/>`_
+- `Confy <https://confy.kirgroup.net/>`_
+- `Daikhan <https://github.com/flathub/io.gitlab.daikhan.stable>`_
+- `Damask <https://gitlab.gnome.org/subpop/damask>`_
+- `Denaro <https://github.com/NickvisionApps/Denaro>`_
+- `Design <https://github.com/dubstar-04/Design>`_
+- `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>`_
+- `Dosage <https://github.com/diegopvlk/Dosage>`_
+- `Dynamic Wallpaper <https://github.com/dusansimic/dynamic-wallpaper>`_
 - `Extension Manager <https://github.com/mjakeman/extension-manager>`_
+- `Eyedropper <https://github.com/FineFindus/eyedropper>`_
 - `favagtk <https://gitlab.gnome.org/johannesjh/favagtk>`_
 - `Feeds <https://gitlab.gnome.org/World/gfeeds>`_
 - `File Shredder <https://github.com/ADBeveridge/raider>`_
+- `Flare <https://gitlab.com/schmiddi-on-mobile/flare>`_
+- `Flowtime <https://github.com/Diego-Ivan/Flowtime>`_
+- `Fretboard <https://github.com/bragefuglseth/fretboard>`_
+- `Frog <https://github.com/TenderOwl/Frog>`_
 - `Geopard <https://github.com/ranfdev/Geopard>`_
 - `Giara <https://gitlab.gnome.org/World/giara>`_
 - `Girens <https://gitlab.gnome.org/tijder/girens>`_
 - `Gradience <https://github.com/GradienceTeam/Gradience>`_
+- `Graphs <https://gitlab.gnome.org/World/Graphs>`_
 - `Health <https://gitlab.gnome.org/World/Health>`_
 - `HydraPaper <https://gitlab.com/gabmus/HydraPaper>`_
 - `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>`_
+- `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>`_
 - `Paper <https://gitlab.com/posidon_software/paper>`_
+- `Paper Plane <https://github.com/paper-plane-developers/paper-plane>`_
+- `Parabolic <https://github.com/NickvisionApps/Parabolic>`_
 - `Passes <https://github.com/pablo-s/passes>`_
+- `Pipeline <https://gitlab.com/schmiddi-on-mobile/pipeline>`_
 - `Playhouse <https://github.com/sonnyp/Playhouse>`_
 - `Plitki <https://github.com/YaLTeR/plitki>`_
 - `Raider <https://github.com/ADBeveridge/raider>`_
 - `Retro <https://github.com/sonnyp/Retro>`_
 - `Solanum <https://gitlab.gnome.org/World/Solanum>`_
+- `Sudoku Solver <https://gitlab.com/cyberphantom52/sudoku-solver>`_
 - `Swatch <https://gitlab.gnome.org/GabMus/swatch>`_
+- `Switcheroo <https://gitlab.com/adhami3310/Switcheroo>`_
+- `Tagger <https://github.com/NickvisionApps/Tagger>`_
 - `Tangram <https://github.com/sonnyp/Tangram/>`_
 - `Text Pieces <https://github.com/liferooter/textpieces>`_
+- `Upscaler <https://gitlab.gnome.org/World/Upscaler>`_
 - `Video Trimmer <https://gitlab.gnome.org/YaLTeR/video-trimmer>`_
+- `Webfont Kit Generator <https://github.com/rafaelmardojai/webfont-kit-generator>`_
 - `WhatIP <https://gitlab.gnome.org/GabMus/whatip>`_
-- `Workbench <https://github.com/sonnyp/Workbench>`_
+- `Who Wants To Be a Millionaire <https://github.com/martinszeltins/who-wants-to-be-a-millionaire/>`_
+- `Workbench <https://github.com/sonnyp/Workbench>`_
\ No newline at end of file

From 66b43c36cf1017c878762007373964a096b3d2a5 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Thu, 21 Mar 2024 15:18:19 +0100
Subject: [PATCH 208/290] Release v0.12.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 706f4f0..5bb0864 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,35 @@
+# v0.12.0
+
+## Added
+
+- Add support for Adw.AlertDialog (Sonny Piers)
+- Emit warnings for deprecated APIs - lsp and compiler
+- lsp: Document symbols
+- lsp: "Go to definition" (ctrl+click)
+- lsp: Code action for "namespace not imported" diagnostics, that adds the missing import
+- Add a formatter - cli and lsp (Gregor Niehl)
+- Support for translation domain - see documentation
+- cli: Print code actions in error messages
+
+## Changed
+
+- compiler: Add a header notice mentionning the file is generated (Urtsi Santsi)
+- decompiler: Use single quotes for output
+
+## Fixed
+
+- Fixed multine strings support with the escape newline character
+- lsp: Fixed the signal completion, which was missing the "$"
+- lsp: Fixed property value completion  (Ivan Kalinin)
+- lsp: Added a missing semantic highlight (for the enum in Gtk.Scale marks)
+- Handle big endian bitfields correctly (Jerry James)
+- batch-compile: Fix mixing relative and absolute paths (Marco Köpcke )
+
+## Documentation
+
+- Fix grammar for bindings
+- Add section on referencing templates
+
 # v0.10.0
 
 ## Added
diff --git a/docs/flatpak.rst b/docs/flatpak.rst
index 5689163..9eb49ac 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.10.0"
+         "tag": "v0.12.0"
        }
      ]
    }
diff --git a/meson.build b/meson.build
index 0edd6d8..6e19cab 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('blueprint-compiler',
-  version: '0.10.1',
+  version: '0.12.0',
 )
 
 subdir('docs')

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 209/290] 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 210/290] 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 211/290] 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 212/290] 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 213/290] 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 214/290] 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 215/290] 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 216/290] 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 217/290] 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 218/290] 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 219/290] 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 220/290] 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 221/290] 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 222/290] 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 223/290] 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 224/290] 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 225/290] 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 226/290] 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 227/290] 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 228/290] 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 229/290] 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 230/290] 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 231/290] 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 232/290] 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 233/290] 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 234/290] 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 235/290] 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 236/290] 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 237/290] 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 238/290] 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 239/290] 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 240/290] 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 241/290] 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 242/290] 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 243/290] 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 244/290] 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 245/290] 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 246/290] 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 247/290] 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 248/290] 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 249/290] 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 250/290] 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 251/290] 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 252/290] 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 253/290] 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 254/290] 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 255/290] 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 256/290] 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 257/290] 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 258/290] 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 259/290] 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 260/290] 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 261/290] 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 262/290] 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 263/290] 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 264/290] 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 265/290] 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 266/290] 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 267/290] 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 268/290] 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 269/290] 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 270/290] 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 271/290] 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 272/290] 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 273/290] 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 274/290] 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 275/290] 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 276/290] 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 277/290] 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 278/290] 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 279/290] 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 280/290] 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 281/290] 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 282/290]  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 283/290] 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 284/290] 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 285/290] 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 286/290] 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 287/290] 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 288/290] 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 289/290] 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 290/290] 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",