cli: Deduplicate code with a diagnose fn

Author: sonnyp

build-aux/re.sonny.Workbench.Devel.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/flatpak/flatpak-builder/main/data/flatpak-manifest.schema.json",
   "id": "re.sonny.Workbench.Devel",
   "runtime": "org.gnome.Sdk",
-  "runtime-version": "47",
+  "runtime-version": "master",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.vala",

build-aux/re.sonny.Workbench.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/flatpak/flatpak-builder/main/data/flatpak-manifest.schema.json",
   "id": "re.sonny.Workbench",
   "runtime": "org.gnome.Sdk",
-  "runtime-version": "47",
+  "runtime-version": "master",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.vala",

build-aux/wip/run.js

@@ -225,7 +225,7 @@ async function exec(argv, { cancellable = null /*, verbose = false*/ }) {
     return arg.toString();
   });
 
-  console.debug(`$ ${argv}`);
+  console.debug(`$ ${argv.join(" ")}`);
 
   let cancelId = 0;
 

data/app.desktop

@@ -8,6 +8,6 @@ Type=Application
 Categories=WebDevelopment;Development;IDE;GNOME;GTK;
 Icon=@app_id@
 # TRANSLATORS: Don't translate
-Keywords=CSS;JavaScript;GJS;Blueprint;builder;Vala;GTK;libadwaita;Python;PyGObject;Rust;doc;playground;code;
+Keywords=CSS;JavaScript;GJS;Blueprint;builder;Vala;GTK;libadwaita;Python;PyGObject;Rust;doc;playground;code;TypeScript;
 DBusActivatable=true
 StartupNotify=true

src/cli/blueprint.js

@@ -5,51 +5,37 @@ import Gtk from "gi://Gtk";
 import { getLanguage } from "../common.js";
 import { parse } from "../langs/xml/xml.js";
 import { LSPError } from "../lsp/LSP.js";
