Skip to content

Commit c7378f7

Browse files
sandy081sandy081
authored
remove unused code (microsoft#159467)
1 parent e203dad commit c7378f7

File tree

3 files changed

+2
-109
lines changed

3 files changed

+2
-109
lines changed

‎src/vs/platform/configuration/common/configurationModels.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -943,14 +943,6 @@ export class ConfigurationChangeEvent implements IConfigurationChangeEvent {
943943
}
944944
}
945945

946-
export class AllKeysConfigurationChangeEvent extends ConfigurationChangeEvent {
947-
constructor(configuration: Configuration, workspace: Workspace, source: ConfigurationTarget, sourceConfig: any) {
948-
super({ keys: configuration.allKeys(), overrides: [] }, undefined, configuration, workspace);
949-
this.source = source;
950-
this.sourceConfig = sourceConfig;
951-
}
952-
}
953-
954946
function compare(from: ConfigurationModel | undefined, to: ConfigurationModel | undefined): IConfigurationCompareResult {
955947
const { added, removed, updated } = compareConfigurationContents(to, from);
956948
const overrides: [string, string[]][] = [];

‎src/vs/platform/configuration/test/common/configurationModels.test.ts

Lines changed: 1 addition & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import * as assert from 'assert';
66
import { join } from 'vs/base/common/path';
77
import { URI } from 'vs/base/common/uri';
8-
import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
9-
import { AllKeysConfigurationChangeEvent, Configuration, ConfigurationChangeEvent, ConfigurationModel, ConfigurationModelParser, mergeChanges } from 'vs/platform/configuration/common/configurationModels';
8+
import { Configuration, ConfigurationChangeEvent, ConfigurationModel, ConfigurationModelParser, mergeChanges } from 'vs/platform/configuration/common/configurationModels';
109
import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
1110
import { DefaultConfigurationModel } from 'vs/platform/configuration/common/configurations';
1211
import { Registry } from 'vs/platform/registry/common/platform';
@@ -1014,101 +1013,6 @@ suite('ConfigurationChangeEvent', () => {
10141013

10151014
});
10161015

1017-
suite('AllKeysConfigurationChangeEvent', () => {
1018-
1019-
test('changeEvent', () => {
1020-
const configuration = new Configuration(new ConfigurationModel(), new ConfigurationModel(), new ConfigurationModel(), new ConfigurationModel());
1021-
configuration.updateDefaultConfiguration(toConfigurationModel({
1022-
'editor.lineNumbers': 'off',
1023-
'[markdown]': {
1024-
'editor.wordWrap': 'off'
1025-
}
1026-
}));
1027-
configuration.updateLocalUserConfiguration(toConfigurationModel({
1028-
'[json]': {
1029-
'editor.lineNumbers': 'relative'
1030-
}
1031-
}));
1032-
configuration.updateWorkspaceConfiguration(toConfigurationModel({ 'window.title': 'custom' }));
1033-
configuration.updateFolderConfiguration(URI.file('file1'), toConfigurationModel({ 'window.zoomLevel': 2, 'window.restoreFullscreen': true }));
1034-
configuration.updateFolderConfiguration(URI.file('file2'), toConfigurationModel({ 'workbench.editor.enablePreview': true, 'window.restoreWindows': true }));
1035-
const workspace = new Workspace('a', [new WorkspaceFolder({ index: 0, name: 'a', uri: URI.file('file1') }), new WorkspaceFolder({ index: 1, name: 'b', uri: URI.file('file2') }), new WorkspaceFolder({ index: 2, name: 'c', uri: URI.file('folder3') })]);
1036-
const testObject = new AllKeysConfigurationChangeEvent(configuration, workspace, ConfigurationTarget.USER, null);
1037-
1038-
assert.deepStrictEqual(testObject.affectedKeys, ['editor.lineNumbers', '[markdown]', '[json]', 'window.title', 'window.zoomLevel', 'window.restoreFullscreen', 'workbench.editor.enablePreview', 'window.restoreWindows']);
1039-
1040-
assert.ok(testObject.affectsConfiguration('window.title'));
1041-
assert.ok(testObject.affectsConfiguration('window.title', { resource: URI.file('file1') }));
1042-
assert.ok(testObject.affectsConfiguration('window.title', { resource: URI.file('file2') }));
1043-
1044-
assert.ok(testObject.affectsConfiguration('window'));
1045-
assert.ok(testObject.affectsConfiguration('window', { resource: URI.file('file1') }));
1046-
assert.ok(testObject.affectsConfiguration('window', { resource: URI.file('file2') }));
1047-
1048-
assert.ok(testObject.affectsConfiguration('window.zoomLevel'));
1049-
assert.ok(testObject.affectsConfiguration('window.zoomLevel', { resource: URI.file('file1') }));
1050-
assert.ok(!testObject.affectsConfiguration('window.zoomLevel', { resource: URI.file('file2') }));
1051-
1052-
assert.ok(testObject.affectsConfiguration('window.restoreFullscreen'));
1053-
assert.ok(testObject.affectsConfiguration('window.restoreFullscreen', { resource: URI.file('file1') }));
1054-
assert.ok(!testObject.affectsConfiguration('window.restoreFullscreen', { resource: URI.file('file2') }));
1055-
1056-
assert.ok(testObject.affectsConfiguration('window.restoreWindows'));
1057-
assert.ok(testObject.affectsConfiguration('window.restoreWindows', { resource: URI.file('file2') }));
1058-
assert.ok(!testObject.affectsConfiguration('window.restoreWindows', { resource: URI.file('file1') }));
1059-
1060-
assert.ok(testObject.affectsConfiguration('workbench.editor.enablePreview'));
1061-
assert.ok(testObject.affectsConfiguration('workbench.editor.enablePreview', { resource: URI.file('file2') }));
1062-
assert.ok(!testObject.affectsConfiguration('workbench.editor.enablePreview', { resource: URI.file('file1') }));
1063-
1064-
assert.ok(testObject.affectsConfiguration('workbench.editor'));
1065-
assert.ok(testObject.affectsConfiguration('workbench.editor', { resource: URI.file('file2') }));
1066-
assert.ok(!testObject.affectsConfiguration('workbench.editor', { resource: URI.file('file1') }));
1067-
1068-
assert.ok(testObject.affectsConfiguration('workbench'));
1069-
assert.ok(testObject.affectsConfiguration('workbench', { resource: URI.file('file2') }));
1070-
assert.ok(!testObject.affectsConfiguration('workbench', { resource: URI.file('file1') }));
1071-
1072-
assert.ok(!testObject.affectsConfiguration('files'));
1073-
assert.ok(!testObject.affectsConfiguration('files', { resource: URI.file('file1') }));
1074-
assert.ok(!testObject.affectsConfiguration('files', { resource: URI.file('file2') }));
1075-
1076-
assert.ok(testObject.affectsConfiguration('editor'));
1077-
assert.ok(testObject.affectsConfiguration('editor', { resource: URI.file('file1') }));
1078-
assert.ok(testObject.affectsConfiguration('editor', { resource: URI.file('file2') }));
1079-
assert.ok(testObject.affectsConfiguration('editor', { resource: URI.file('file1'), overrideIdentifier: 'json' }));
1080-
assert.ok(testObject.affectsConfiguration('editor', { resource: URI.file('file1'), overrideIdentifier: 'markdown' }));
1081-
assert.ok(testObject.affectsConfiguration('editor', { resource: URI.file('file1'), overrideIdentifier: 'typescript' }));
1082-
assert.ok(testObject.affectsConfiguration('editor', { resource: URI.file('file2'), overrideIdentifier: 'json' }));
1083-
assert.ok(testObject.affectsConfiguration('editor', { resource: URI.file('file2'), overrideIdentifier: 'markdown' }));
1084-
assert.ok(testObject.affectsConfiguration('editor', { resource: URI.file('file2'), overrideIdentifier: 'typescript' }));
1085-
1086-
assert.ok(testObject.affectsConfiguration('editor.lineNumbers'));
1087-
assert.ok(testObject.affectsConfiguration('editor.lineNumbers', { resource: URI.file('file1') }));
1088-
assert.ok(testObject.affectsConfiguration('editor.lineNumbers', { resource: URI.file('file2') }));
1089-
assert.ok(testObject.affectsConfiguration('editor.lineNumbers', { resource: URI.file('file1'), overrideIdentifier: 'json' }));
1090-
assert.ok(testObject.affectsConfiguration('editor.lineNumbers', { resource: URI.file('file1'), overrideIdentifier: 'markdown' }));
1091-
assert.ok(testObject.affectsConfiguration('editor.lineNumbers', { resource: URI.file('file1'), overrideIdentifier: 'typescript' }));
1092-
assert.ok(testObject.affectsConfiguration('editor.lineNumbers', { resource: URI.file('file2'), overrideIdentifier: 'json' }));
1093-
assert.ok(testObject.affectsConfiguration('editor.lineNumbers', { resource: URI.file('file2'), overrideIdentifier: 'markdown' }));
1094-
assert.ok(testObject.affectsConfiguration('editor.lineNumbers', { resource: URI.file('file2'), overrideIdentifier: 'typescript' }));
1095-
1096-
assert.ok(!testObject.affectsConfiguration('editor.wordWrap'));
1097-
assert.ok(!testObject.affectsConfiguration('editor.wordWrap', { resource: URI.file('file1') }));
1098-
assert.ok(!testObject.affectsConfiguration('editor.wordWrap', { resource: URI.file('file2') }));
1099-
assert.ok(!testObject.affectsConfiguration('editor.wordWrap', { resource: URI.file('file1'), overrideIdentifier: 'json' }));
1100-
assert.ok(!testObject.affectsConfiguration('editor.wordWrap', { resource: URI.file('file1'), overrideIdentifier: 'markdown' }));
1101-
assert.ok(!testObject.affectsConfiguration('editor.wordWrap', { resource: URI.file('file1'), overrideIdentifier: 'typescript' }));
1102-
assert.ok(!testObject.affectsConfiguration('editor.wordWrap', { resource: URI.file('file2'), overrideIdentifier: 'json' }));
1103-
assert.ok(!testObject.affectsConfiguration('editor.wordWrap', { resource: URI.file('file2'), overrideIdentifier: 'markdown' }));
1104-
assert.ok(!testObject.affectsConfiguration('editor.wordWrap', { resource: URI.file('file2'), overrideIdentifier: 'typescript' }));
1105-
1106-
assert.ok(!testObject.affectsConfiguration('editor.fontSize'));
1107-
assert.ok(!testObject.affectsConfiguration('editor.fontSize', { resource: URI.file('file1') }));
1108-
assert.ok(!testObject.affectsConfiguration('editor.fontSize', { resource: URI.file('file2') }));
1109-
});
1110-
});
1111-
11121016
function toConfigurationModel(obj: any): ConfigurationModel {
11131017
const parser = new ConfigurationModelParser('test');
11141018
parser.parse(JSON.stringify(obj));

‎src/vs/workbench/services/configuration/browser/configurationService.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
1111
import { Queue, Barrier, runWhenIdle, Promises } from 'vs/base/common/async';
1212
import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
1313
import { IWorkspaceContextService, Workspace as BaseWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkspaceFolder, toWorkspaceFolder, isWorkspaceFolder, IWorkspaceFoldersWillChangeEvent, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier, IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
14-
import { ConfigurationModel, ConfigurationChangeEvent, AllKeysConfigurationChangeEvent, mergeChanges } from 'vs/platform/configuration/common/configurationModels';
14+
import { ConfigurationModel, ConfigurationChangeEvent, mergeChanges } from 'vs/platform/configuration/common/configurationModels';
1515
import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, isConfigurationOverrides, IConfigurationData, IConfigurationValue, IConfigurationChange, ConfigurationTargetToString, IConfigurationUpdateOverrides, isConfigurationUpdateOverrides, IConfigurationService } from 'vs/platform/configuration/common/configuration';
1616
import { IPolicyConfiguration, NullPolicyConfiguration, PolicyConfiguration } from 'vs/platform/configuration/common/configurations';
1717
import { Configuration } from 'vs/workbench/services/configuration/common/configurationModels';
@@ -692,9 +692,6 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
692692
const change = this._configuration.compare(currentConfiguration);
693693
this.triggerConfigurationChange(change, { data: currentConfiguration.toData(), workspace: this.workspace }, ConfigurationTarget.WORKSPACE);
694694
} else {
695-
if (this._onDidChangeConfiguration.hasListeners()) {
696-
this._onDidChangeConfiguration.fire(new AllKeysConfigurationChangeEvent(this._configuration, this.workspace, ConfigurationTarget.WORKSPACE, this.getTargetConfiguration(ConfigurationTarget.WORKSPACE)));
697-
}
698695
this.initialized = true;
699696
}
700697

0 commit comments

Comments
 (0)