Introduce CodeView

Author: sonnyp

src/Document.js

@@ -1,32 +1,19 @@
 import Source from "gi://GtkSource?version=5";
 import Gio from "gi://Gio";
 import GLib from "gi://GLib";
-import { replaceBufferText } from "./util.js";
 import { promiseTask } from "../troll/src/util.js";
 
-export default function Document({
-  data_dir,
-  source_view,
-  lang,
-  placeholder,
-  ext,
-}) {
-  const { buffer } = source_view;
+export default function Document({ code_view, placeholder, file }) {
+  const { buffer } = code_view;
   let handler_id = null;
 
-  buffer.set_language(language_manager.get_language(lang));
-
-  const file = Gio.File.new_for_path(
-    GLib.build_filenamev([data_dir, `state.${ext}`]),
-  );
-
   const source_file = new Source.File({
     location: file,
   });
 
   loadSourceBuffer({ file: source_file, buffer })
     .then((success) => {
-      if (!success) replaceBufferText(buffer, placeholder, true);
+      if (!success) code_view.replaceText(placeholder, true);
     })
     .catch(logError);
   start();
@@ -50,7 +37,7 @@ export default function Document({
     }
   }
 
-  return { start, stop, save, source_view, buffer, file };
+  return { start, stop, save, code_view, file };
 }
 
 async function saveSourceBuffer({ file, buffer }) {
@@ -97,8 +84,3 @@ async function loadSourceBuffer({ file, buffer }) {
   }
   return success;
 }
-
-const language_manager = new Source.LanguageManager();
-language_manager.append_search_path(
-  "resource:///re/sonny/Workbench/language-specs",
-);

src/Library/demos/Custom widget/main.js

@@ -3,7 +3,6 @@ import Gtk from "gi://Gtk?version=4.0";
 
 Gtk.init();
 
-// rome-ignore lint(correctness/noUnusedVariables): https://github.com/rome/tools/issues/3779
 const AwesomeButton = GObject.registerClass(
   {
     GTypeName: "AwesomeButton",

src/PanelCode.js

@@ -6,7 +6,13 @@ import { settings } from "./util.js";
 import { setup as setupVala } from "./langs/vala/vala.js";
 import { setup as setupJavaScript } from "./langs/javascript/javascript.js";
 
-export default function PanelCode({ builder, previewer, data_dir }) {
+export default function PanelCode({
+  builder,
+  previewer,
+  data_dir,
+  document_vala,
+  document_javascript,
+}) {
   const panel_code = builder.get_object("panel_code");
   const button_code = builder.get_object("button_code");
   const stack_code = builder.get_object("stack_code");
@@ -41,8 +47,8 @@ export default function PanelCode({ builder, previewer, data_dir }) {
     panel: panel_code,
   };
 
-  setupVala({ data_dir });
-  setupJavaScript({ data_dir });
+  setupVala({ data_dir, document: document_vala });
+  setupJavaScript({ data_dir, document: document_javascript });
 
   function switchLanguage() {
     panel.language = dropdown_code_lang.selected_item.string;

src/PanelStyle.js

@@ -1,26 +1,9 @@
 import Gio from "gi://Gio";
 import GObject from "gi://GObject";
-import Gtk from "gi://Gtk";
-import Pango from "gi://Pango";
 
-import {
-  connect_signals,
-  getLanguage,
-  settings,
-  getItersAtRange,
-} from "./util.js";
-
-import WorkbenchHoverProvider from "./WorkbenchHoverProvider.js";
+import { settings } from "./util.js";
 
 export default function PanelStyle({ builder }) {
-  const buffer = getLanguage("css").document.buffer;
-  const provider = new WorkbenchHoverProvider();
-
-  prepareSourceView({
-    source_view: getLanguage("css").document.source_view,
-    provider,
-  });
-
   const button_style = builder.get_object("button_style");
   const panel_style = builder.get_object("panel_style");
   settings.bind(
@@ -35,50 +18,4 @@ export default function PanelStyle({ builder }) {
     "visible",
     GObject.BindingFlags.SYNC_CREATE,
   );
-
-  const panel = {
-    panel: panel_style,
-  };
-
-  function onUpdate() {
-    panel.reset();
-  }
-
-  connect_signals(buffer, {
-    "end-user-action": onUpdate,
-    undo: onUpdate,
-    redo: onUpdate,
-  });
-
-  panel.handleDiagnostic = function handleCssDiagnostic(diagnostic) {
-    // console.debug(`CssParser ${section.to_string()} ${error.message}`);
-
-    provider.diagnostics.push(diagnostic);
-    const [start_iter, end_iter] = getItersAtRange(buffer, diagnostic.range);
-    buffer.apply_tag_by_name("error", start_iter, end_iter);
-  };
-
-  panel.reset = function reset() {
-    buffer.remove_tag_by_name(
-      "error",
-      buffer.get_start_iter(),
-      buffer.get_end_iter(),
-    );
-    provider.diagnostics = [];
-  };
-
-  return panel;
-}
-
-function prepareSourceView({ source_view, provider }) {
-  const tag_table = source_view.buffer.get_tag_table();
-  const tag = new Gtk.TextTag({
-    name: "error",
-    underline: Pango.Underline.ERROR,
-  });
-  tag_table.add(tag);
-
-  const hover = source_view.get_hover();
-  // hover.hover_delay = 25;
-  hover.add_provider(provider);
 }

src/PanelUI.js

@@ -3,15 +3,7 @@ import GObject from "gi://GObject";
 import Gtk from "gi://Gtk";
 
 import { LSPError } from "./lsp/LSP.js";
-import {
-  getLanguage,
-  settings,
-  connect_signals,
-  disconnect_signals,
-  replaceBufferText,
-  unstack,
-  listenProperty,
-} from "./util.js";
+import { getLanguage, settings, unstack, listenProperty } from "./util.js";
 import { once } from "../troll/src/util.js";
 
 import {
@@ -26,16 +18,21 @@ export default function PanelUI({
   builder,
   data_dir,
   term_console,
+  document_xml,
+  document_blueprint,
 }) {
   let lang;
 
+  const code_view_xml = document_xml.code_view;
+  const code_view_blueprint = document_blueprint.code_view;
+
   const panel = {
     xml: "",
   };
   addSignalMethods(panel);
 
-  const buffer_blueprint = getLanguage("blueprint").document.buffer;
-  const buffer_xml = getLanguage("xml").document.buffer;
+  const buffer_blueprint = code_view_blueprint.buffer;
+  const buffer_xml = code_view_xml.buffer;
 
   const button_ui = builder.get_object("button_ui");
   const panel_ui = builder.get_object("panel_ui");
@@ -56,14 +53,15 @@ export default function PanelUI({
 
   const blueprint = setupBlueprint({
     data_dir,
+    document: document_blueprint,
   });
 
   async function convertToXML() {
     term_console.clear();
     settings.set_boolean("show-console", true);
 
     const xml = await blueprint.compile(buffer_blueprint.text);
-    replaceBufferText(buffer_xml, xml);
+    code_view_xml.replaceText(xml);
   }
 
   async function convertToBlueprint() {
@@ -82,7 +80,7 @@ export default function PanelUI({
       throw err;
     }
 
-    replaceBufferText(buffer_blueprint, blp);
+    code_view_blueprint.replaceText(blp);
   }
 
   const button_ui_experimental_blueprint = builder.get_object(
@@ -104,9 +102,8 @@ export default function PanelUI({
     );
   });
 
-  let handler_ids_xml = null;
-  let handler_ids_blueprint = null;
-  let handler_id_lsp = null;
+  let handler_id_xml = null;
+  let handler_id_blueprint = null;
 
   // FIXME we should wait for previewer update instead
   // when loading demo
@@ -134,35 +131,25 @@ export default function PanelUI({
   function start() {
     stop();
     lang = getLanguage(dropdown_ui_lang.selected_item.string);
-    // cannot use "changed" signal as it triggers many time for pasting
-    handler_ids_xml = connect_signals(buffer_xml, {
-      "end-user-action": () => onXML(buffer_xml.text),
-      undo: () => onXML(buffer_xml.text),
-      redo: () => onXML(buffer_xml.text),
-    });
-    handler_ids_blueprint = connect_signals(buffer_blueprint, {
-      "end-user-action": onBlueprint,
-      undo: onBlueprint,
-      redo: onBlueprint,
-    });
-    handler_id_lsp = blueprint.lspc.connect(
+    handler_id_xml = code_view_xml.connect(
+      "changed",
+      () => code_view_xml.buffer.text,
+    );
+    handler_id_blueprint = code_view_blueprint.connect("changed", onBlueprint);
+    blueprint.lspc.connect(
       "notification::textDocument/x-blueprintcompiler/publishCompiled",
       (_self, { xml }) => onXML(xml),
     );
   }
 
   function stop() {
-    if (handler_ids_xml !== null) {
-      disconnect_signals(buffer_xml, handler_ids_xml);
-      handler_ids_xml = null;
-    }
-    if (handler_ids_blueprint !== null) {
-      disconnect_signals(buffer_blueprint, handler_ids_blueprint);
-      handler_ids_blueprint = null;
+    if (handler_id_xml !== null) {
+      code_view_xml.disconnect(handler_id_xml);
+      handler_id_xml = null;
     }
-    if (handler_id_lsp !== null) {
-      blueprint.lspc.disconnect(handler_id_lsp);
-      handler_id_lsp = null;
+    if (handler_id_blueprint !== null) {
+      code_view_blueprint.disconnect(handler_id_blueprint);
+      handler_id_blueprint = null;
     }
   }
 

src/Previewer/External.js

@@ -2,12 +2,7 @@ import Adw from "gi://Adw?version=1";
 import Gio from "gi://Gio";
 import DBusPreviewer from "./DBusPreviewer.js";
 
-export default function Previewer({
-  output,
-  builder,
-  onWindowChange,
-  panel_style,
-}) {
+export default function Previewer({ output, builder, onWindowChange }) {
   const stack = builder.get_object("stack_preview");
 
   (function start_process() {
@@ -29,28 +24,11 @@ export default function Previewer({
     onWindowChange(open);
   });
 
-  dbus_proxy.connectSignal(
-    "CssParserError",
-    (
-      _proxy,
-      _name_owner,
-      [message, start_line, start_char, end_line, end_char],
-    ) => {
-      panel_style.handleDiagnostic({
-        message,
-        range: {
-          start: {
-            line: start_line,
-            character: start_char,
-          },
-          end: {
-            line: end_line,
-            character: end_char,
-          },
-        },
-      });
-    },
-  );
+  dbus_proxy.connectSignal("CssParserError", (_proxy, _name_owner, error) => {
+    builder
+      .get_object("code_view_css")
+      .handleDiagnostics([getCssDiagnostic(error)]);
+  });
 
   function start() {
     builder.get_object("button_screenshot").visible = false;
@@ -134,3 +112,27 @@ export default function Previewer({
     screenshot() {},
   };
 }
+
+// Converts a CssParserError to an LSP diagnostic object
+function getCssDiagnostic([
+  message,
+  start_line,
+  start_char,
+  end_line,
+  end_char,
+]) {
+  return {
+    message,
+    range: {
+      start: {
+        line: start_line,
+        character: start_char,
+      },
+      end: {
+        line: end_line,
+        character: end_char,
+      },
+    },
+    severity: 1,
+  };
+}