From 6044ff365f2533aeb1f93715c8f0dd185894185f Mon Sep 17 00:00:00 2001
From: Alberto Iannaccone <a.iannaccone@arduino.cc>
Date: Thu, 11 Aug 2022 17:52:47 +0200
Subject: [PATCH] apply suggestions

---
 .../i18n/localization-backend-contribution.ts |  2 +-
 .../main/node/plugin-ext-backend-module.ts    |  2 +-
 ...lugin-localization-backend-contribution.ts | 23 +++++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/core/src/node/i18n/localization-backend-contribution.ts b/packages/core/src/node/i18n/localization-backend-contribution.ts
index d0eedd82fe604..68c0357a50e2c 100644
--- a/packages/core/src/node/i18n/localization-backend-contribution.ts
+++ b/packages/core/src/node/i18n/localization-backend-contribution.ts
@@ -16,7 +16,7 @@
 
 import * as express from 'express';
 import { inject, injectable } from 'inversify';
-import { Deferred } from 'src/common/promise-util';
+import { Deferred } from '../../common/promise-util';
 import { BackendApplicationContribution } from '../backend-application';
 import { LocalizationRegistry } from './localization-contribution';
 import { LocalizationProvider } from './localization-provider';
diff --git a/packages/plugin-ext/src/main/node/plugin-ext-backend-module.ts b/packages/plugin-ext/src/main/node/plugin-ext-backend-module.ts
index 1ad87e21cd2bf..57d6e6ffef50f 100644
--- a/packages/plugin-ext/src/main/node/plugin-ext-backend-module.ts
+++ b/packages/plugin-ext/src/main/node/plugin-ext-backend-module.ts
@@ -40,7 +40,7 @@ import { PluginTheiaEnvironment } from '../common/plugin-theia-environment';
 import { PluginTheiaDeployerParticipant } from './plugin-theia-deployer-participant';
 import { WebviewBackendSecurityWarnings } from './webview-backend-security-warnings';
 import { PluginUninstallationManager } from './plugin-uninstallation-manager';
-import { LocalizationBackendContribution } from '@theia/core/src/node/i18n/localization-backend-contribution';
+import { LocalizationBackendContribution } from '@theia/core/lib/node/i18n/localization-backend-contribution';
 import { PluginLocalizationBackendContribution } from './plugin-localization-backend-contribution';
 
 export function bindMainBackend(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void {
diff --git a/packages/plugin-ext/src/main/node/plugin-localization-backend-contribution.ts b/packages/plugin-ext/src/main/node/plugin-localization-backend-contribution.ts
index e9562965ad34e..ccc7ebfc69565 100644
--- a/packages/plugin-ext/src/main/node/plugin-localization-backend-contribution.ts
+++ b/packages/plugin-ext/src/main/node/plugin-localization-backend-contribution.ts
@@ -1,21 +1,26 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { LocalizationBackendContribution } from '@theia/core/lib/node/i18n/localization-backend-contribution';
-import { PluginDeployer } from '../../common/plugin-protocol';
-import { PluginDeployerImpl } from './plugin-deployer-impl';
-import { Deferred } from '@theia/core/src/common/promise-util';
+import { inject, injectable } from "@theia/core/shared/inversify";
+import { LocalizationBackendContribution } from "@theia/core/lib/node/i18n/localization-backend-contribution";
+import { PluginDeployer } from "../../common/plugin-protocol";
+import { PluginDeployerImpl } from "./plugin-deployer-impl";
+import { Deferred } from "@theia/core/lib/common/promise-util";
 
 @injectable()
 export class PluginLocalizationBackendContribution extends LocalizationBackendContribution {
     @inject(PluginDeployer)
     protected readonly pluginDeployer: PluginDeployerImpl;
+    protected readonly pluginsDeployed = new Deferred();
 
     override async initialize(): Promise<void> {
-        const pluginsDeployed = new Deferred();
         this.pluginDeployer.onDidDeploy(() => {
-            pluginsDeployed.resolve();
+            this.pluginsDeployed.resolve();
         });
+        await super.initialize();
+    }
 
-        await Promise.all([this.localizationRegistry.initialize(), pluginsDeployed.promise]);
-        this.initialized.resolve();
+    override async waitForInitialization(): Promise<void> {
+        await Promise.all([
+            super.waitForInitialization(),
+            this.pluginsDeployed.promise,
+        ]);
     }
 }