lean4monaco 1.1.2 → 1.1.3

package/dist/useragent.d.ts

@@ -0,0 +1 @@
+export declare function setUserAgent(window: any, userAgent: any): void;

package/dist/useragent.js

@@ -0,0 +1,31 @@
+export function setUserAgent(window, userAgent) {
+    // Works on Firefox, Chrome, Opera and IE9+
+    if (navigator.__defineGetter__) {
+        navigator.__defineGetter__('userAgent', function () {
+            return userAgent;
+        });
+    }
+    else if (Object.defineProperty) {
+        Object.defineProperty(navigator, 'userAgent', {
+            get: function () {
+                return userAgent;
+            }
+        });
+    }
+    // Works on Safari
+    if (window.navigator.userAgent !== userAgent) {
+        var userAgentProp = {
+            get: function () {
+                return userAgent;
+            }
+        };
+        try {
+            Object.defineProperty(window.navigator, 'userAgent', userAgentProp);
+        }
+        catch (e) {
+            window.navigator = Object.create(navigator, {
+                userAgent: userAgentProp
+            });
+        }
+    }
+}

package/dist/vscode-lean4/vscode-lean4/src/leanclient.js

@@ -313,7 +313,9 @@ export class LeanClient {
             return true;
         }
         if (this.folderUri.scheme === 'file' && uri.scheme === 'file') {
-            return uri.isInFolder(this.folderUri);
+            // lean4monaco: To avoid file system issues, we let any client manage any file:
+            return true;
+            // return uri.isInFolder(this.folderUri)
         }
         return false;
     }

package/dist/vscode-lean4/vscode-lean4/src/utils/clientProvider.js

@@ -168,8 +168,6 @@ export class LeanClientProvider {
                 bestCandidate = candidate;
             }
         }
-        // lean4monaco: Due to issues with Windows file paths, we assume for now that there is only one client.
-        return this.getClients()[0];
         return bestCandidate;
     }
     getClients() {

package/dist/vscode-lean4/vscode-lean4/src/utils/projectInfo.js

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import path from 'path';
-import { FileUri, isWorkspaceFolder, UntitledUri } from './exturi';
+import { FileUri, UntitledUri } from './exturi';
 import { dirExists, fileExists } from './fsHelper';
 // Detect lean4 root directory (works for both lean4 repo and nightly distribution)
 export async function isCoreLean4Directory(path) {
@@ -26,57 +26,58 @@ export async function findLeanProjectRootInfo(uri) {
     if (uri.scheme === 'untitled') {
         return { kind: 'Success', projectRootUri: new UntitledUri(), toolchainUri: undefined };
     }
-    let path = uri;
+    // lean4monaco: Prevent filesystem access:
+    return { kind: 'Success', projectRootUri: uri.join('..'), toolchainUri: undefined };
+    /*
+    let path = uri
     try {
         if ((await fs.promises.stat(path.fsPath)).isFile()) {
-            path = uri.join('..');
+            path = uri.join('..')
         }
+    } catch (e) {
+        return { kind: 'FileNotFound' }
     }
-    catch (e) {
-        return { kind: 'FileNotFound' };
-    }
-    let bestFolder = path;
-    let bestLeanToolchain;
+
+    let bestFolder = path
+    let bestLeanToolchain: FileUri | undefined
     while (true) {
-        const leanToolchain = path.join('lean-toolchain');
-        const lakefileLean = path.join('lakefile.lean');
-        const lakefileToml = path.join('lakefile.toml');
+        const leanToolchain = path.join('lean-toolchain')
+        const lakefileLean = path.join('lakefile.lean')
+        const lakefileToml = path.join('lakefile.toml')
         if (await fileExists(leanToolchain.fsPath)) {
-            bestFolder = path;
-            bestLeanToolchain = leanToolchain;
-        }
-        else if (await isCoreLean4Directory(path)) {
-            bestFolder = path;
-            bestLeanToolchain = undefined;
+            bestFolder = path
+            bestLeanToolchain = leanToolchain
+        } else if (await isCoreLean4Directory(path)) {
+            bestFolder = path
+            bestLeanToolchain = undefined
             // Stop searching in case users accidentally created a lean-toolchain file above the core directory
-            break;
-        }
-        else if (await fileExists(lakefileLean.fsPath)) {
-            return { kind: 'LakefileWithoutToolchain', projectRootUri: path, lakefileUri: lakefileLean };
-        }
-        else if (await fileExists(lakefileToml.fsPath)) {
-            return { kind: 'LakefileWithoutToolchain', projectRootUri: path, lakefileUri: lakefileToml };
+            break
+        } else if (await fileExists(lakefileLean.fsPath)) {
+            return { kind: 'LakefileWithoutToolchain', projectRootUri: path, lakefileUri: lakefileLean }
+        } else if (await fileExists(lakefileToml.fsPath)) {
+            return { kind: 'LakefileWithoutToolchain', projectRootUri: path, lakefileUri: lakefileToml }
         }
         if (isWorkspaceFolder(path)) {
             if (bestLeanToolchain === undefined) {
                 // If we haven't found a toolchain yet, prefer the workspace folder as the project scope for the file,
                 // but keep looking in case there is a lean-toolchain above the workspace folder
                 // (New users sometimes accidentally open sub-folders of projects)
-                bestFolder = path;
-            }
-            else {
+                bestFolder = path
+            } else {
                 // Stop looking above the barrier if we have a toolchain. This is necessary for the nested lean-toolchain setup of core.
-                break;
+                break
             }
         }
-        const parent = path.join('..');
+        const parent = path.join('..')
         if (parent.equals(path)) {
             // no project file found.
-            break;
+            break
         }
-        path = parent;
+        path = parent
     }
-    return { kind: 'Success', projectRootUri: bestFolder, toolchainUri: bestLeanToolchain };
+
+    return { kind: 'Success', projectRootUri: bestFolder, toolchainUri: bestLeanToolchain }
+    */
 }
 export async function findLeanProjectInfo(uri) {
     const info = await findLeanProjectRootInfo(uri);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lean4monaco",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Monaco Editor support for the Lean 4 theorem prover.",
   "keywords": [
     "lean",
@@ -39,7 +39,10 @@
     "watch:copyfiles": "nodemon --watch ./src --exec \"npm run build:copyfiles\"",
     "build:copyfiles": "cd src && copyfiles \"**/*.json\" \"**/*.css\" \"**/*.ttf\" \"**/*.otf\" \"**/*.svg\" ../dist/",
     "build": "tsc && webpack && npm run build:copyfiles",
-    "test": "npm run demo:setup && concurrently --hide 0 --kill-others \"npm start\" \"wait-on http://localhost:5173 && cypress run\" -n server,cypress -s command-cypress"
+    "test:bare": "wait-on http://localhost:5173 && cypress run",
+    "test": "npm run demo:setup && concurrently --hide 0 --kill-others \"npm start\" \"npm run test:bare\" -n server,cypress -s command-cypress",
+    "test:windows:bare": "wait-on http://localhost:5173 && CYPRESS_USER_AGENT_OS=\"Windows NT 10.0; Win64; x64\" cypress run --browser chromium",
+    "test:windows": "npm run demo:setup && concurrently --hide 0 --kill-others \"npm start\" \"npm run test:windows:bare\" -n server,cypress -s command-cypress"
   },
   "dependencies": {
     "@leanprover/infoview": "~0.8.5",