From 0736c91f97b3bcf43c491b12967d85dafebdb15d Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 15 Mar 2019 12:38:22 +0100 Subject: [PATCH] :lipstick: --- src/vs/platform/request/node/request.ts | 2 +- src/vs/workbench/browser/nodeless.simpleservices.ts | 6 +++--- .../services/textMate/electron-browser/textMateService.ts | 3 +-- .../services/workspace/node/workspaceEditingService.ts | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/vs/platform/request/node/request.ts b/src/vs/platform/request/node/request.ts index c8145bca837..0dc5cdc6b4a 100644 --- a/src/vs/platform/request/node/request.ts +++ b/src/vs/platform/request/node/request.ts @@ -10,7 +10,7 @@ import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/co import { Registry } from 'vs/platform/registry/common/platform'; import { CancellationToken } from 'vs/base/common/cancellation'; -export const IRequestService = createDecorator('requestService2'); +export const IRequestService = createDecorator('requestService'); export interface IRequestService { _serviceBrand: any; diff --git a/src/vs/workbench/browser/nodeless.simpleservices.ts b/src/vs/workbench/browser/nodeless.simpleservices.ts index 311680bb881..2da2e29b00c 100644 --- a/src/vs/workbench/browser/nodeless.simpleservices.ts +++ b/src/vs/workbench/browser/nodeless.simpleservices.ts @@ -29,7 +29,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { ITelemetryService, ITelemetryData, ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { AbstractLifecycleService } from 'vs/platform/lifecycle/common/lifecycleService'; -import { ILogService, NullLogService, LogLevel } from 'vs/platform/log/common/log'; +import { ILogService, LogLevel, ConsoleLogService } from 'vs/platform/log/common/log'; import { ShutdownReason, ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import { IMenubarService, IMenubarData } from 'vs/platform/menubar/common/menubar'; import { IProductService } from 'vs/platform/product/common/product'; @@ -509,7 +509,7 @@ registerSingleton(ILifecycleService, SimpleLifecycleService); //#region Log -export class SimpleLogService extends NullLogService { } +export class SimpleLogService extends ConsoleLogService { } //#endregion @@ -992,7 +992,7 @@ registerSingleton(IFileService, SimpleRemoteFileService); //#region Request -export const IRequestService = createDecorator('requestService2'); +export const IRequestService = createDecorator('requestService'); export interface IRequestService { _serviceBrand: any; diff --git a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts index de5333bf4a8..0fd4d880811 100644 --- a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts +++ b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts @@ -25,7 +25,6 @@ import { ITextMateService } from 'vs/workbench/services/textMate/common/textMate import { ITokenColorizationRule, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IEmbeddedLanguagesMap as IEmbeddedLanguagesMap2, IGrammar, ITokenTypeMap, Registry, StackElement, StandardTokenType } from 'vscode-textmate'; import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { ConfigurationService } from 'vs/platform/configuration/node/configurationService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; @@ -162,7 +161,7 @@ export class TextMateService extends Disposable implements ITextMateService { @IFileService private readonly _fileService: IFileService, @INotificationService private readonly _notificationService: INotificationService, @ILogService private readonly _logService: ILogService, - @IConfigurationService private readonly _configurationService: ConfigurationService + @IConfigurationService private readonly _configurationService: IConfigurationService ) { super(); this._styleElement = dom.createStyleSheet(); diff --git a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts index bb495c6ea73..ec5cc2da056 100644 --- a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts +++ b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts @@ -40,7 +40,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService { @IJSONEditingService private readonly jsonEditingService: IJSONEditingService, @IWorkspaceContextService private readonly contextService: WorkspaceService, @IWindowService private readonly windowService: IWindowService, - @IConfigurationService private readonly workspaceConfigurationService: IConfigurationService, + @IConfigurationService private readonly configurationService: IConfigurationService, @IStorageService private readonly storageService: IStorageService, @IExtensionService private readonly extensionService: IExtensionService, @IBackupFileService private readonly backupFileService: IBackupFileService, @@ -411,13 +411,13 @@ export class WorkspaceEditingService implements IWorkspaceEditingService { private doCopyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier, filter?: (config: IConfigurationPropertySchema) => boolean): Promise { const configurationProperties = Registry.as(ConfigurationExtensions.Configuration).getConfigurationProperties(); const targetWorkspaceConfiguration = {}; - for (const key of this.workspaceConfigurationService.keys().workspace) { + for (const key of this.configurationService.keys().workspace) { if (configurationProperties[key]) { if (filter && !filter(configurationProperties[key])) { continue; } - targetWorkspaceConfiguration[key] = this.workspaceConfigurationService.inspect(key).workspace; + targetWorkspaceConfiguration[key] = this.configurationService.inspect(key).workspace; } } -- GitLab