cli: Add proper Python support (#903)

Author: sonnyp

Makefile

@@ -53,7 +53,7 @@ test: unit lint
 	./build-aux/fun workbench-cli ci demos/demos/Welcome
 
 ci: setup test
-	./build-aux/fun workbench-cli ci demos/demos/**
+	./build-aux/fun workbench-cli ci demos/demos/*
 
 # Note that if you have Sdk extensions installed they will be used
 # make sure to test without the sdk extensions installed

demos

@@ -27,7 +27,7 @@
     "*.{json,md,yaml,yml}": "prettier --write",
     "*.{js,cjs,mjs}": "eslint --fix",
     "*.css": "./build-aux/fun workbench-cli format css",
-    "*.py": "./build-aux/fun ruff format --config=src/langs/python/ruff.toml",
+    "*.py": "./build-aux/fun workbench-cli format python",
     "*.rs": "./build-aux/fun rustfmt --edition 2021",
     "*.blp": "./build-aux/fun workbench-cli format blueprint",
     "*.vala": "./build-aux/fun workbench-cli format vala"

package.json

@@ -219,7 +219,7 @@ export default function Internal({
     }
 
     css_provider = new Gtk.CssProvider();
-    css_provider.load_from_data(style, -1);
+    css_provider.load_from_string(style);
     Gtk.StyleContext.add_provider_for_display(
       output.get_display(),
       css_provider,

src/Previewer/Internal.js

@@ -118,7 +118,7 @@ namespace Workbench {
                 var end = section.get_end_location ();
                 this.css_parser_error (error.message, (int) start.lines, (int) start.line_chars, (int) end.lines, (int) end.line_chars);
             });
-            this.css.load_from_data (content.data);
+            this.css.load_from_string (content);
             Gtk.StyleContext.add_provider_for_display (
                                                        Gdk.Display.get_default (),
                                                        this.css,

src/Previewer/previewer.vala

@@ -8,7 +8,12 @@ import Gio from "gi://Gio";
 import Gtk from "gi://Gtk";
 import Adw from "gi://Adw";
 
-import { createLSPClient, languages, getLanguage } from "../common.js";
+import {
+  createLSPClient,
+  languages,
+  getLanguage,
+  PYTHON_LSP_CONFIG,
+} from "../common.js";
 import lint, { waitForDiagnostics } from "./lint.js";
 import format, { formatting } from "./format.js";
 
@@ -51,6 +56,12 @@ export async function main([action, ...args]) {
   lspc._start_process();
   await lspc._initialize();
 
+  if (lang.id === "python") {
+    await lspc._request("workspace/didChangeConfiguration", {
+      settings: PYTHON_LSP_CONFIG,
+    });
+  }
+
   let success = false;
 
   if (action === "lint") {
@@ -78,7 +89,7 @@ const window = new Adw.ApplicationWindow();
 
 function createLSPClients({ root_uri }) {
   return Object.fromEntries(
-    ["javascript", "blueprint", "css", "vala", "rust"].map((id) => {
+    ["javascript", "blueprint", "css", "vala", "rust", "python"].map((id) => {
       const lang = languages.find((language) => language.id === id);
       const lspc = createLSPClient({
         lang,
@@ -363,7 +374,6 @@ async function ci({ filenames, current_dir }) {
         uri,
         lspc: lsp_clients.vala,
       });
-
       // FIXME: deprecated features, no replacement?
       if (demo_dir.get_basename() === "Text Fields") {
         const ignore_for_text_fields = [
@@ -397,6 +407,55 @@ async function ci({ filenames, current_dir }) {
       });
     }
 
+    const file_python = demo_dir.get_child("main.py");
+    if (file_python.query_exists(null)) {
+      print(`  ${file_python.get_path()}`);
+
+      const uri = file_python.get_uri();
+      const languageId = "python";
+      let version = 0;
+
+      const [contents] = await file_python.load_contents_async(null);
+      const text = new TextDecoder().decode(contents);
+
+      await lsp_clients.python._request("workspace/didChangeConfiguration", {
+        settings: PYTHON_LSP_CONFIG,
+      });
+
+      await lsp_clients.python._notify("textDocument/didOpen", {
+        textDocument: {
+          uri,
+          languageId,
+          version: version++,
+          text,
+        },
+      });
+
+      const diagnostics = await waitForDiagnostics({
+        uri,
+        lspc: lsp_clients.python,
+      });
+      if (diagnostics.length > 0) {
+        printerr(serializeDiagnostics({ diagnostics }));
+        return false;
+      }
+      print(`  ✅ lints`);
+
+      const checks = await checkFile({
+        lspc: lsp_clients.python,
+        file: file_python,
+        lang: getLanguage("python"),
+        uri,
+      });
+      if (!checks) return false;
+
+      await lsp_clients.python._notify("textDocument/didClose", {
+        textDocument: {
+          uri,
+        },
+      });
+    }
+
     const file_rust = demo_dir.get_child("code.rs");
     if (file_rust.query_exists(null)) {
       print(`  ${file_rust.get_path()}`);

src/cli/main.js

@@ -147,3 +147,17 @@ export function createLSPClient({ lang, root_uri, quiet = true }) {
 
   return lspc;
 }
+
+export const PYTHON_LSP_CONFIG = {
+  pylsp: {
+    configurationSources: ["ruff"],
+    plugins: {
+      ruff: {
+        enabled: true,
+        formatEnabled: true,
+        executable: `${pkg.prefix}/bin/ruff`,
+        config: `${pkg.pkgdatadir}/ruff.toml`,
+      },
+    },
+  },
+};

src/common.js

@@ -137,7 +137,7 @@ def update_css(self, content: str):
             )
         self.css = Gtk.CssProvider()
         self.css.connect("parsing-error", self.on_css_parsing_error)
-        self.css.load_from_data(content, len(content))
+        self.css.load_from_string(content)
         Gtk.StyleContext.add_provider_for_display(
             Gdk.Display.get_default(), self.css, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
         )

src/langs/python/python-previewer.py

@@ -1,20 +1,6 @@
-import { createLSPClient } from "../../common.js";
+import { PYTHON_LSP_CONFIG, createLSPClient } from "../../common.js";
 import { getLanguage } from "../../util.js";
 
-const LSP_CONFIG = {
-  pylsp: {
-    configurationSources: ["ruff"],
-    plugins: {
-      ruff: {
-        enabled: true,
-        formatEnabled: true,
-        executable: `${pkg.prefix}/bin/ruff`,
-        config: `${pkg.pkgdatadir}/ruff.toml`,
-      },
-    },
-  },
-};
-
 export function setup({ document }) {
   const { file, buffer, code_view } = document;
 
@@ -24,7 +10,7 @@ export function setup({ document }) {
   });
 
   lspc.request("workspace/didChangeConfiguration", {
-    settings: LSP_CONFIG,
+    settings: PYTHON_LSP_CONFIG,
   });
 
   lspc.buffer = buffer;