Skip to content

Commit 0736c91

Browse files
author
Benjamin Pasero
committed
💄
1 parent 1166dfb commit 0736c91

4 files changed

Lines changed: 8 additions & 9 deletions

File tree

‎src/vs/platform/request/node/request.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/co
1010
import { Registry } from 'vs/platform/registry/common/platform';
1111
import { CancellationToken } from 'vs/base/common/cancellation';
1212

13-
export const IRequestService = createDecorator<IRequestService>('requestService2');
13+
export const IRequestService = createDecorator<IRequestService>('requestService');
1414

1515
export interface IRequestService {
1616
_serviceBrand: any;

‎src/vs/workbench/browser/nodeless.simpleservices.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
2929
import { ITelemetryService, ITelemetryData, ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
3030
import { INotificationService } from 'vs/platform/notification/common/notification';
3131
import { AbstractLifecycleService } from 'vs/platform/lifecycle/common/lifecycleService';
32-
import { ILogService, NullLogService, LogLevel } from 'vs/platform/log/common/log';
32+
import { ILogService, LogLevel, ConsoleLogService } from 'vs/platform/log/common/log';
3333
import { ShutdownReason, ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
3434
import { IMenubarService, IMenubarData } from 'vs/platform/menubar/common/menubar';
3535
import { IProductService } from 'vs/platform/product/common/product';
@@ -509,7 +509,7 @@ registerSingleton(ILifecycleService, SimpleLifecycleService);
509509

510510
//#region Log
511511

512-
export class SimpleLogService extends NullLogService { }
512+
export class SimpleLogService extends ConsoleLogService { }
513513

514514
//#endregion
515515

@@ -992,7 +992,7 @@ registerSingleton(IFileService, SimpleRemoteFileService);
992992

993993
//#region Request
994994

995-
export const IRequestService = createDecorator<IRequestService>('requestService2');
995+
export const IRequestService = createDecorator<IRequestService>('requestService');
996996

997997
export interface IRequestService {
998998
_serviceBrand: any;

‎src/vs/workbench/services/textMate/electron-browser/textMateService.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { ITextMateService } from 'vs/workbench/services/textMate/common/textMate
2525
import { ITokenColorizationRule, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
2626
import { IEmbeddedLanguagesMap as IEmbeddedLanguagesMap2, IGrammar, ITokenTypeMap, Registry, StackElement, StandardTokenType } from 'vscode-textmate';
2727
import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
28-
import { ConfigurationService } from 'vs/platform/configuration/node/configurationService';
2928
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
3029
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
3130

@@ -162,7 +161,7 @@ export class TextMateService extends Disposable implements ITextMateService {
162161
@IFileService private readonly _fileService: IFileService,
163162
@INotificationService private readonly _notificationService: INotificationService,
164163
@ILogService private readonly _logService: ILogService,
165-
@IConfigurationService private readonly _configurationService: ConfigurationService
164+
@IConfigurationService private readonly _configurationService: IConfigurationService
166165
) {
167166
super();
168167
this._styleElement = dom.createStyleSheet();

‎src/vs/workbench/services/workspace/node/workspaceEditingService.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
4040
@IJSONEditingService private readonly jsonEditingService: IJSONEditingService,
4141
@IWorkspaceContextService private readonly contextService: WorkspaceService,
4242
@IWindowService private readonly windowService: IWindowService,
43-
@IConfigurationService private readonly workspaceConfigurationService: IConfigurationService,
43+
@IConfigurationService private readonly configurationService: IConfigurationService,
4444
@IStorageService private readonly storageService: IStorageService,
4545
@IExtensionService private readonly extensionService: IExtensionService,
4646
@IBackupFileService private readonly backupFileService: IBackupFileService,
@@ -411,13 +411,13 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
411411
private doCopyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier, filter?: (config: IConfigurationPropertySchema) => boolean): Promise<void> {
412412
const configurationProperties = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
413413
const targetWorkspaceConfiguration = {};
414-
for (const key of this.workspaceConfigurationService.keys().workspace) {
414+
for (const key of this.configurationService.keys().workspace) {
415415
if (configurationProperties[key]) {
416416
if (filter && !filter(configurationProperties[key])) {
417417
continue;
418418
}
419419

420-
targetWorkspaceConfiguration[key] = this.workspaceConfigurationService.inspect(key).workspace;
420+
targetWorkspaceConfiguration[key] = this.configurationService.inspect(key).workspace;
421421
}
422422
}
423423

0 commit comments

Comments
 (0)