Merge branch 'main' into 'main'

compile: fix flag values Closes #180 See merge request jwestman/blueprint-compiler!220
LSP: Handle shutdown commands
2025-05-04 15:59:08 -04:00 · 2025-01-04 00:47:09 +00:00 · 2025-01-03 22:49:36 +03:00 · 2024-12-18 17:46:26 +00:00 · 2024-12-18 17:46:26 +00:00 · 2024-12-18 17:46:26 +00:00
3 changed files with 13 additions and 4 deletions
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@ -211,12 +211,12 @@ 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
        elif member := type.members.get(self.name):
-            return member.value
+            return member.nick
        else:
            return None

--- 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")
--- 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>
Author	SHA1	Message	Date
kotontrion	32f763ed4c	Merge branch 'main' into 'main' compile: fix flag values Closes #180 See merge request jwestman/blueprint-compiler!220	2025-01-04 00:47:09 +00:00
Alexey Yerin	f3faf4b993	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.	2025-01-03 22:49:36 +03:00
kotontrion	e07da3c339	flags: use nick instead of name	2024-12-18 17:46:26 +00:00
kotontrion	2ae41020ab	Fix flag return value type	2024-12-18 17:46:26 +00:00
kotontrion	f48b840cfa	compile: fix flag values gtk builder does not support combining interger values with \| in flags properties, so the short names are used instead.	2024-12-18 17:46:26 +00:00