Changes to support updating vscode-languageclient from 7.0.0 to 9.0.1

Author: rowan-walshe

integration/vscode/ada/package-lock.json

@@ -6,7 +6,7 @@
     "publisher": "AdaCore",
     "license": "GPL-3.0",
     "engines": {
-        "vscode": "^1.71.2"
+        "vscode": "^1.83.1"
     },
     "categories": [
         "Programming Languages",
@@ -16,8 +16,6 @@
         "ms-vscode.cpptools"
     ],
     "activationEvents": [
-        "onLanguage:ada",
-        "onLanguage:gpr",
         "workspaceContains:*.gpr",
         "workspaceContains:*/*.gpr",
         "workspaceContains:*.ad[bs]",
@@ -856,7 +854,7 @@
     "devDependencies": {
         "@types/mocha": "10.0.1",
         "@types/node": "16.18.16",
-        "@types/vscode": "1.71.0",
+        "@types/vscode": "1.83.3",
         "@types/ws": "8.5.4",
         "@typescript-eslint/eslint-plugin": "5.54.0",
         "@typescript-eslint/parser": "5.55.0",
@@ -891,8 +889,8 @@
         "fast-xml-parser": "4.2.5",
         "fp-ts": "2.12.0",
         "process": "0.11.10",
-        "vscode-languageclient": "7.0.0",
+        "vscode-languageclient": "9.0.1",
         "winston": "3.10.0",
         "ws": "8.13.0"
     }
-}
+}

integration/vscode/ada/package.json

@@ -20,7 +20,6 @@ export class ExtensionState {
     public readonly gprClient: LanguageClient;
     public readonly context: vscode.ExtensionContext;
 
-    private clientsDisposables: Disposable[];
     private registeredTaskProviders: Disposable[];
 
     constructor(context: vscode.ExtensionContext) {
@@ -39,20 +38,16 @@ export class ExtensionState {
             [],
             '**/.{adb,ads,adc,ada}'
         );
-        this.clientsDisposables = [];
         this.registeredTaskProviders = [];
     }
 
-    public start = () => {
-        this.clientsDisposables = [this.gprClient.start(), this.adaClient.start()];
+    public start = async () => {
+        await Promise.all([this.gprClient.start(), this.adaClient.start()]);
         this.registerTaskProviders();
     };
 
     public dispose = () => {
         this.unregisterTaskProviders();
-        this.clientsDisposables.forEach((clientDisposable: Disposable) =>
-            clientDisposable.dispose()
-        );
     };
 
     public registerTaskProviders = (): void => {

integration/vscode/ada/src/ExtensionState.ts

@@ -22,6 +22,7 @@
 import {
     ClientCapabilities,
     DocumentSelector,
+    FeatureState,
     InitializeParams,
     ServerCapabilities,
     StaticFeature,
@@ -77,10 +78,26 @@ export class ALSClientFeatures implements StaticFeature {
         // eslint-disable-next-line @typescript-eslint/no-empty-function
     }
 
+    /**
+     * Returns the state the feature is in.
+     */
+    getState(): FeatureState {
+        return { kind: 'static' };
+    }
+
     /**
      * Unused since there are no necessary actions when disposing an object of this class
      */
     dispose(): void {
         // eslint-disable-next-line @typescript-eslint/no-empty-function
     }
+
+    /**
+     * Called when the client is stopped or re-started to clear this feature.
+     * Usually a feature un-registers listeners registered hooked up with the
+     * VS Code extension host.
+     */
+    clear(): void {
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+    }
 }

integration/vscode/ada/src/alsClientFeatures.ts

@@ -148,7 +148,7 @@ async function activateExtension(context: vscode.ExtensionContext) {
     adaExtState.adaClient.clientOptions.middleware = alsMiddleware;
     adaExtState.adaClient.registerFeature(new ALSClientFeatures());
 
-    adaExtState.start();
+    await adaExtState.start();
 
     context.subscriptions.push(
         vscode.workspace.onDidChangeConfiguration(adaExtState.configChanged)
@@ -160,8 +160,6 @@ async function activateExtension(context: vscode.ExtensionContext) {
      */
     registerCommands(context, adaExtState);
 
-    await Promise.all([adaExtState.adaClient.onReady(), adaExtState.gprClient.onReady()]);
-
     await vscode.commands.executeCommand('setContext', ADA_CONTEXT, true);
 
     await initializeTestView(context, adaExtState);

integration/vscode/ada/src/extension.ts

@@ -63,7 +63,6 @@ export async function initializeTestView(
         );
         context.subscriptions.push(controller);
 
-        await clients.adaClient.onReady();
         // Getting Paths Information from the server
         const projectFile = await getProjectFile(clients.adaClient);
         const objectDir: string = await getObjectDir(clients.adaClient);

integration/vscode/ada/src/gnattest.ts

@@ -863,7 +863,7 @@ class BuildAndRunExecution extends vscode.CustomExecution {
                             },
                             () => {
                                 writeEmitter.fire('Failed to get list of tasks\r\n');
-                                closeEmitter.fire(1);
+                                return 1;
                             }
                         )
                         .then(

integration/vscode/ada/src/taskProviders.ts

@@ -13,7 +13,6 @@ suite('Extensions Test Suite', function () {
     });
     test('Project File Response', async () => {
         if (vscode.workspace.workspaceFolders !== undefined) {
-            await adaExtState.adaClient.onReady();
             const result: string = await getProjectFile(adaExtState.adaClient);
             const name = result.replace(/^.*[\\/]/, '');
             assert.strictEqual(name, 'default.gpr');
@@ -23,7 +22,6 @@ suite('Extensions Test Suite', function () {
     });
     test('Object Directory Response', async () => {
         if (vscode.workspace.workspaceFolders !== undefined) {
-            await adaExtState.adaClient.onReady();
             const result: string = await getObjectDir(adaExtState.adaClient);
             const name = result?.replace(/^.*[\\/]/, '');
             assert.strictEqual(name, 'obj');
@@ -33,7 +31,6 @@ suite('Extensions Test Suite', function () {
     });
     test('Test Add Subprogram Box', async () => {
         if (vscode.workspace.workspaceFolders !== undefined) {
-            await adaExtState.adaClient.onReady();
             const cursorPositions: vscode.Position[] = [
                 new vscode.Position(9, 1),
                 new vscode.Position(4, 1),

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

@@ -15,7 +15,6 @@ suite('Syntax Check Test Suite', function () {
             false_statement: string,
             true_statement: string
         ) {
-            await adaExtState.adaClient.onReady();
             const syntaxProvider = new AdaSyntaxCheckProvider(adaExtState.adaClient, [rule]);
             let result = await syntaxProvider.sendCheckSyntaxRequest(true_statement);
             assert.deepStrictEqual(result, undefined);

integration/vscode/ada/test/suite/general/syntax.test.ts

@@ -54,7 +54,6 @@ ada: Build and run main - src/test.adb - kind: buildAndRunMain`.trim();
      * Check that the list of offered SPARK tasks is expected.
      */
     test('Spark tasks list', async () => {
-        await adaExtState.adaClient.onReady();
         const prov = createSparkTaskProvider();
         const tasks = await prov.provideTasks();
         assert.notStrictEqual(tasks, undefined);