From 4846bcf2e87bc31a00ea9052c4a4fd246e86488d Mon Sep 17 00:00:00 2001 From: Jon Eugster Date: Thu, 8 Aug 2024 16:00:47 +0200 Subject: [PATCH] use static urls for progress svgs, attempt 2; v1.0.19 --- demo/package-lock.json | 2 +- demo/server/index.mjs | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- src/leanmonaco.ts | 12 +++++++++++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/demo/package-lock.json b/demo/package-lock.json index b32c69b..edf3bf6 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -31,7 +31,7 @@ } }, "..": { - "version": "1.0.16", + "version": "1.0.19", "license": "Apache-2.0", "dependencies": { "@leanprover/infoview": "=0.7.0", diff --git a/demo/server/index.mjs b/demo/server/index.mjs index 62e0198..c08a020 100644 --- 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 index dcc1dfc..73d4815 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "lean4monaco", - "version": "1.0.18", + "version": "1.0.19", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "lean4monaco", - "version": "1.0.18", + "version": "1.0.19", "license": "Apache-2.0", "dependencies": { "@leanprover/infoview": "=0.7.0", diff --git a/package.json b/package.json index 25a36f9..7141a82 100644 --- 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 index 0568f89..5a7bf09 100644 --- 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",