Pre 46 maintenance

.gitignore

@@ -18,3 +18,5 @@ __pycache__
 
 # IDEs / editors
 .idea
+
+target

build-aux/modules/libshumate.json

@@ -5,8 +5,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://download.gnome.org/sources/libshumate/1.2/libshumate-1.2.rc2.tar.xz",
-      "sha256": "ad24ed819c2f4f5330857e1dc69e55405dd700cad14c3e764080bd305e453345"
+      "url": "https://download.gnome.org/sources/libshumate/1.2/libshumate-1.2.0.tar.xz",
+      "sha256": "4f8413a707cd00f84cee39ca49f58c48fc436f008ea80d6532ac37dafd0ba96b"
     }
   ],
   "modules": [

src/IconLibrary/main.js

@@ -1,4 +1,4 @@
-import Gtk from "gi://Gtk?version=4.0";
+import Gtk from "gi://Gtk";
 import Gdk from "gi://Gdk";
 import Adw from "gi://Adw";
 import Gio from "gi://Gio";

src/cli/main.js

@@ -7,6 +7,11 @@ import GLib from "gi://GLib";
 import Gio from "gi://Gio";
 import Gtk from "gi://Gtk";
 import Adw from "gi://Adw";
+import GObject from "gi://GObject";
+import Shumate from "gi://Shumate";
+
+import { parse } from "../langs/xml/xml.js";
+import { LSPError, diagnostic_severities } from "../lsp/LSP.js";
 
 import {
   createLSPClient,
@@ -17,7 +22,7 @@ import {
 import lint, { waitForDiagnostics } from "./lint.js";
 import format, { formatting } from "./format.js";
 
-Gtk.init();
+GObject.type_ensure(Shumate.SimpleMap);
 
 export async function main([action, ...args]) {
   const current_dir = Gio.File.new_for_path(GLib.get_current_dir());
@@ -77,13 +82,6 @@ export async function main([action, ...args]) {
   return success ? 0 : 1;
 }
 
-import { parse } from "../langs/xml/xml.js";
-import Shumate from "gi://Shumate";
-import { LSPError, diagnostic_severities } from "../lsp/LSP.js";
-
-// Why?
-new Shumate.Map();
-
 const application = new Adw.Application();
 const window = new Adw.ApplicationWindow();
 

src/init.js

@@ -1,20 +1,13 @@
 import "gi://GIRepository?version=2.0";
-import "gi://Gtk?version=4.0";
-import "gi://GtkSource?version=5";
-import "gi://Adw?version=1";
-import Vte from "gi://Vte?version=3.91";
-import "gi://Soup?version=3.0";
-import "gi://WebKit?version=6.0";
-import "gi://Pango?version=1.0";
-import GObject from "gi://GObject";
-
 import Gtk from "gi://Gtk";
-import Gio from "gi://Gio";
+import Source from "gi://GtkSource";
 import Adw from "gi://Adw";
+import Vte from "gi://Vte";
+import GObject from "gi://GObject";
+import Gio from "gi://Gio";
 import Xdp from "gi://Xdp";
-import Source from "gi://GtkSource";
-import WebKit from "gi://WebKit";
 
+Adw.init();
 GObject.type_ensure(Vte.Terminal);
 
 Gio._promisify(Adw.AlertDialog.prototype, "choose", "choose_finish");
@@ -77,12 +70,6 @@ Gio._promisify(Source.FileLoader.prototype, "load_async", "load_finish");
 Gio._promisify(Gio.DBusProxy, "new", "new_finish");
 Gio._promisify(Gio.DBusConnection.prototype, "close", "close_finish");
 
-Gio._promisify(
-  WebKit.WebView.prototype,
-  "evaluate_javascript",
-  "evaluate_javascript_finish",
-);
-
 Gio._promisify(
   Gio.File.prototype,
   "enumerate_children_async",

src/langs/rust/README.md

@@ -0,0 +1,10 @@
+# Rust
+
+## Update Cargo.toml
+
+```sh
+cargo install cargo-edit
+cd template
+cargo upgrade
+cargo check
+```