lean4monaco 1.0.15 → 1.0.17

package/dist/editor.js

@@ -15,7 +15,15 @@ export class LeanMonacoEditor {
         fs.writeFileSync(fileName, '');
         // Create editor and model
         this.modelRef = await createModelReference(Uri.parse(fileName), code);
-        this.editor = monaco.editor.create(editorEl, { automaticLayout: true });
+        this.editor = monaco.editor.create(editorEl, {
+            automaticLayout: true,
+            // Note: looks like setting options here prevents them from being overwritten later.
+            // TODO: Looks like these options cannot be set in `updateVSCodeOptions` in `leanmonaco.ts`
+            // so we set them here
+            contextmenu: false, // the context menu breaks mobile support.
+            lineNumbersMinChars: 1, // minimal no. of characters for line numbers
+            lineDecorationsWidth: 5, // distance (px) between line number and code.
+        });
         this.editor.setModel(this.modelRef.object.textEditorModel);
         // Set focus on editor to trigger infoview to open
         this.editor.focus();

package/dist/leanmonaco.d.ts

@@ -38,6 +38,7 @@ export declare class LeanMonaco {
     infoviewEl: HTMLElement | undefined;
     disposed: boolean;
     start(options: LeanMonacoOptions): Promise<void>;
+    /** Update options of the editor */
     updateVSCodeOptions(vsCodeOptions: {
         [id: string]: any;
     }): void;

package/dist/leanmonaco.js

@@ -96,7 +96,15 @@ export class LeanMonaco {
             getElanDefaultToolchain: () => { return "lean4/stable"; }
         }, { appendLine: () => { }
         }, setupMonacoClient(this.getWebSocketOptions(options)), checkLean4ProjectPreconditions);
-        this.taskGutter = new LeanTaskGutter(this.clientProvider, { asAbsolutePath: (path) => Uri.parse(`${new URL('vscode-lean4/vscode-lean4/' + path, import.meta.url)}`), });
+        const asAbsolutePath = (path) => {
+            switch (path) {
+                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 });
         const fontFile = new FontFace("JuliaMono", `url(${new URL("./JuliaMono-Regular.ttf", import.meta.url)})`);
         document.fonts.add(fontFile);
         this.iframeWebviewFactory = new IFrameInfoWebviewFactory(themeService, configurationService, fontFile);
@@ -104,28 +112,32 @@ export class LeanMonaco {
             this.iframeWebviewFactory.setInfoviewElement(this.infoviewEl);
         this.infoProvider = new InfoProvider(this.clientProvider, { language: 'lean4' }, {}, this.iframeWebviewFactory);
         await fontFile.load();
+        // Here we provide default options for the editor. They can be overwritten by the user.
         this.updateVSCodeOptions({
-            // "editor.tabSize": 6,
+            // Layout options, trying to maximise the usable space of the code editor
+            "editor.lineNumbers": "on",
+            "editor.stickyScroll.enabled": false,
+            "editor.folding": false,
             "editor.minimap.enabled": false,
-            "editor.folding": false, // reduces space to the right of line numbers.
-            "editor.lineNumbers": 'on',
-            // "editor.lineNumbersMinChars": 1, // TODO: I believe this has no effect
-            "editor.glyphMargin": true,
-            // "editor.lineDecorationsWidth": 0,
-            // "editor.lineDecorationsWidth": 5,
-            "editor.detectIndentation": false,
-            "editor.lightbulb.enabled": "on",
+            // features useful for Lean
+            "editor.glyphMargin": true, // Shows the yellow/red task gutter on the left.
             "editor.semanticHighlighting.enabled": true,
+            "editor.lightbulb.enabled": "on",
+            "editor.detectIndentation": false, // rather, indentation in Lean is always 2
+            "editor.acceptSuggestionOnEnter": "off", // since there are plenty suggestions
+            // other options
+            "editor.renderWhitespace": "trailing",
+            "editor.fontFamily": "JuliaMono",
             "editor.wordWrap": "on",
             "editor.wrappingStrategy": "advanced",
-            "editor.acceptSuggestionOnEnter": "off",
-            "editor.fontFamily": "JuliaMono",
+            "workbench.colorTheme": "Visual Studio Light",
             ...options.vscode
         });
         if (this.disposed)
             return;
         this.ready();
     }
+    /** Update options of the editor */
     updateVSCodeOptions(vsCodeOptions) {
         for (const key in vsCodeOptions) {
             workspace.getConfiguration().update(key, vsCodeOptions[key]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lean4monaco",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "Monaco Editor support for the Lean 4 theorem prover.",
   "keywords": [
     "lean",