Merge branch 'topic/vscode-devenv' into 'master'

Improve VS Code dev env

See merge request eng/ide/ada_language_server!2148

Author: eliericha

.vscode/launch.json

@@ -13,7 +13,10 @@
             "!**/node_modules/**"
          ],
          "args": [
-            "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada"
+            "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada",
+
+            // Disable other extensions for speed
+            "--disable-extensions"
 
             // It is useful to have workspace available for local debugging. The
             // following one is provided within the repository with test folders

.vscode/settings.json.tmpl

@@ -120,6 +120,10 @@
       "env": {
          "MOCHA_TIMEOUT": "0"
       },
+      "args": [
+         // Disable other extensions for speed
+         "--disable-extensions"
+      ],
       "preLaunchTask": "npm: watch - integration/vscode/ada"
    }
 }

integration/vscode/ada/.vscode-test.mjs

@@ -100,6 +100,8 @@ export default defineConfig(
                 // --user-data-dir <path> form sometimes gets <path> considered
                 // as another workspace root directory.
                 `--user-data-dir=${tmpdir}`,
+                // Disable other extensions for speed
+                '--disable-extensions',
             ],
             // Use external installation if provided in the VSCODE env variable
             useInstallation: process.env.VSCODE ? { fromPath: process.env.VSCODE } : undefined,

integration/vscode/ada/test/aggregate_projects/aggregate_projects.test.ts

@@ -6,9 +6,6 @@ import { createAdaTaskProvider } from '../../src/taskProviders';
 import { activate, getCommandLines, isCoreTask } from '../utils';
 
 suite('Aggregate Projects Support', function () {
-    // Set timeout to 15 seconds unless already configured to more
-    this.timeout(Math.max(this.timeout(), 15000));
-
     let projectPath: string;
 
     this.beforeAll(async () => {
@@ -22,6 +19,9 @@ suite('Aggregate Projects Support', function () {
      * build and run the mains of all aggregated projects.
      */
     test('Ada tasks for aggregate projects', async () => {
+        // Set timeout to 15 seconds unless already configured to more
+        this.timeout(Math.max(this.timeout(), 15000));
+
         const expectedCmdLines = `
 ada: Clean current project - gprclean -P ${projectPath}
 ada: Build current project - gprbuild -P ${projectPath} '-cargs:ada' -gnatef

integration/vscode/ada/test/general/extension.test.ts

@@ -5,7 +5,7 @@ import { activate, assertEqualToFileContent, showTextDocument } from '../utils';
 
 import { readFileSync, writeFileSync } from 'fs';
 import * as vscode from 'vscode';
-import { CMD_RESTART_LANG_SERVERS } from '@/src/constants';
+import { CMD_RESTART_LANG_SERVERS } from '../../src/constants';
 
 suite('Extensions Test Suite', function () {
     // Make sure the extension is activated

integration/vscode/ada/test/general/tasks.test.ts

@@ -27,16 +27,18 @@ import {
 import { runTaskAndGetResult } from '../../src/taskProviders';
 
 suite('Task Providers', function () {
-    // Set timeout to 15 seconds unless already configured to more
-    this.timeout(Math.max(this.timeout(), 15000));
-
     let projectPath: string;
 
     this.beforeAll(async () => {
         await activate();
         projectPath = await getProjectFile();
     });
 
+    this.beforeEach(function () {
+        // Set timeout to 15 seconds unless already configured to more
+        this.timeout(Math.max(this.timeout(), 15000));
+    });
+
     /**
      * Check that the list of offered Ada tasks is expected.
      */

integration/vscode/ada/test/status_bar/status_bar.test.ts

@@ -3,7 +3,7 @@ import { activate } from '../utils';
 
 import * as vscode from 'vscode';
 import { adaExtState } from '../../src/extension';
-import { CMD_RELOAD_PROJECT } from '@/src/constants';
+import { CMD_RELOAD_PROJECT } from '../../src/constants';
 import { readFileSync, writeFileSync } from 'fs';
 import { integer } from 'vscode-languageclient';
 

integration/vscode/ada/tsconfig.json

@@ -17,11 +17,7 @@
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
         "noUnusedParameters": true,
-        "resolveJsonModule": true,
-        "baseUrl": ".",
-        "paths": {
-            "@/*": ["./*"]
-        }
+        "resolveJsonModule": true
     },
     "exclude": ["node_modules", "out", "test/visualizer_test"],
     "include": ["test", "src", ".vscode-test.mjs", "webpack.config.js"]