Skip to content

Commit 0e0be46

Browse files
authored
recovery fix (microsoft#237505)
recovery fix (microsoft#237474) * recovery fix for microsoft#236429 * fix tests * fix tests
1 parent a51da83 commit 0e0be46

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

src/vs/platform/configuration/test/common/testConfigurationService.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ export class TestConfigurationService implements IConfigurationService {
6464
}
6565

6666
public inspect<T>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<T> {
67-
const config = this.getValue(undefined, overrides);
67+
const value = this.getValue(key, overrides);
6868

6969
return {
70-
value: getConfigurationValue<T>(config, key),
71-
defaultValue: getConfigurationValue<T>(config, key),
72-
userValue: getConfigurationValue<T>(config, key),
70+
value,
71+
defaultValue: undefined,
72+
userValue: value,
7373
overrideIdentifiers: this.overrideIdentifiers.get(key)
7474
};
7575
}

src/vs/platform/extensionManagement/common/allowedExtensionsService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ export class AllowedExtensionsService extends Disposable implements IAllowedExte
5454
}
5555

5656
private getAllowedExtensionsValue(): AllowedExtensionsConfigValueType | undefined {
57-
const value = this.configurationService.getValue<AllowedExtensionsConfigValueType | undefined>(AllowedExtensionsConfigKey);
57+
const inspectValue = this.configurationService.inspect<AllowedExtensionsConfigValueType | undefined>(AllowedExtensionsConfigKey);
58+
const value = inspectValue.policyValue ?? inspectValue.userValue ?? inspectValue.defaultValue;
5859
if (!isObject(value) || Array.isArray(value)) {
5960
return undefined;
6061
}

src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,6 +1640,9 @@ suite('ExtensionsWorkbenchServiceTest', () => {
16401640
return true;
16411641
},
16421642
});
1643+
},
1644+
inspect: (key: string) => {
1645+
return {};
16431646
}
16441647
});
16451648
}

src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/tes
1616
import { Selection } from '../../../../../editor/common/core/selection.js';
1717
import { EditorType } from '../../../../../editor/common/editorCommon.js';
1818
import { ICommandService } from '../../../../../platform/commands/common/commands.js';
19-
import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
19+
import { IConfigurationOverrides, IConfigurationService, IConfigurationValue } from '../../../../../platform/configuration/common/configuration.js';
2020
import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
2121
import { IExtensionDescription } from '../../../../../platform/extensions/common/extensions.js';
2222
import { IFormatterChangeEvent, ILabelService, ResourceLabelFormatter, Verbosity } from '../../../../../platform/label/common/label.js';
@@ -763,4 +763,13 @@ class MockInputsConfigurationService extends TestConfigurationService {
763763
}
764764
return configuration;
765765
}
766+
767+
public override inspect<T>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<T> {
768+
return {
769+
value: undefined,
770+
defaultValue: undefined,
771+
userValue: undefined,
772+
overrideIdentifiers: []
773+
};
774+
}
766775
}

0 commit comments

Comments
 (0)