Merge pull request #384 from CodinGame/vscode-1.88

Update to VSCode 1.88
CodinGame · Apr 9, 2024 · 11f634c · 11f634c · github-actions · Apr 9, 2024
2 parents 7b84fb7 + 16c7201
commit 11f634c
Show file tree

Hide file tree

Showing 57 changed files with 1,173 additions and 1,057 deletions.
diff --git a/demo/package-lock.json b/demo/package-lock.json
diff --git a/demo/package.json b/demo/package.json
@@ -17,14 +17,14 @@
   "devDependencies": {
     "@codingame/esbuild-import-meta-url-plugin": "^1.0.2",
     "@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/rollup-vsix-plugin",
-    "@types/dockerode": "^3.3.26",
+    "@types/dockerode": "^3.3.28",
     "@types/express": "^4.17.21",
     "@types/node": "^20.11.4",
     "@types/wicg-file-system-access": "^2023.10.5",
     "@types/ws": "^8.5.10",
     "ts-node": "^10.9.2",
-    "typescript": "~5.4.3",
-    "vite": "~5.2.6"
+    "typescript": "~5.4.4",
+    "vite": "~5.2.8"
   },
   "dependencies": {
     "@codingame/monaco-vscode-accessibility-service-override": "file:../dist/service-override-accessibility",

diff --git a/demo/src/features/testing.ts b/demo/src/features/testing.ts
@@ -266,20 +266,11 @@ void getApi().then(async api => {
         run.appendOutput(`Completed ${test.id}\r\n`)
       }
 
-      run.coverageProvider = {
-        provideFileCoverage () {
-          const coverage: vscode.FileCoverage[] = []
-          for (const [uri, statements] of coveredLines) {
-            coverage.push(
-              api.FileCoverage.fromDetails(
-                api.Uri.parse(uri),
-                statements.filter((s): s is vscode.StatementCoverage => s != null)
-              )
-            )
-          }
-
-          return coverage
-        }
+      for (const [uri, statements] of coveredLines) {
+        run.addCoverage(api.FileCoverage.fromDetails(
+          api.Uri.parse(uri),
+          statements.filter((s): s is vscode.StatementCoverage => s != null)
+        ))
       }
 
       run.end()

diff --git a/docs/vscode_monaco_upgrade.md b/docs/vscode_monaco_upgrade.md
@@ -22,7 +22,7 @@
 - Wait for the new vscode version to be downloaded and built
 - Run `npm run update-vscode-dependencies` to update the vscode dependencies we use to the same versions as VSCode
 - Run `npm install` (might need to update/add the npm override for `xterm` in the `package.json` to fix the invalid peer deps)
-- Fix errors, adapt code, build, include the `vscode.patch` into this commit
+- Fix errors, adapt code, build, include the `vscode-patches` directory into this commit
   - Do not hesitate to run the eslint autofix, it gets rid of the majority of your errors
   - Implement missing services. This is easily observable seem when running the demo (see next point)
 - Update demo