Fire preferences change event on init

eclipse-theia · Mar 28, 2023 · b5f4f15 · b5f4f15
1 parent 027037b
commit b5f4f15
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/plugin-ext/src/hosted/node/plugin-host-proxy.ts b/packages/plugin-ext/src/hosted/node/plugin-host-proxy.ts
@@ -43,15 +43,16 @@ interface PatchedModules {
 }
 
 function createPatchedModules(configProvider: PreferenceRegistryExtImpl, resolveProxy: ReturnType<typeof createProxyResolver>): PatchedModules {
+    const defaultConfig = 'override' as ProxySupportSetting;
     const proxySetting = {
-        config: configProvider.getConfiguration('http')?.get<ProxySupportSetting>('proxySupport') || 'off' as ProxySupportSetting
+        config: defaultConfig
     };
     const certSetting = {
         config: false
     };
     configProvider.onDidChangeConfiguration(() => {
         const httpConfig = configProvider.getConfiguration('http');
-        proxySetting.config = httpConfig?.get<ProxySupportSetting>('proxySupport') || 'off';
+        proxySetting.config = httpConfig?.get<ProxySupportSetting>('proxySupport') || defaultConfig;
         certSetting.config = !!httpConfig?.get<boolean>('systemCertificates');
     });
 

diff --git a/packages/plugin-ext/src/plugin/preference-registry.ts b/packages/plugin-ext/src/plugin/preference-registry.ts
@@ -93,12 +93,16 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
     }
 
     init(data: PreferenceData): void {
-        this._preferences = this.parse(data);
+        this.preferencesChanged(data);
     }
 
     $acceptConfigurationChanged(data: PreferenceData, eventData: PreferenceChangeExt[]): void {
-        this.init(data);
-        this._onDidChangeConfiguration.fire(this.toConfigurationChangeEvent(eventData));
+        this.preferencesChanged(data, eventData);
+    }
+
+    private preferencesChanged(data: PreferenceData, eventData?: PreferenceChangeExt[]): void {
+        this._preferences = this.parse(data);
+        this._onDidChangeConfiguration.fire(this.toConfigurationChangeEvent(eventData ?? []));
     }
 
     getConfiguration(rawSection?: string, rawScope?: theia.ConfigurationScope | null, extensionId?: string): theia.WorkspaceConfiguration {