Merge pull request #1586 from github/koesie10/upgrade-vscode-test

Upgrade from vscode-test to @vscode/test-electron

Author: koesie10

extensions/ql-vscode/package-lock.json

@@ -1297,6 +1297,7 @@
     "@types/xml2js": "~0.4.4",
     "@typescript-eslint/eslint-plugin": "^4.26.0",
     "@typescript-eslint/parser": "^4.26.0",
+    "@vscode/test-electron": "^2.1.5",
     "ansi-colors": "^4.1.1",
     "applicationinsights": "^2.3.5",
     "babel-loader": "^8.2.5",
@@ -1335,7 +1336,6 @@
     "typescript": "^4.5.5",
     "typescript-formatter": "^7.2.2",
     "vsce": "^2.7.0",
-    "vscode-test": "^1.4.0",
     "webpack": "^5.62.2",
     "webpack-cli": "^4.6.0"
   },

extensions/ql-vscode/package.json

@@ -1,5 +1,4 @@
 import 'source-map-support/register';
-import 'vscode-test';
 import { runTestsInDirectory } from '../index-template';
 import 'mocha';
 import * as sinonChai from 'sinon-chai';

extensions/ql-vscode/src/vscode-tests/cli-integration/index.ts

@@ -1,5 +1,4 @@
 import 'source-map-support/register';
-import 'vscode-test';
 import * as sinonChai from 'sinon-chai';
 import * as chai from 'chai';
 import 'chai/register-should';

extensions/ql-vscode/src/vscode-tests/minimal-workspace/index.ts

@@ -1,5 +1,4 @@
 import 'source-map-support/register';
-import 'vscode-test';
 import * as sinonChai from 'sinon-chai';
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';

extensions/ql-vscode/src/vscode-tests/no-workspace/index.ts

@@ -4,14 +4,14 @@ import * as cp from 'child_process';
 import {
   runTests,
   downloadAndUnzipVSCode,
-  resolveCliPathFromVSCodeExecutablePath
-} from 'vscode-test';
+  resolveCliArgsFromVSCodeExecutablePath
+} from '@vscode/test-electron';
 import { assertNever } from '../pure/helpers-pure';
 import * as tmp from 'tmp-promise';
 
 // For some reason, the following are not exported directly from `vscode-test`,
 // but we can be tricky and import directly from the out file.
-import { TestOptions } from 'vscode-test/out/runTest';
+import { TestOptions } from '@vscode/test-electron/out/runTest';
 
 
 // For CI purposes we want to leave this at 'stable' to catch any bugs
@@ -78,10 +78,11 @@ async function main() {
     const extensionTestsEnv: Record<string, string> = {};
     if (dirs.includes(TestDir.CliIntegration)) {
       console.log('Installing required extensions');
-      const cliPath = resolveCliPathFromVSCodeExecutablePath(vscodeExecutablePath);
+      const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
       cp.spawnSync(
-        cliPath,
+        cli,
         [
+          ...args,
           '--install-extension',
           'hbenl.vscode-test-explorer',
           '--install-extension',