From c86195bb2a2154b71a568fc896d8839c432535ff Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 29 Aug 2016 07:02:11 +0200 Subject: [PATCH] service renames --- src/vs/workbench/api/node/mainThreadConfiguration.ts | 4 ++-- src/vs/workbench/browser/actions/openSettings.ts | 12 ++++++------ .../services/configuration/common/configuration.ts | 8 ++++---- .../configuration/node/configurationService.ts | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/vs/workbench/api/node/mainThreadConfiguration.ts b/src/vs/workbench/api/node/mainThreadConfiguration.ts index acaa75a4124..03089d095a9 100644 --- a/src/vs/workbench/api/node/mainThreadConfiguration.ts +++ b/src/vs/workbench/api/node/mainThreadConfiguration.ts @@ -7,7 +7,7 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {IDisposable, dispose} from 'vs/base/common/lifecycle'; import {IThreadService} from 'vs/workbench/services/thread/common/threadService'; -import {IWorkbenchConfigurationService} from 'vs/workbench/services/configuration/common/configuration'; +import {IWorkspaceConfigurationService} from 'vs/workbench/services/configuration/common/configuration'; import {IConfigurationEditingService, ConfigurationTarget} from 'vs/workbench/services/configuration/common/configurationEditing'; import {MainThreadConfigurationShape, ExtHostContext} from './extHost.protocol'; @@ -18,7 +18,7 @@ export class MainThreadConfiguration extends MainThreadConfigurationShape { constructor( @IConfigurationEditingService configurationEditingService: IConfigurationEditingService, - @IWorkbenchConfigurationService configurationService: IWorkbenchConfigurationService, + @IWorkspaceConfigurationService configurationService: IWorkspaceConfigurationService, @IThreadService threadService: IThreadService ) { super(); diff --git a/src/vs/workbench/browser/actions/openSettings.ts b/src/vs/workbench/browser/actions/openSettings.ts index a8c32bab5e0..1a167a79782 100644 --- a/src/vs/workbench/browser/actions/openSettings.ts +++ b/src/vs/workbench/browser/actions/openSettings.ts @@ -17,7 +17,7 @@ import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput'; import {getDefaultValuesContent} from 'vs/platform/configuration/common/model'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; -import {IWorkbenchConfigurationService, WORKSPACE_CONFIG_DEFAULT_PATH} from 'vs/workbench/services/configuration/common/configuration'; +import {IWorkspaceConfigurationService, WORKSPACE_CONFIG_DEFAULT_PATH} from 'vs/workbench/services/configuration/common/configuration'; import {Position} from 'vs/platform/editor/common/editor'; import {IEditorGroupService} from 'vs/workbench/services/group/common/groupService'; import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage'; @@ -45,7 +45,7 @@ export class BaseTwoEditorsAction extends Action { @IWorkbenchEditorService protected editorService: IWorkbenchEditorService, @IEditorGroupService private editorGroupService: IEditorGroupService, @IFileService protected fileService: IFileService, - @IWorkbenchConfigurationService protected configurationService: IWorkbenchConfigurationService, + @IWorkspaceConfigurationService protected configurationService: IWorkspaceConfigurationService, @IMessageService protected messageService: IMessageService, @IWorkspaceContextService protected contextService: IWorkspaceContextService, @IKeybindingService protected keybindingService: IKeybindingService, @@ -94,7 +94,7 @@ export class BaseOpenSettingsAction extends BaseTwoEditorsAction { @IWorkbenchEditorService editorService: IWorkbenchEditorService, @IEditorGroupService editorGroupService: IEditorGroupService, @IFileService fileService: IFileService, - @IWorkbenchConfigurationService configurationService: IWorkbenchConfigurationService, + @IWorkspaceConfigurationService configurationService: IWorkspaceConfigurationService, @IMessageService messageService: IMessageService, @IWorkspaceContextService contextService: IWorkspaceContextService, @IKeybindingService keybindingService: IKeybindingService, @@ -130,7 +130,7 @@ export class OpenGlobalSettingsAction extends BaseOpenSettingsAction { @IWorkbenchEditorService editorService: IWorkbenchEditorService, @IEditorGroupService editorGroupService: IEditorGroupService, @IFileService fileService: IFileService, - @IWorkbenchConfigurationService configurationService: IWorkbenchConfigurationService, + @IWorkspaceConfigurationService configurationService: IWorkspaceConfigurationService, @IMessageService messageService: IMessageService, @IWorkspaceContextService contextService: IWorkspaceContextService, @IKeybindingService keybindingService: IKeybindingService, @@ -183,7 +183,7 @@ export class OpenGlobalKeybindingsAction extends BaseTwoEditorsAction { @IWorkbenchEditorService editorService: IWorkbenchEditorService, @IEditorGroupService editorGroupService: IEditorGroupService, @IFileService fileService: IFileService, - @IWorkbenchConfigurationService configurationService: IWorkbenchConfigurationService, + @IWorkspaceConfigurationService configurationService: IWorkspaceConfigurationService, @IMessageService messageService: IMessageService, @IWorkspaceContextService contextService: IWorkspaceContextService, @IKeybindingService keybindingService: IKeybindingService, @@ -225,7 +225,7 @@ export class OpenWorkspaceSettingsAction extends BaseOpenSettingsAction { class DefaultSettingsInput extends StringEditorInput { private static INSTANCE: DefaultSettingsInput; - public static getInstance(instantiationService: IInstantiationService, configurationService: IWorkbenchConfigurationService): DefaultSettingsInput { + public static getInstance(instantiationService: IInstantiationService, configurationService: IWorkspaceConfigurationService): DefaultSettingsInput { if (!DefaultSettingsInput.INSTANCE) { let editorConfig = configurationService.getConfiguration(); let defaults = getDefaultValuesContent(editorConfig.editor.insertSpaces ? strings.repeat(' ', editorConfig.editor.tabSize) : '\t'); diff --git a/src/vs/workbench/services/configuration/common/configuration.ts b/src/vs/workbench/services/configuration/common/configuration.ts index 07fd4c8b53e..196059dc78b 100644 --- a/src/vs/workbench/services/configuration/common/configuration.ts +++ b/src/vs/workbench/services/configuration/common/configuration.ts @@ -10,9 +10,9 @@ export const CONFIG_DEFAULT_NAME = 'settings'; export const WORKSPACE_CONFIG_FOLDER_DEFAULT_NAME = '.vscode'; export const WORKSPACE_CONFIG_DEFAULT_PATH = '.vscode/settings.json'; -export const IWorkbenchConfigurationService = createDecorator('configurationService'); +export const IWorkspaceConfigurationService = createDecorator('configurationService'); -export interface IWorkbenchConfigurationService extends IConfigurationService { +export interface IWorkspaceConfigurationService extends IConfigurationService { /** * Returns iff the workspace has configuration or not. @@ -22,9 +22,9 @@ export interface IWorkbenchConfigurationService extends IConfigurationService { /** * Override for the IConfigurationService#lookup() method that adds information about workspace settings. */ - lookup(key: string): IWorkbenchConfigurationValue; + lookup(key: string): IWorkspaceConfigurationValue; } -export interface IWorkbenchConfigurationValue extends IConfigurationValue { +export interface IWorkspaceConfigurationValue extends IConfigurationValue { workspace: T; } \ No newline at end of file diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts index 26dea2a9262..0ec373f9c78 100644 --- a/src/vs/workbench/services/configuration/node/configurationService.ts +++ b/src/vs/workbench/services/configuration/node/configurationService.ts @@ -21,7 +21,7 @@ import errors = require('vs/base/common/errors'); import {IConfigFile, consolidate, newConfigFile} from 'vs/workbench/services/configuration/common/model'; import {IConfigurationServiceEvent, getConfigurationValue} from 'vs/platform/configuration/common/configuration'; import {ConfigurationService as BaseConfigurationService} from 'vs/platform/configuration/node/configurationService'; -import {IWorkbenchConfigurationService, IWorkbenchConfigurationValue, CONFIG_DEFAULT_NAME, WORKSPACE_CONFIG_FOLDER_DEFAULT_NAME} from 'vs/workbench/services/configuration/common/configuration'; +import {IWorkspaceConfigurationService, IWorkspaceConfigurationValue, CONFIG_DEFAULT_NAME, WORKSPACE_CONFIG_FOLDER_DEFAULT_NAME} from 'vs/workbench/services/configuration/common/configuration'; import {EventType as FileEventType, FileChangeType, FileChangesEvent} from 'vs/platform/files/common/files'; import Event, {Emitter} from 'vs/base/common/event'; @@ -39,7 +39,7 @@ interface IContent { /** * Wraps around the basic configuration service and adds knowledge about workspace settings. */ -export class WorkspaceConfigurationService implements IWorkbenchConfigurationService, IDisposable { +export class WorkspaceConfigurationService implements IWorkspaceConfigurationService, IDisposable { public _serviceBrand: any; @@ -113,7 +113,7 @@ export class WorkspaceConfigurationService implements IWorkbenchConfigurationSer return section ? this.cachedConfig[section] : this.cachedConfig; } - public lookup(key: string): IWorkbenchConfigurationValue { + public lookup(key: string): IWorkspaceConfigurationValue { const configurationValue = this.baseConfigurationService.lookup(key); return {