Merge branch 'main' of https://gitlab.gnome.org/jwestman/blueprint-compiler into formatter

.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]+)%/'

blueprintcompiler/lsp.py

@@ -326,7 +326,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")

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
 

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">

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">

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>

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">

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">

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>

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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">

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>

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">

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">

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">

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">

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">

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>