-import { waitForDiagnostics } from "./lint.js";
-import { serializeDiagnostics, checkFile } from "./util.js";
-
-export default async function blueprint({ file_blueprint, lsp_clients }) {
-  print(`  ${file_blueprint.get_path()}`);
-  const uri = file_blueprint.get_uri();
-  const languageId = "blueprint";
-  let version = 0;
-
-  const [contents] = await file_blueprint.load_contents_async(null);
-  const text = new TextDecoder().decode(contents);
-
-  await lsp_clients.blueprint._notify("textDocument/didOpen", {
-    textDocument: {
-      uri,
-      languageId,
-      version: version++,
-      text,
+import { checkFile, diagnose } from "./util.js";
+
+const languageId = "blueprint";
+
+export default async function blueprint({ file, lspc }) {
+  print(`  ${file.get_path()}`);
+
+  const text = await diagnose({
+    file,
+    lspc,
+    languageId,
+    filter(diagnostic) {
+      // No replacements yet
+      return ![
+        "Gtk.ShortcutsShortcut is deprecated\nhint: This widget will be removed in GTK 5",
+        "Gtk.ShortcutLabel is deprecated\nhint: This widget will be removed in GTK 5",
+      ].includes(diagnostic.message);
     },
   });
+  if (text === false) return false;
 
-  const diagnostics = await waitForDiagnostics({
-    uri,
-    lspc: lsp_clients.blueprint,
-  });
-  if (diagnostics.length > 0) {
-    printerr(serializeDiagnostics({ diagnostics }));
-    return false;
-  }
-
-  print(`  ✅ lints`);
-
-  const { xml } = await lsp_clients.blueprint._request(
-    "textDocument/x-blueprint-compile",
-    {
-      textDocument: {
-        uri,
-      },
+  const { xml } = await lspc._request("textDocument/x-blueprint-compile", {
+    textDocument: {
+      uri: file.get_uri(),
     },
-  );
+  });
 
   print(`  ✅ compiles`);
 
   try {
-    await lsp_clients.blueprint._request("x-blueprint/decompile", {
+    await lspc._request("x-blueprint/decompile", {
       text: xml,
     });
     print("  ✅ decompiles");
@@ -68,16 +54,16 @@ export default async function blueprint({ file_blueprint, lsp_clients }) {
   }
 
   const checks = await checkFile({
-    lspc: lsp_clients.blueprint,
-    file: file_blueprint,
-    lang: getLanguage("blueprint"),
-    uri,
+    lspc,
+    file,
+    lang: getLanguage(languageId),
+    uri: file.get_uri(),
   });
   if (!checks) return false;
 
-  await lsp_clients.blueprint._notify("textDocument/didClose", {
+  await lspc._notify("textDocument/didClose", {
     textDocument: {
-      uri,
+      uri: file.get_uri(),
     },
   });
 

src/cli/css.js

@@ -1,49 +1,27 @@
 /* eslint-disable no-restricted-globals */
 
 import { getLanguage } from "../common.js";
-import { waitForDiagnostics } from "./lint.js";
-import { serializeDiagnostics, checkFile } from "./util.js";
+import { checkFile, diagnose } from "./util.js";
 
-export default async function css({ file_css, lsp_clients }) {
-  print(`  ${file_css.get_path()}`);
+const languageId = "css";
 
-  const uri = file_css.get_uri();
-  const languageId = "css";
-  let version = 0;
+export default async function css({ file, lspc }) {
+  print(`  ${file.get_path()}`);
 
-  const [contents] = await file_css.load_contents_async(null);
-  const text = new TextDecoder().decode(contents);
-
-  await lsp_clients.css._notify("textDocument/didOpen", {
-    textDocument: {
-      uri,
-      languageId,
-      version: version++,
-      text,
-    },
-  });
-
-  const diagnostics = await waitForDiagnostics({
-    uri,
-    lspc: lsp_clients.css,
-  });
-  if (diagnostics.length > 0) {
-    printerr(serializeDiagnostics({ diagnostics }));
-    return false;
-  }
-  print(`  ✅ lints`);
+  const text = await diagnose({ file, lspc, languageId });
+  if (text === false) return false;
 
   const checks = await checkFile({
-    lspc: lsp_clients.css,
-    file: file_css,
-    lang: getLanguage("css"),
-    uri,
+    lspc,
+    file,
+    lang: getLanguage(languageId),
+    uri: file.get_uri(),
   });
   if (!checks) return false;
 
-  await lsp_clients.css._notify("textDocument/didClose", {
+  await lspc._notify("textDocument/didClose", {
     textDocument: {
-      uri,
+      uri: file.get_uri(),
     },
   });
 }

src/cli/javascript.js

@@ -1,52 +1,30 @@
 /* eslint-disable no-restricted-globals */
 
 import { getLanguage } from "../common.js";
-import { waitForDiagnostics } from "./lint.js";
-import { serializeDiagnostics, checkFile, getCodeObjectIds } from "./util.js";
+import { checkFile, getCodeObjectIds, diagnose } from "./util.js";
 
-export default async function typescript({
-  file_javascript,
-  lsp_clients,
+const languageId = "javascript";
+
+export default async function javascript({
+  file,
+  lspc,
   blueprint_object_ids,
   demo_dir,
   application,
   builder,
   template,
   window,
 }) {
-  print(`  ${file_javascript.get_path()}`);
-
-  const uri = file_javascript.get_uri();
-  const languageId = "javascript";
-  let version = 0;
-
-  const [contents] = await file_javascript.load_contents_async(null);
-  const text = new TextDecoder().decode(contents);
+  print(`  ${file.get_path()}`);
 
-  await lsp_clients.javascript._notify("textDocument/didOpen", {
-    textDocument: {
-      uri,
-      languageId,
-      version: version++,
-      text,
-    },
-  });
-
-  const diagnostics = await waitForDiagnostics({
-    uri,
-    lspc: lsp_clients.javascript,
-  });
-  if (diagnostics.length > 0) {
-    printerr(serializeDiagnostics({ diagnostics }));
-    return false;
-  }
-  print(`  ✅ lints`);
+  const text = await diagnose({ file, lspc, languageId });
+  if (text === false) return false;
 
   const checks = await checkFile({
-    lspc: lsp_clients.javascript,
-    file: file_javascript,
+    lspc: lspc,
+    file: file,
     lang: getLanguage("javascript"),
-    uri,
+    uri: file.get_uri(),
   });
   if (!checks) return false;
 
@@ -69,12 +47,12 @@ export default async function typescript({
     preview() {},
   };
 
-  await import(`file://${file_javascript.get_path()}`);
+  await import(`file://${file.get_path()}`);
   print("  ✅ runs");
 
-  await lsp_clients.javascript._notify("textDocument/didClose", {
+  await lspc._notify("textDocument/didClose", {
     textDocument: {
-      uri,
+      uri: file.get_uri(),
     },
   });
 }

src/cli/main.js

@@ -133,22 +133,24 @@ async function ci({ filenames }) {
 
     const file_blueprint = demo_dir.get_child("main.blp");
     if (file_blueprint.query_exists(null)) {
-      ({ template, builder, blueprint_object_ids } = await blueprint({
-        file_blueprint,
-        lsp_clients,
-      }));
+      const result = await blueprint({
+        file: file_blueprint,
+        lspc: lsp_clients.blueprint,
+      });
+      if (result === false) return;
+      ({ template, builder, blueprint_object_ids } = result);
     }
 
     const file_css = demo_dir.get_child("main.css");
     if (file_css.query_exists(null)) {
-      await css({ file_css, lsp_clients });
+      await css({ file: file_css, lspc: lsp_clients.css });
     }
 
     const file_javascript = demo_dir.get_child("main.js");
     if (file_javascript.query_exists(null)) {
       await javascript({
-        file_javascript,
-        lsp_clients,
+        file: file_javascript,
+        lspc: lsp_clients.javascript,
         blueprint_object_ids,
         demo_dir,
         application,
@@ -161,8 +163,8 @@ async function ci({ filenames }) {
     const file_typescript = demo_dir.get_child("main.ts");
     if (file_typescript.query_exists(null)) {
       await typescript({
-        file_typescript,
-        lsp_clients,
+        file: file_typescript,
+        lspc: lsp_clients.typescript,
         blueprint_object_ids,
         demo_dir,
         application,
@@ -174,17 +176,17 @@ async function ci({ filenames }) {
 
     const file_vala = demo_dir.get_child("main.vala");
     if (file_vala.query_exists(null)) {
-      await vala({ file_vala, lsp_clients, demo_dir });
+      await vala({ file: file_vala, lspc: lsp_clients.vala, demo_dir });
     }
 
     const file_python = demo_dir.get_child("main.py");
     if (file_python.query_exists(null)) {
-      await python({ file_python, lsp_clients });
+      await python({ file: file_python, lspc: lsp_clients.python });
     }
 
     const file_rust = demo_dir.get_child("code.rs");
     if (file_rust.query_exists(null)) {
-      await rust({ file_rust, lsp_clients });
+      await rust({ file: file_rust, lspc: lsp_clients.rust });
     }
 
     await Promise.all(