Merge remote branch 'origin/master' into edge

Author: automatic-merge

Makefile

@@ -133,12 +133,8 @@ endif
 	@echo code --extensionDevelopmentPath=`pwd`/integration/vscode/ada/ `pwd`
 
 vscode-test:
-	# Run the VS Code grammar testsuite
-	cd integration/vscode/ada ; ./run_grammar_tests.sh
-
 	# Run the VS Code integration testsuite.
-	# This contains no useful test, so deactivated for now.
-	# cd integration/vscode/ada; npm run compile && node out/runTests.js
+	cd integration/vscode/ada; LD_LIBRARY_PATH= npm run test
 
 check: all
 	set -e; \

integration/vscode/ada/test/runTest.ts

@@ -1,6 +1,7 @@
 import * as path from 'path';
 
 import { runTests } from '@vscode/test-electron';
+import { TestOptions } from '@vscode/test-electron/out/runTest';
 
 async function main() {
     try {
@@ -13,13 +14,27 @@ async function main() {
         const extensionTestsPath = path.resolve(__dirname, '../test/suite');
         const testWorkspace = path.resolve(extensionDevelopmentPath, './test/TestWorkspace');
 
-        // Download VS Code, unzip it and run the integration test
-        await runTests({
-            version: 'stable',
+        const testOptions: TestOptions = {
             extensionDevelopmentPath,
             extensionTestsPath,
             launchArgs: [testWorkspace],
-        });
+        };
+
+        if (process.env.VSCODE) {
+            // If specified, use the VSCode executable provided externally. This
+            // can be use to test with an externally installed VS Code version
+            // such as in a CI environment for example.
+            //
+            // The expected value is the path to <install-dir>/code and not
+            // <install-dir>/bin/code.
+            testOptions.vscodeExecutablePath = process.env.VSCODE;
+        } else {
+            // Otherwise download the latest stable version and test using that.
+            testOptions.version = 'stable';
+        }
+
+        // Download VS Code, unzip it and run the integration test
+        await runTests(testOptions);
     } catch (err) {
         console.error(err);
         console.error('Failed to run tests');

integration/vscode/ada/test/suite/highlighting.test.ts

@@ -242,6 +242,7 @@ function testSyntaxHighlighting(absFilePath: string, syntax: Syntaxes) {
         }
 
         const cmd = [
+            'npx',
             'vscode-tmgrammar-snap',
             // We pass a non-existing language configuration, otherwise the tool
             // picks up the package.json file and always loads the grammar in

integration/vscode/ada/test/suite/index.ts

@@ -1,6 +1,6 @@
 import { Glob, GlobOptionsWithFileTypesUnset } from 'glob';
 import Mocha, { MochaOptions } from 'mocha';
-import path, { resolve } from 'path';
+import { resolve } from 'path';
 import { env } from 'process';
 
 export function run(): Promise<void> {
@@ -10,6 +10,9 @@ export function run(): Promise<void> {
     };
 
     if (process.env.MOCHA_REPORTER) {
+        // If a reporter was specified externally, use it. For example, the CI
+        // environment could set this to 'mocha-junit-reporter' to produce JUnit
+        // results.
         mochaOptions.reporter = process.env.MOCHA_REPORTER;
     }