Merge branch 'main' into 'main'

port: Fix build error when building in a flatpak

See merge request GNOME/blueprint-compiler!235

blueprintcompiler/language/contexts.py

@@ -60,21 +60,19 @@ class ScopeCtx:
 
         passed = {}
         for obj in self._iter_recursive(self.node):
-            from .gtk_menu import Menu
+            if obj.tokens["id"] is None:
-
-            if not (isinstance(obj, Object) or isinstance(obj, Menu)) or obj.id is None:
                 continue
 
-            if obj.id in passed:
+            if obj.tokens["id"] in passed:
                 token = obj.group.tokens["id"]
                 if not isinstance(obj, Template) and not isinstance(
                     obj, ExtListItemFactory
                 ):
                     raise CompileError(
-                        f"Duplicate object ID '{obj.id}'",
+                        f"Duplicate object ID '{obj.tokens['id']}'",
                         token.range,
                     )
-            passed[obj.id] = obj
+            passed[obj.tokens["id"]] = obj
 
     def _iter_recursive(self, node: AstNode):
         yield node

tests/samples/issue_195.blp

@@ -1,11 +0,0 @@
-using Gtk 4.0;
-using Adw 1;
-
-Adw.AlertDialog dialog1 {
-  responses [
-    ok: "Ok",
-    cancel: "Cancel",
-  ]
-}
-
-Button cancel {}

tests/samples/issue_195.ui

@@ -1,16 +0,0 @@
-<?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" id="dialog1">
-    <responses>
-      <response id="ok">Ok</response>
-      <response id="cancel">Cancel</response>
-    </responses>
-  </object>
-  <object class="GtkButton" id="cancel"></object>
-</interface>