Merge branch 'main' into coq-8.19

coq · Jan 31, 2024 · 97d0fc5 · 97d0fc5
2 parents c8f063f + 11a8f4c
commit 97d0fc5
Show file tree

Hide file tree

Showing 13 changed files with 760 additions and 843 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -93,6 +93,7 @@ jobs:
       run: cat /tmp/vscoq_init_log.*
 
   install-windows:
+    if: false
     runs-on: windows-latest
     steps:
     - name: Set git to use LF

diff --git a/client/goal-view-ui/package.json b/client/goal-view-ui/package.json
@@ -21,6 +21,6 @@
     "@types/vscode-webview": "^1.57.0",
     "@vitejs/plugin-react": "^1.0.7",
     "typescript": "^4.4.4",
-    "vite": "^2.9.16"
+    "vite": "^2.9.17"
   }
 }
diff --git a/client/goal-view-ui/src/components/atoms/PpString.module.css b/client/goal-view-ui/src/components/atoms/PpString.module.css
@@ -2,6 +2,7 @@
     margin-top: 12px;
     width: 100%;
     font-family: var(--vscode-editor-font-family);
+    font-size: var(--vscode-editor-font-size);
 }
 
 .Error {
@@ -22,6 +23,7 @@
 
 .Goal {
     font-family: var(--vscode-editor-font-family);
+    font-size: var(--vscode-editor-font-size);
     color: var(--vscode-editor-foreground);
     white-space: pre-wrap;
     width: 100%;

diff --git a/client/goal-view-ui/yarn.lock b/client/goal-view-ui/yarn.lock
@@ -898,10 +898,10 @@ update-browserslist-db@^1.0.9:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-vite@^2.9.16:
-  version "2.9.16"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.16.tgz#daf7ba50f5cc37a7bf51b118ba06bc36e97898e9"
-  integrity sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA==
+vite@^2.9.17:
+  version "2.9.17"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.17.tgz#6b770525e12fa2a2e3a0fa0d028d304f4f7dc7d4"
+  integrity sha512-XxcRzra6d7xrKXH66jZUgb+srThoPu+TLJc06GifUyKq9JmjHkc1Numc8ra0h56rju2jfVWw3B3fs5l3OFMvUw==
   dependencies:
     esbuild "^0.14.27"
     postcss "^8.4.13"

diff --git a/client/package.json b/client/package.json
@@ -325,7 +325,7 @@
       }
     ],
     "menus": {
-       "editor/context": [
+      "editor/context": [
         {
           "when": "resourceLangId == coq",
           "command": "extension.coq.interpretToPoint",
@@ -351,7 +351,7 @@
           "command": "extension.coq.query.locate",
           "group": "queries"
         }
-      ], 
+      ],
       "view/title": [
         {
           "command": "extension.coq.addQueryTab",

diff --git a/client/search-ui/package.json b/client/search-ui/package.json
@@ -22,6 +22,6 @@
     "@types/vscode-webview": "^1.57.0",
     "@vitejs/plugin-react": "^1.0.7",
     "typescript": "^4.4.4",
-    "vite": "^2.9.16"
+    "vite": "^2.9.17"
   }
 }
diff --git a/client/search-ui/yarn.lock b/client/search-ui/yarn.lock
@@ -916,10 +916,10 @@ uuidv4@^6.2.13:
     "@types/uuid" "8.3.4"
     uuid "8.3.2"
 
-vite@^2.9.16:
-  version "2.9.16"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.16.tgz#daf7ba50f5cc37a7bf51b118ba06bc36e97898e9"
-  integrity sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA==
+vite@^2.9.17:
+  version "2.9.17"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.17.tgz#6b770525e12fa2a2e3a0fa0d028d304f4f7dc7d4"
+  integrity sha512-XxcRzra6d7xrKXH66jZUgb+srThoPu+TLJc06GifUyKq9JmjHkc1Numc8ra0h56rju2jfVWw3B3fs5l3OFMvUw==
   dependencies:
     esbuild "^0.14.27"
     postcss "^8.4.13"

diff --git a/client/src/test/runTest.ts b/client/src/test/runTest.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 import * as fs from 'node:fs/promises';
 import * as tmp from 'tmp-promise';
 
-import { runTests } from '@vscode/test-electron';
+import { runTests, downloadAndUnzipVSCode } from '@vscode/test-electron';
 
 async function main() {
 	try {
@@ -37,7 +37,12 @@ async function main() {
 		const launchArgs = [path.resolve(__dirname, '../../testFixture'), "--disable-extensions", "--user-data-dir=" + userDataDir];
 
 		// Download VS Code, unzip it and run the integration test
-		await runTests({ extensionDevelopmentPath, extensionTestsPath, launchArgs });
+        //const vscodeExecutablePath = await downloadAndUnzipVSCode('1.84.0');
+		await runTests({ 
+            // vscodeExecutablePath, 
+            extensionDevelopmentPath, 
+            extensionTestsPath, 
+            launchArgs });
 	} catch (err) {
 		console.error('Failed to run tests');
 		process.exit(1);

diff --git a/client/src/utilities/toolchain.ts b/client/src/utilities/toolchain.ts
@@ -63,7 +63,11 @@ export default class VsCoqToolchainManager implements Disposable {
         const config = workspace.getConfiguration('vscoq');
         const serverOptions : ServerOptions = {
             command: this._vscoqtopPath, 
-            args: config.args
+            args: config.args,
+            options: {
+                cwd: workspace.rootPath,
+                shell: true,
+            },
         };
         return serverOptions;
     };
@@ -125,7 +129,7 @@ export default class VsCoqToolchainManager implements Disposable {
         const cmd = [this._vscoqtopPath].concat(options).join(' ');
 
         return new Promise((resolve, reject: ((reason: ToolchainError) => void)) => {
-            exec(cmd, (error, stdout, stderr) => {
+            exec(cmd, {cwd: workspace.rootPath}, (error, stdout, stderr) => {
 
                 if(error) {
                     reject({
@@ -160,7 +164,7 @@ export default class VsCoqToolchainManager implements Disposable {
         const cmd = [this._vscoqtopPath].concat(options).join(' ');
 
         return new Promise((resolve, reject: (reason: string) => void) => {
-            exec(cmd, (error, stdout, stderr) => {
+            exec(cmd, {cwd: workspace.rootPath}, (error, stdout, stderr) => {
                 if(error) {
                     reject(stderr);
                 } else {