use static urls for progress svgs, attempt 2; v1.0.19

hhu-adam · Aug 8, 2024 · 4846bcf · 4846bcf
1 parent ec2743a
commit 4846bcf
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/demo/package-lock.json b/demo/package-lock.json
diff --git a/demo/server/index.mjs b/demo/server/index.mjs
@@ -48,11 +48,11 @@ wss.addListener("connection", function(ws, req) {
     const socketConnection = jsonrpcserver.createConnection(reader, writer, () => ws.close())
     const serverConnection = jsonrpcserver.createProcessStreamConnection(ps)
     socketConnection.forward(serverConnection, message => {
-        console.log(`CLIENT: ${JSON.stringify(message)}`)
+        // console.log(`CLIENT: ${JSON.stringify(message)}`)
         return message;
     })
     serverConnection.forward(socketConnection, message => {
-        console.log(`SERVER: ${JSON.stringify(message)}`)
+        // console.log(`SERVER: ${JSON.stringify(message)}`)
         return message;
     });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lean4monaco",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "Monaco Editor support for the Lean 4 theorem prover.",
   "keywords": [
     "lean",

diff --git a/src/leanmonaco.ts b/src/leanmonaco.ts
@@ -143,7 +143,17 @@ export type LeanMonacoOptions = {
       checkLean4ProjectPreconditions
     )
 
-    this.taskGutter = new LeanTaskGutter(this.clientProvider, {asAbsolutePath: (path: string) => Uri.parse(`${new URL('vscode-lean4/vscode-lean4/' + path, import.meta.url)}`),} as any)
+    const asAbsolutePath = (path: string) => {
+      switch (path) {
+        // url.pathToFileURL
+        case "media/progress-light.svg":       return Uri.parse(`${new URL('./vscode-lean4/vscode-lean4/media/progress-light.svg', import.meta.url)}`)
+        case "media/progress-dark.svg":        return Uri.parse(`${new URL('./vscode-lean4/vscode-lean4/media/progress-dark.svg', import.meta.url)}`)
+        case "media/progress-error-light.svg": return Uri.parse(`${new URL('./vscode-lean4/vscode-lean4/media/progress-error-light.svg', import.meta.url)}`)
+        case "media/progress-error-dark.svg":  return Uri.parse(`${new URL('./vscode-lean4/vscode-lean4/media/progress-error-dark.svg', import.meta.url)}`)
+      }
+    }
+
+    this.taskGutter = new LeanTaskGutter(this.clientProvider, {asAbsolutePath: asAbsolutePath} as any)
 
     const fontFile = new FontFace(
       "JuliaMono",