Skip to content

Commit ebb58dc

Browse files
sandy081sandy081
committed
Refactor: Rename settings to Preferences
1 parent 740457e commit ebb58dc

12 files changed

Lines changed: 43 additions & 45 deletions

File tree

‎src/vs/workbench/electron-browser/workbench.main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import 'vs/workbench/browser/actions/toggleSidebarVisibility';
2626
import 'vs/workbench/browser/actions/toggleSidebarPosition';
2727
import 'vs/workbench/browser/actions/toggleEditorLayout';
2828
import 'vs/workbench/browser/actions/toggleZenMode';
29-
import 'vs/workbench/parts/settings/browser/openSettings.contribution';
29+
import 'vs/workbench/parts/preferences/browser/preferences.contribution';
3030
import 'vs/workbench/browser/actions/configureLocale';
3131

3232
import 'vs/workbench/parts/quickopen/browser/quickopen.contribution';

‎src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { InstallVSIXAction } from 'vs/workbench/parts/extensions/electron-browse
3838
import { IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, SortBy, SortOrder, IQueryOptions, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
3939
import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
4040
import { Query } from '../common/extensionQuery';
41-
import { OpenGlobalSettingsAction } from 'vs/workbench/parts/settings/browser/openSettingsActions';
41+
import { OpenGlobalSettingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
4242
import { IProgressService } from 'vs/platform/progress/common/progress';
4343
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
4444
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';

src/vs/workbench/parts/settings/browser/media/openSettings.css renamed to src/vs/workbench/parts/preferences/browser/media/preferences.css

File renamed without changes.

src/vs/workbench/parts/settings/browser/openSettings.contribution.ts renamed to src/vs/workbench/parts/preferences/browser/preferences.contribution.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
1313
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
1414
import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
1515
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
16-
import { DefaultSettingsEditor, DefaultSettingsInput, DefaultKeybindingsInput } from 'vs/workbench/parts/settings/browser/defaultSettingsEditors';
17-
import { OpenGlobalSettingsAction, OpenGlobalKeybindingsAction, OpenWorkspaceSettingsAction } from 'vs/workbench/parts/settings/browser/openSettingsActions';
18-
import { IOpenSettingsService } from 'vs/workbench/parts/settings/common/openSettings';
19-
import { OpenSettingsService } from 'vs/workbench/parts/settings/browser/openSettingsService';
16+
import { DefaultSettingsEditor, DefaultSettingsInput, DefaultKeybindingsInput } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
17+
import { OpenGlobalSettingsAction, OpenGlobalKeybindingsAction, OpenWorkspaceSettingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
18+
import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
19+
import { PreferencesService } from 'vs/workbench/parts/preferences/browser/preferencesService';
2020

21-
registerSingleton(IOpenSettingsService, OpenSettingsService);
21+
registerSingleton(IPreferencesService, PreferencesService);
2222

2323
(<IEditorRegistry>Registry.as(EditorExtensions.Editors)).registerEditor(
2424
new EditorDescriptor(
2525
DefaultSettingsEditor.ID,
2626
nls.localize('defaultSettingsEditor', "Default Settings Editor"),
27-
'vs/workbench/parts/settings/browser/defaultSettingsEditors',
27+
'vs/workbench/parts/preferences/browser/preferencesEditor',
2828
'DefaultSettingsEditor'
2929
),
3030
[

src/vs/workbench/parts/settings/browser/openSettingsActions.ts renamed to src/vs/workbench/parts/preferences/browser/preferencesActions.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import { TPromise } from 'vs/base/common/winjs.base';
88
import * as nls from 'vs/nls';
99
import { Action } from 'vs/base/common/actions';
10-
import { IOpenSettingsService } from 'vs/workbench/parts/settings/common/openSettings';
10+
import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
1111

1212
export class OpenGlobalSettingsAction extends Action {
1313

@@ -17,13 +17,13 @@ export class OpenGlobalSettingsAction extends Action {
1717
constructor(
1818
id: string,
1919
label: string,
20-
@IOpenSettingsService private openSettingsService: IOpenSettingsService
20+
@IPreferencesService private preferencesService: IPreferencesService
2121
) {
2222
super(id, label);
2323
}
2424

2525
public run(event?: any): TPromise<void> {
26-
return this.openSettingsService.openGlobalSettings();
26+
return this.preferencesService.openGlobalSettings();
2727
}
2828
}
2929

@@ -35,13 +35,13 @@ export class OpenGlobalKeybindingsAction extends Action {
3535
constructor(
3636
id: string,
3737
label: string,
38-
@IOpenSettingsService private openSettingsService: IOpenSettingsService
38+
@IPreferencesService private preferencesService: IPreferencesService
3939
) {
4040
super(id, label);
4141
}
4242

4343
public run(event?: any): TPromise<any> {
44-
return this.openSettingsService.openGlobalKeybindingSettings();
44+
return this.preferencesService.openGlobalKeybindingSettings();
4545
}
4646
}
4747

@@ -53,12 +53,12 @@ export class OpenWorkspaceSettingsAction extends Action {
5353
constructor(
5454
id: string,
5555
label: string,
56-
@IOpenSettingsService private openSettingsService: IOpenSettingsService
56+
@IPreferencesService private preferencesService: IPreferencesService
5757
) {
5858
super(id, label);
5959
}
6060

6161
public run(event?: any): TPromise<void> {
62-
return this.openSettingsService.openWorkspaceSettings();
62+
return this.preferencesService.openWorkspaceSettings();
6363
}
6464
}

src/vs/workbench/parts/settings/browser/defaultSettingsEditors.ts renamed to src/vs/workbench/parts/preferences/browser/preferencesEditor.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
2121
import { StringEditor } from 'vs/workbench/browser/parts/editor/stringEditor';
2222
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
2323
import { IFoldingController, ID as FoldingContributionId } from 'vs/editor/contrib/folding/common/folding';
24-
import { IOpenSettingsService, ISettingsGroup, ISetting } from 'vs/workbench/parts/settings/common/openSettings';
24+
import { IPreferencesService, ISettingsGroup, ISetting } from 'vs/workbench/parts/preferences/common/preferences';
2525
import { editorContribution } from 'vs/editor/browser/editorBrowserExtensions';
2626
import { ICodeEditor, IEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
2727
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -57,9 +57,9 @@ export class AbstractSettingsInput extends StringEditorInput {
5757
export class DefaultSettingsInput extends AbstractSettingsInput {
5858
private static INSTANCE: DefaultSettingsInput;
5959

60-
public static getInstance(instantiationService: IInstantiationService, openSettingsService: IOpenSettingsService): DefaultSettingsInput {
60+
public static getInstance(instantiationService: IInstantiationService, preferencesService: IPreferencesService): DefaultSettingsInput {
6161
if (!DefaultSettingsInput.INSTANCE) {
62-
const defaultSettings = openSettingsService.defaultSettings;
62+
const defaultSettings = preferencesService.defaultSettings;
6363
DefaultSettingsInput.INSTANCE = instantiationService.createInstance(DefaultSettingsInput, nls.localize('defaultName', "Default Settings"), null, defaultSettings.content, defaultSettings.uri, 'application/json', false);
6464
}
6565
return DefaultSettingsInput.INSTANCE;
@@ -69,9 +69,9 @@ export class DefaultSettingsInput extends AbstractSettingsInput {
6969
export class DefaultKeybindingsInput extends AbstractSettingsInput {
7070
private static INSTANCE: DefaultKeybindingsInput;
7171

72-
public static getInstance(instantiationService: IInstantiationService, openSettingsService: IOpenSettingsService): DefaultKeybindingsInput {
72+
public static getInstance(instantiationService: IInstantiationService, preferencesService: IPreferencesService): DefaultKeybindingsInput {
7373
if (!DefaultKeybindingsInput.INSTANCE) {
74-
const defaultKeybindings = openSettingsService.defaultKeybindings;
74+
const defaultKeybindings = preferencesService.defaultKeybindings;
7575
DefaultKeybindingsInput.INSTANCE = instantiationService.createInstance(DefaultKeybindingsInput, nls.localize('defaultKeybindings', "Default Keyboard Shortcuts"), null, defaultKeybindings.content, defaultKeybindings.uri, 'application/json', false);
7676
}
7777

@@ -146,7 +146,7 @@ export class DefaultSettingsContribution extends Disposable implements editorCom
146146

147147
constructor(private editor: ICodeEditor,
148148
@IInstantiationService private instantiationService: IInstantiationService,
149-
@IOpenSettingsService private openSettingsService: IOpenSettingsService
149+
@IPreferencesService private preferencesService: IPreferencesService
150150
) {
151151
super();
152152
this._register(editor.onDidChangeModel(() => this.onModelChanged()));
@@ -167,14 +167,14 @@ export class DefaultSettingsContribution extends Disposable implements editorCom
167167
return;
168168
}
169169

170-
if (model.uri.fsPath === this.openSettingsService.defaultSettings.uri.fsPath) {
170+
if (model.uri.fsPath === this.preferencesService.defaultSettings.uri.fsPath) {
171171
this.styleDefaultSettings(model);
172172
}
173173
}
174174

175175
private canHandle(model: editorCommon.IModel) {
176176
if (model) {
177-
if (model.uri.fsPath === this.openSettingsService.defaultSettings.uri.fsPath) {
177+
if (model.uri.fsPath === this.preferencesService.defaultSettings.uri.fsPath) {
178178
return true;
179179
}
180180
}
@@ -187,7 +187,7 @@ export class DefaultSettingsContribution extends Disposable implements editorCom
187187

188188
private renderDecorations(model: editorCommon.IModel) {
189189
this.settingsActions = this.instantiationService.createInstance(SettingsActionsDecorators, this.editor);
190-
this.settingsActions.render(this.openSettingsService.defaultSettings.settingsGroups);
190+
this.settingsActions.render(this.preferencesService.defaultSettings.settingsGroups);
191191
}
192192
}
193193

@@ -196,7 +196,7 @@ export class SettingsActionsDecorators extends Disposable {
196196
private decorationIds: string[] = [];
197197

198198
constructor(private editor: ICodeEditor,
199-
@IOpenSettingsService private settingsService: IOpenSettingsService,
199+
@IPreferencesService private settingsService: IPreferencesService,
200200
@IContextMenuService private contextMenuService: IContextMenuService
201201
) {
202202
super();

src/vs/workbench/parts/settings/browser/openSettingsService.ts renamed to src/vs/workbench/parts/preferences/browser/preferencesService.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
5-
import 'vs/css!./media/openSettings';
5+
import 'vs/css!./media/preferences';
66
import { TPromise } from 'vs/base/common/winjs.base';
77
import * as nls from 'vs/nls';
88
import URI from 'vs/base/common/uri';
@@ -25,13 +25,13 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
2525
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
2626
import * as editorCommon from 'vs/editor/common/editorCommon';
2727
import { IConfigurationEditingService, ConfigurationTarget, IConfigurationValue } from 'vs/workbench/services/configuration/common/configurationEditing';
28-
import { IOpenSettingsService, IDefaultSettings, IDefaultKeybindings } from 'vs/workbench/parts/settings/common/openSettings';
29-
import { DefaultSettings, DefaultKeybindings } from 'vs/workbench/parts/settings/common/defaultSettings';
28+
import { IPreferencesService, IDefaultSettings, IDefaultKeybindings } from 'vs/workbench/parts/preferences/common/preferences';
29+
import { DefaultSettings, DefaultKeybindings } from 'vs/workbench/parts/preferences/common/preferencesModels';
3030
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
3131
import { ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
3232
import { IModelService } from 'vs/editor/common/services/modelService';
3333
import { IModeService } from 'vs/editor/common/services/modeService';
34-
import { DefaultSettingsInput, DefaultKeybindingsInput } from 'vs/workbench/parts/settings/browser/defaultSettingsEditors';
34+
import { DefaultSettingsInput, DefaultKeybindingsInput } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
3535

3636

3737
const SETTINGS_INFO_IGNORE_KEY = 'settings.workspace.info.ignore';
@@ -44,7 +44,7 @@ interface IWorkbenchSettingsConfiguration {
4444
};
4545
}
4646

47-
export class OpenSettingsService extends Disposable implements IOpenSettingsService {
47+
export class PreferencesService extends Disposable implements IPreferencesService {
4848

4949
_serviceBrand: any;
5050

@@ -257,7 +257,7 @@ export class OpenSettingsService extends Disposable implements IOpenSettingsServ
257257
export class SettingsContentProvider implements ITextModelContentProvider {
258258

259259
constructor(
260-
@IOpenSettingsService private openSettingsService: IOpenSettingsService,
260+
@IPreferencesService private preferencesService: IPreferencesService,
261261
@IModelService private modelService: IModelService,
262262
@IModeService private modeService: IModeService
263263
) {
@@ -267,12 +267,12 @@ export class SettingsContentProvider implements ITextModelContentProvider {
267267
if (uri.scheme !== 'vscode') {
268268
return null;
269269
}
270-
const defaultSettings = this.openSettingsService.defaultSettings;
270+
const defaultSettings = this.preferencesService.defaultSettings;
271271
if (defaultSettings.uri.fsPath === uri.fsPath) {
272272
let mode = this.modeService.getOrCreateMode('application/json');
273273
return TPromise.as(this.modelService.createModel(defaultSettings.content, mode, uri));
274274
}
275-
const defaultKeybindings = this.openSettingsService.defaultKeybindings;
275+
const defaultKeybindings = this.preferencesService.defaultKeybindings;
276276
if (defaultKeybindings.uri.fsPath === uri.fsPath) {
277277
let mode = this.modeService.getOrCreateMode('application/json');
278278
return TPromise.as(this.modelService.createModel(defaultKeybindings.content, mode, uri));

src/vs/workbench/parts/settings/common/openSettings.ts renamed to src/vs/workbench/parts/preferences/common/preferences.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,16 @@ export interface IDefaultSettings {
3333
uri: URI;
3434
content: string;
3535
settingsGroups: ISettingsGroup[];
36-
37-
// filterSettings(filter: string): ISettingsGroup[];
3836
}
3937

4038
export interface IDefaultKeybindings {
4139
uri: URI;
4240
content: string;
4341
}
4442

45-
export const IOpenSettingsService = createDecorator<IOpenSettingsService>('openSettingsService');
43+
export const IPreferencesService = createDecorator<IPreferencesService>('preferencesService');
4644

47-
export interface IOpenSettingsService {
45+
export interface IPreferencesService {
4846
_serviceBrand: any;
4947

5048
defaultSettings: IDefaultSettings;

src/vs/workbench/parts/settings/common/defaultSettings.ts renamed to src/vs/workbench/parts/preferences/common/preferencesModels.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as strings from 'vs/base/common/strings';
99
import URI from 'vs/base/common/uri';
1010
import { Registry } from 'vs/platform/platform';
1111
import { IConfigurationNode, IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
12-
import { IDefaultSettings, IDefaultKeybindings, ISettingsGroup, ISetting } from 'vs/workbench/parts/settings/common/openSettings';
12+
import { IDefaultSettings, IDefaultKeybindings, ISettingsGroup, ISetting } from 'vs/workbench/parts/preferences/common/preferences';
1313
import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
1414
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
1515

‎src/vs/workbench/parts/search/browser/searchActions.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { SearchResult, Match, FileMatch, FileMatchOrMatch } from 'vs/workbench/p
1818
import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
1919
import * as Constants from 'vs/workbench/parts/search/common/constants';
2020
import { CollapseAllAction as TreeCollapseAction } from 'vs/base/parts/tree/browser/treeDefaults';
21-
import { IOpenSettingsService } from 'vs/workbench/parts/settings/common/openSettings';
21+
import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
2222
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
2323
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2424
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
@@ -450,7 +450,7 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
450450

451451
export class ConfigureGlobalExclusionsAction extends Action {
452452

453-
constructor( @IOpenSettingsService private openSettingsService: IOpenSettingsService) {
453+
constructor( @IPreferencesService private preferencesService: IPreferencesService) {
454454
super('configureGlobalExclusionsAction');
455455

456456
this.label = nls.localize('ConfigureGlobalExclusionsAction.label', "Open Settings");
@@ -459,6 +459,6 @@ export class ConfigureGlobalExclusionsAction extends Action {
459459
}
460460

461461
public run(): TPromise<void> {
462-
return this.openSettingsService.openGlobalSettings().then(null, errors.onUnexpectedError);
462+
return this.preferencesService.openGlobalSettings().then(null, errors.onUnexpectedError);
463463
}
464464
}

0 commit comments

Comments
 (0)