diff --git a/core/config/handler.ts b/core/config/handler.ts index 2a6b040d2b..bf2bff629b 100644 --- a/core/config/handler.ts +++ b/core/config/handler.ts @@ -43,10 +43,11 @@ export class ConfigHandler { reloadConfig() { this.savedConfig = undefined; this.savedBrowserConfig = undefined; - this.loadConfig(); - for (const listener of this.updateListeners) { - listener(); - } + this.loadConfig().then(() => { + for (const listener of this.updateListeners) { + listener(); + } + }); } async getSerializedConfig(): Promise { diff --git a/extensions/vscode/src/extension/vscodeExtension.ts b/extensions/vscode/src/extension/vscodeExtension.ts index 6d30990ec5..b89b30e5a6 100644 --- a/extensions/vscode/src/extension/vscodeExtension.ts +++ b/extensions/vscode/src/extension/vscodeExtension.ts @@ -112,7 +112,6 @@ export class VsCodeExtension { setupRemoteConfigSync( this.configHandler.reloadConfig.bind(this.configHandler), ); - this.core = new Core(inProcessMessenger, this.ide); // Indexing + pause token this.diffManager.webviewProtocol = this.webviewProtocol;