Enable workbench-cli ci and fix issues (#48)

workbenchdev · Jan 5, 2024 · ca4bc5c · ca4bc5c
1 parent 5af7001
commit ca4bc5c
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 48 deletions.
diff --git a/Makefile b/Makefile
@@ -6,14 +6,6 @@ setup:
 	cd Workbench && make setup
 
 lint:
-# JavaScript
-	./Workbench/build-aux/fun workbench-cli ci javascript demos/**/*.js
-# Vala
-# ./Workbench/build-aux/fun workbench-cli ci vala demos/**/*.vala
-# Blueprint
-# ./Workbench/build-aux/fun workbench-cli ci blueprint demos/**/*.blp
-# CSS
-# ./Workbench/build-aux/fun workbench-cli ci css demos/**/*.css
 # Rust
 	./Workbench/build-aux/fun rustfmt --check --edition 2021 demos/**/*.rs
 # Python
@@ -29,6 +21,7 @@ format:
 	./Workbench/build-aux/fun workbench-cli format vala demos/**/*.vala
 
 test: lint
+	./Workbench/build-aux/fun workbench-cli ci demos/*
 
 ci: setup test
 

diff --git a/Workbench b/Workbench
diff --git a/demos/Dialogs/main.blp b/demos/Dialogs/main.blp
@@ -47,3 +47,4 @@ Adw.StatusPage {
     }
   }
 }
+
diff --git a/demos/Dialogs/main.vala b/demos/Dialogs/main.vala
@@ -11,12 +11,8 @@ public void main () {
 }
 
 private void _create_confirmation_dialog (Gtk.Button button) {
-    // Get the parent window
-    var window_type = GLib.Type.from_name ("GtkWindow");
-    Gtk.Window window = workbench.window;
-
     Adw.MessageDialog dialog = new Adw.MessageDialog
-            (window,
+            (workbench.window,
             "Replace File?",
             """A file named "example.png" already exists. Do you want to replace it?""");
 
@@ -36,12 +32,8 @@ private void _create_confirmation_dialog (Gtk.Button button) {
 }
 
 private void _create_error_dialog (Gtk.Button button) {
-    // Get the parent window
-    var window_type = GLib.Type.from_name ("GtkWindow");
-    Gtk.Window window = button.get_ancestor (window_type) as Gtk.Window;
-
     Adw.MessageDialog dialog = new Adw.MessageDialog
-            (window,
+            (workbench.window,
             "Critical Error",
             "You did something you should not have");
 
@@ -57,12 +49,8 @@ private void _create_error_dialog (Gtk.Button button) {
 }
 
 private void _create_advanced_dialog (Gtk.Button button) {
-    // Get the parent window
-    var window_type = GLib.Type.from_name ("GtkWindow");
-    Gtk.Window window = button.get_ancestor (window_type) as Gtk.Window;
-
     Adw.MessageDialog dialog = new Adw.MessageDialog (
-                                                      window,
+                                                      workbench.window,
                                                       "Login",
                                                       "A valid password is needed to continue");
 

diff --git a/demos/Drag and Drop/main.blp b/demos/Drag and Drop/main.blp
@@ -90,3 +90,4 @@ Adw.StatusPage {
     }
   }
 }
+
diff --git a/demos/Drag and Drop/main.js b/demos/Drag and Drop/main.js
@@ -35,10 +35,9 @@ for (const row of list) {
   });
 
   drag_source.connect("drag-begin", (_source, drag) => {
-    const allocation = row.get_allocation();
     const drag_widget = new Gtk.ListBox();
 
-    drag_widget.set_size_request(allocation.width, allocation.height);
+    drag_widget.set_size_request(row.get_width(), row.get_height());
     drag_widget.add_css_class("boxed-list");
 
     const drag_row = new Adw.ActionRow({ title: row.title });
@@ -85,3 +84,4 @@ drop_target.connect("drop", (_drop, value, _x, y) => {
   // If everything is successful, return true to accept the drop
   return true;
 });
+
diff --git a/demos/Drag and Drop/main.vala b/demos/Drag and Drop/main.vala
@@ -32,11 +32,9 @@ public void main() {
         });
 
         drag_source.drag_begin.connect((drag) => {
-            Gtk.Allocation allocation;
-            row.get_allocation(out allocation);
             var drag_widget = new Gtk.ListBox();
 
-            drag_widget.set_size_request(allocation.width, allocation.height);
+            drag_widget.set_size_request(row.get_width(), row.get_height());
             drag_widget.add_css_class("boxed-list");
 
             var drag_row = new Adw.ActionRow() {

diff --git a/demos/Preferences Window/main.blp b/demos/Preferences Window/main.blp
@@ -142,17 +142,22 @@ Adw.PreferencesWindow pref_window {
   }
 }
 
-Adw.StatusPage subpage {
-  description: _("Custom Subpage");
-
-  Gtk.Button subpage_button {
-    label: _("Go back");
-    halign: center;
-    valign: center;
-
-    styles [
-      "suggested-action",
-      "pill"
-    ]
+Adw.NavigationPage subpage {
+  title: bind subpage_row.title;
+
+  Adw.StatusPage {
+    description: _("Custom Subpage");
+
+    Gtk.Button subpage_button {
+      label: _("Go back");
+      halign: center;
+      valign: center;
+
+      styles [
+        "suggested-action",
+        "pill"
+      ]
+    }
   }
 }
+
diff --git a/demos/Preferences Window/main.js b/demos/Preferences Window/main.js
@@ -21,11 +21,11 @@ dm_switch.connect("notify::active", () => {
 
 // Preferences windows can display subpages
 subpage_row.connect("activated", () => {
-  pref_window.present_subpage(subpage);
+  pref_window.push_subpage(subpage);
 });
 
 subpage_button.connect("clicked", () => {
-  pref_window.close_subpage();
+  pref_window.pop_subpage();
 });
 
 toast_button.connect("clicked", () => {
@@ -35,3 +35,4 @@ toast_button.connect("clicked", () => {
 
   pref_window.add_toast(toast);
 });
+
diff --git a/demos/Preferences Window/main.py b/demos/Preferences Window/main.py
@@ -25,9 +25,9 @@
 )
 
 # Preferences windows can display subpages
-subpage_row.connect("activated", lambda *_: pref_window.present_subpage(subpage))
+subpage_row.connect("activated", lambda *_: pref_window.push_subpage(subpage))
 
-subpage_button.connect("clicked", lambda *_: pref_window.close_subpage())
+subpage_button.connect("clicked", lambda *_: pref_window.pop_subpage())
 
 toast_button.connect(
     "clicked",

diff --git a/demos/Preferences Window/main.vala b/demos/Preferences Window/main.vala
@@ -3,7 +3,7 @@
 public void main () {
     var pref_window = (Adw.PreferencesWindow) workbench.builder.get_object ("pref_window");
     var dm_switch = (Adw.SwitchRow) workbench.builder.get_object ("dm_switch");
-    var subpage = (Adw.StatusPage) workbench.builder.get_object ("subpage");
+    var subpage = (Adw.NavigationPage) workbench.builder.get_object ("subpage");
     var subpage_row = (Adw.ActionRow) workbench.builder.get_object ("subpage_row");
     var subpage_button = (Gtk.Button) workbench.builder.get_object ("subpage_button");
     var toast_button = (Gtk.Button) workbench.builder.get_object ("toast_button");
@@ -21,9 +21,9 @@ public void main () {
     });
 
     // Preferences windows can display subpages
-    subpage_row.activated.connect (() => pref_window.present_subpage (subpage));
+    subpage_row.activated.connect (() => pref_window.push_subpage (subpage));
 
-    subpage_button.clicked.connect (() => pref_window.close_subpage ());
+    subpage_button.clicked.connect (() => pref_window.pop_subpage ());
 
     toast_button.clicked.connect (() => {
         var toast = new Adw.Toast ("Preferences windows can display toasts");
+5 −0		Makefile
+4 −4		build-aux/modules/biome.json
+2 −2		src/cli/README.md
+6 −3		src/cli/bin.js
+1 −1		src/cli/lint.js
+345 −4		src/cli/main.js
+2 −7		src/cli/meson.build
+18 −2		src/lsp/LSPClient.js