Use dropdown to convert between XML and Blueprint

Author: sonnyp

blueprint-compiler

@@ -10,6 +10,7 @@ import {
   disconnect_signals,
   replaceBufferText,
   unstack,
+  listenProperty,
 } from "./util.js";
 
 import {
@@ -60,12 +61,7 @@ export default function PanelUI({
 
     const xml = await compile();
     replaceBufferText(buffer_xml, xml);
-    settings.set_int("ui-language", 0);
   }
-  const button_ui_export_xml = builder.get_object("button_ui_export_xml");
-  button_ui_export_xml.connect("clicked", () => {
-    convertToXML().catch(logError);
-  });
 
   async function convertToBlueprint() {
     term_console.clear();
@@ -84,21 +80,7 @@ export default function PanelUI({
     }
 
     replaceBufferText(buffer_blueprint, blp);
-    settings.set_int("ui-language", 1);
   }
-  const button_ui_export_blueprint = builder.get_object(
-    "button_ui_export_blueprint",
-  );
-  button_ui_export_blueprint.connect("clicked", () => {
-    convertToBlueprint().catch(logError);
-  });
-
-  settings.bind(
-    "ui-language",
-    dropdown_ui_lang,
-    "selected",
-    Gio.SettingsBindFlags.DEFAULT,
-  );
 
   const button_ui_experimental_blueprint = builder.get_object(
     "button_ui_experimental_blueprint",
@@ -119,21 +101,13 @@ export default function PanelUI({
     );
   });
 
-  dropdown_ui_lang.connect("notify::selected-item", switchLanguage);
-  function switchLanguage() {
-    const language = getLanguage(dropdown_ui_lang.selected_item.string);
-    stack_ui.set_visible_child_name(language.id);
-    button_ui_experimental_blueprint.visible = language.id === "blueprint";
-  }
-  switchLanguage();
-
   let handler_ids = null;
 
   const scheduleUpdate = unstack(update);
   async function update() {
     let xml;
     if (lang.id === "xml") {
-      xml = lang.document.buffer.text;
+      xml = buffer_xml.text;
     } else {
       xml = await compile();
     }
@@ -159,12 +133,44 @@ export default function PanelUI({
     }
   }
 
-  settings.connect_after("changed::ui-language", () => {
-    start();
-    scheduleUpdate();
+  async function onChangeLang(value) {
+    if (value === 0) {
+      try {
+        await convertToXML();
+      } catch (err) {
+        logError(err);
+        dropdown_ui_lang.block();
+        dropdown_ui_lang.set_selected(1);
+        dropdown_ui_lang.unblock();
+        return;
+      }
+    } else if (value === 1) {
+      try {
+        await convertToBlueprint();
+      } catch (err) {
+        logError(err);
+        dropdown_ui_lang.block();
+        dropdown_ui_lang.set_selected(0);
+        dropdown_ui_lang.unblock();
+        return;
+      }
+    }
+
+    settings.set_int("ui-language", dropdown_ui_lang.selected);
+    setupLanguage();
+  }
+
+  dropdown_ui_lang.set_selected(settings.get_int("ui-language"));
+  listenProperty(dropdown_ui_lang, "selected", (value) => {
+    onChangeLang(value).catch(logError);
   });
 
-  start();
+  function setupLanguage() {
+    start();
+    stack_ui.set_visible_child_name(lang.id);
+    button_ui_experimental_blueprint.visible = lang.id === "blueprint";
+  }
+  setupLanguage();
 
   panel.start = start;
   panel.stop = stop;

src/PanelUI.js

@@ -18,6 +18,11 @@ GLib.set_application_name("Workbench");
 const resource = Gio.resource_load("@pkgdatadir@/@app_id@.gresource");
 Gio.resources_register(resource);
 
+globalThis.__DEV__ = pkg.name.endsWith(".Devel");
+if (__DEV__) {
+  pkg.sourcedir = "@sourcedir@";
+}
+
 const loop = new GLib.MainLoop(null, false);
 import("resource:///re/sonny/Workbench/src/main.js")
   .then((main) => {

src/bin.js

@@ -7,6 +7,8 @@ import {
   getLanguage,
   prepareSourceView,
   handleDiagnostics,
+  connect_signals,
+  disconnect_signals,
 } from "../../util.js";
 import WorkbenchHoverProvider from "../../WorkbenchHoverProvider.js";
 import { getPid, once } from "../../../troll/src/util.js";
@@ -30,11 +32,14 @@ export function setup({ data_dir }) {
     provider,
   });
 
-  let modifed_changed_signal;
+  let handler_ids = null;
   async function setupLSP() {
     if (lspc.proc) return;
 
-    modifed_changed_signal && lspc.disconnect(modifed_changed_signal);
+    if (handler_ids !== null) {
+      disconnect_signals(buffer, handler_ids);
+      handler_ids = null;
+    }
     lspc.start();
 
     // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize
@@ -64,18 +69,22 @@ export function setup({ data_dir }) {
       },
     });
 
-    modifed_changed_signal = buffer.connect("modified-changed", () => {
-      if (!buffer.get_modified()) return;
-
+    function onUpdate() {
       lspc
         .notify("textDocument/didChange", {
           textDocument: {
             uri,
             version: ++document_version,
           },
-          contentChanges: [{text: buffer.text}],
+          contentChanges: [{ text: buffer.text }],
         })
         .catch(logError);
+    }
+
+    handler_ids = connect_signals(buffer, {
+      "end-user-action": onUpdate,
+      undo: onUpdate,
+      redo: onUpdate,
     });
   }
   setupLSP().catch(logError);
@@ -92,8 +101,12 @@ export function setup({ data_dir }) {
       null,
     );
     const lspc = new LSPClient([
-      // "/home/sonny/Projects/Workbench/blueprint-compiler/blueprint-compiler.py",
-      "/app/bin/blueprint-compiler",
+      __DEV__
+        ? GLib.build_filenamev([
+            pkg.sourcedir,
+            "blueprint-compiler/blueprint-compiler.py",
+          ])
+        : "/app/bin/blueprint-compiler",
       "lsp",
     ]);
     lspc.connect("exit", () => {
@@ -134,7 +147,7 @@ export function setup({ data_dir }) {
           uri,
           version: ++document_version,
         },
-        contentChanges: [{text: buffer.text}],
+        contentChanges: [{ text: buffer.text }],
       });
 
       const [{ xml }] = await once(

src/langs/blueprint/blueprint.js

@@ -25,13 +25,13 @@ export default class LSPClient {
   }
 
   _start_process() {
-    const flags =
-      Gio.SubprocessFlags.STDIN_PIPE |
-      Gio.SubprocessFlags.STDOUT_PIPE |
-      // vala-language-server emit lots of criticals https://github.com/vala-lang/vala-language-server/issues/274
-      // It's harmless but it looks scary.
-      // If you need to debug a language server, remove this flag
-      Gio.SubprocessFlags.STDERR_SILENCE;
+    let flags =
+      Gio.SubprocessFlags.STDIN_PIPE | Gio.SubprocessFlags.STDOUT_PIPE;
+    // vala-language-server emit lots of criticals so we disable this on release
+    // https://github.com/vala-lang/vala-language-server/issues/274
+    if (!__DEV__) {
+      flags = flags | Gio.SubprocessFlags.STDERR_SILENCE;
+    }
 
     this.proc = Gio.Subprocess.new(this.argv, flags);
     this.proc.wait_async(null, (_self, res) => {

src/lsp/LSPClient.js

@@ -6,6 +6,7 @@ bin_conf.set('prefix', prefix)
 bin_conf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
 bin_conf.set('datadir', datadir)
 bin_conf.set('pkgdatadir', pkgdatadir)
+bin_conf.set('sourcedir', meson.source_root())
 
 blueprint_compiler = find_program(
   # Flatpak

src/meson.build

@@ -117,6 +117,29 @@ export function getLanguageForFile(file) {
   });
 }
 
+export function listenProperty(
+  object,
+  property,
+  fn,
+  { initial = false, equal = true } = {},
+) {
+  let value = object[property];
+  if (initial) {
+    fn(value);
+  }
+  const signal_spec = object.connect(`notify::${property}`, () => {
+    const new_value = object[property];
+    if (equal && new_value === value) return;
+    value = new_value;
+    fn(value);
+  });
+  return {
+    disconnect() {
+      return signal_spec.disconnect();
+    },
+  };
+}
+
 export function connect_signals(target, signals) {
   return Object.entries(signals).map(([signal, handler]) => {
     return target.connect_after(signal, handler);

src/util.js

@@ -277,33 +277,6 @@ Gtk.ApplicationWindow window {
                 tooltip-text: _("Informaton about Blueprint");
               }
             }
-
-            [end]
-            Stack stack_ui_export {
-              visible-child-name: bind stack_ui.visible-child-name;
-
-              StackPage {
-                name: 'blueprint';
-                child: Button button_ui_export_xml {
-                  icon-name: "horizontal-arrows-right-symbolic";
-                  tooltip-text: _("Convert to XML");
-                  accessibility {
-                    label: _("Convert to XML");
-                  }
-                };
-              }
-
-              StackPage {
-                name: 'xml';
-                child: Button button_ui_export_blueprint {
-                  icon-name: "horizontal-arrows-left-symbolic";
-                  tooltip-text: _("Convert to Blueprint");
-                  accessibility {
-                    label: _("Convert to Blueprint");
-                  }
-                };
-              }
-            }
           }
 
           Separator {

src/window.blp

@@ -57,7 +57,7 @@ export default function Window({ application }) {
   const builder = Gtk.Builder.new_from_resource(resource);
 
   const window = builder.get_object("window");
-  if (pkg.name.endsWith("Devel")) {
+  if (__DEV__) {
     window.add_css_class("devel");
   }
   window.set_application(application);