fix reconnection of native language servers

packages/cpp/src/browser/cpp-language-client-contribution.ts

@@ -82,11 +82,7 @@ export class CppLanguageClientContribution extends BaseLanguageClientContributio
     @postConstruct()
     protected init(): void {
         this.cppBuildConfigurations.onActiveConfigChange2(() => this.onActiveBuildConfigChanged());
-        this.cppPreferences.onPreferenceChanged(e => {
-            if (this.running) {
-                this.restart();
-            }
-        });
+        this.cppPreferences.onPreferenceChanged(() => this.restart());
     }
 
     protected onReady(languageClient: ILanguageClient): void {
@@ -147,9 +143,7 @@ export class CppLanguageClientContribution extends BaseLanguageClientContributio
     }
 
     protected onActiveBuildConfigChanged(): void {
-        if (this.running) {
-            this.restart();
-        }
+        this.restart();
     }
 
     protected get documentSelector(): string[] {

packages/json/src/browser/json-client-contribution.ts

@@ -24,7 +24,7 @@ import {
     DocumentSelector
 } from '@theia/languages/lib/browser';
 import { JSON_LANGUAGE_ID, JSON_LANGUAGE_NAME, JSONC_LANGUAGE_ID } from '../common';
-import { ResourceProvider } from '@theia/core';
+import { ResourceProvider, DisposableCollection } from '@theia/core';
 import URI from '@theia/core/lib/common/uri';
 import { JsonPreferences } from './json-preferences';
 import { JsonSchemaStore } from '@theia/core/lib/browser/json-schema-store';
@@ -46,18 +46,9 @@ export class JsonClientContribution extends BaseLanguageClientContribution {
     ) {
         super(workspace, languages, languageClientFactory);
         this.initializeJsonSchemaAssociations();
-        preferences.onPreferenceChanged(e => {
-            if (e.preferenceName === 'json.schemas') {
-                this.updateSchemas();
-            }
-        });
-        jsonSchemaStore.onSchemasChanged(() => {
-            this.updateSchemas();
-        });
-        this.updateSchemas();
     }
 
-    protected async updateSchemas(): Promise<void> {
+    protected updateSchemas(client: ILanguageClient): void {
         const allConfigs = [...this.jsonSchemaStore.getJsonSchemaConfigurations()];
         const config = this.preferences['json.schemas'];
         if (config instanceof Array) {
@@ -74,8 +65,6 @@ export class JsonClientContribution extends BaseLanguageClientContribution {
                 }
             }
         }
-        const client = await this.languageClient;
-        await client.onReady();
         client.sendNotification('json/schemaAssociations', registry);
     }
 
@@ -94,16 +83,22 @@ export class JsonClientContribution extends BaseLanguageClientContribution {
         return [this.id];
     }
 
-    protected onReady(languageClient: ILanguageClient): void {
+    protected onReady(languageClient: ILanguageClient, toStop: DisposableCollection): void {
+        super.onReady(languageClient, toStop);
         // handle content request
         languageClient.onRequest('vscode/content', async (uriPath: string) => {
             const uri = new URI(uriPath);
             const resource = await this.resourceProvider(uri);
             const text = await resource.readContents();
             return text;
         });
-        super.onReady(languageClient);
-        setTimeout(() => this.initializeJsonSchemaAssociations());
+        toStop.push(this.preferences.onPreferenceChanged(e => {
+            if (e.preferenceName === 'json.schemas') {
+                this.updateSchemas(languageClient);
+            }
+        }));
+        toStop.push(this.jsonSchemaStore.onSchemasChanged(() => this.updateSchemas(languageClient)));
+        this.updateSchemas(languageClient);
     }
 
     protected async initializeJsonSchemaAssociations(): Promise<void> {

packages/languages/src/browser/language-client-contribution.ts

@@ -159,15 +159,16 @@ export abstract class BaseLanguageClientContribution implements LanguageClientCo
                             } catch { /* no-op */ }
                         }
                     })()));
-                    toStop.push(messageConnection.onClose(() => this.restart()));
-                    this.onWillStart(this._languageClient!);
+                    toStop.push(messageConnection.onClose(() => this.forceRestart()));
                     this._languageClient!.start();
+                    // it should be called after `start` that `onReady` promise gets reinitialized
+                    this.onWillStart(this._languageClient!, toStop);
                 }
             }, { reconnecting: false });
         } catch (e) {
             console.error(e);
             if (!toStop.disposed) {
-                this.restart();
+                this.forceRestart();
             }
         }
     }
@@ -181,15 +182,19 @@ export abstract class BaseLanguageClientContribution implements LanguageClientCo
         if (!this.running) {
             return;
         }
+        this.forceRestart();
+    }
+
+    protected forceRestart(): void {
         this.deactivate();
         this.activate();
     }
 
-    protected onWillStart(languageClient: ILanguageClient): void {
-        languageClient.onReady().then(() => this.onReady(languageClient));
+    protected onWillStart(languageClient: ILanguageClient, toStop?: DisposableCollection): void {
+        languageClient.onReady().then(() => this.onReady(languageClient, toStop));
     }
 
-    protected onReady(languageClient: ILanguageClient): void {
+    protected onReady(languageClient: ILanguageClient, toStop?: DisposableCollection): void {
         this._languageClient = languageClient;
         this.resolveReady(this._languageClient);
         this.waitForReady();