Skip to content

Commit 2077cb3

Browse files
jriekenjrieken
committed
turn serviceId into _serviceBrand:any to follow common practive
see https://basarat.gitbooks.io/typescript/content/docs/tips/nominalTyping.html and https://github.com/Microsoft/TypeScript/blob/7b48a182c05ea4dea81bab73ecbbe9e013a79e99/src/compiler/types.ts#L693-L698
1 parent 1828d8a commit 2077cb3

134 files changed

Lines changed: 239 additions & 247 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/vs/code/electron-main/env.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import * as paths from 'vs/base/common/paths';
1616
import * as platform from 'vs/base/common/platform';
1717
import URI from 'vs/base/common/uri';
1818
import * as types from 'vs/base/common/types';
19-
import { ServiceIdentifier, createDecorator } from 'vs/platform/instantiation/common/instantiation';
19+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
2020
import product, { IProductConfiguration } from 'vs/platform/product';
2121
import { parseArgs } from 'vs/code/node/argv';
2222
import pkg from 'vs/platform/package';
@@ -49,7 +49,7 @@ export interface ICommandLineArguments {
4949
export const IEnvironmentService = createDecorator<IEnvironmentService>('mainEnvironmentService');
5050

5151
export interface IEnvironmentService {
52-
serviceId: ServiceIdentifier<any>;
52+
_serviceBrand: any;
5353
cliArgs: ICommandLineArguments;
5454
userExtensionsHome: string;
5555
isTestingFromCli: boolean;
@@ -84,7 +84,7 @@ function getNumericValue(value: string, defaultValue: number, fallback: number =
8484

8585
export class EnvService implements IEnvironmentService {
8686

87-
serviceId = IEnvironmentService;
87+
_serviceBrand: any;
8888

8989
private _cliArgs: ICommandLineArguments;
9090
get cliArgs(): ICommandLineArguments { return this._cliArgs; }

‎src/vs/code/electron-main/lifecycle.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ipcMain as ipc, app } from 'electron';
1010
import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
1111
import { ReadyState, VSCodeWindow } from 'vs/code/electron-main/window';
1212
import { IEnvironmentService } from 'vs/code/electron-main/env';
13-
import { ServiceIdentifier, createDecorator } from 'vs/platform/instantiation/common/instantiation';
13+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1414
import { ILogService } from 'vs/code/electron-main/log';
1515
import { IStorageService } from 'vs/code/electron-main/storage';
1616

@@ -21,7 +21,7 @@ const EventTypes = {
2121
export const ILifecycleService = createDecorator<ILifecycleService>('lifecycleService');
2222

2323
export interface ILifecycleService {
24-
serviceId: ServiceIdentifier<any>;
24+
_serviceBrand: any;
2525

2626
/**
2727
* Will be true if an update was applied. Will only be true for each update once.
@@ -37,7 +37,7 @@ export interface ILifecycleService {
3737

3838
export class LifecycleService implements ILifecycleService {
3939

40-
serviceId = ILifecycleService;
40+
_serviceBrand: any;
4141

4242
private static QUIT_FROM_UPDATE_MARKER = 'quit.from.update'; // use a marker to find out if an update was applied in the previous session
4343

‎src/vs/code/electron-main/log.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55

66
'use strict';
77

8-
import { ServiceIdentifier, createDecorator } from 'vs/platform/instantiation/common/instantiation';
8+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
99
import { IEnvironmentService } from 'vs/code/electron-main/env';
1010

1111
export const ILogService = createDecorator<ILogService>('logService');
1212

1313
export interface ILogService {
14-
serviceId: ServiceIdentifier<any>;
14+
_serviceBrand: any;
1515
log(...args: any[]): void;
1616
}
1717

1818
export class MainLogService implements ILogService {
1919

20-
serviceId = ILogService;
20+
_serviceBrand: any;
2121

2222
constructor( @IEnvironmentService private envService: IEnvironmentService) {
2323
}

‎src/vs/code/electron-main/settings.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
'use strict';
77

88
import { app } from 'electron';
9-
import { ServiceIdentifier, createDecorator } from 'vs/platform/instantiation/common/instantiation';
9+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1010
import { UserSettings, ISettings } from 'vs/workbench/node/userSettings';
1111
import { IEnvironmentService } from 'vs/code/electron-main/env';
1212
import Event from 'vs/base/common/event';
1313

1414
export const ISettingsService = createDecorator<ISettingsService>('settingsService');
1515

1616
export interface ISettingsService {
17-
serviceId: ServiceIdentifier<any>;
17+
_serviceBrand: any;
1818
globalSettings: ISettings;
1919
loadSync(): boolean;
2020
getValue<T>(key: string, fallback?: T): T;
@@ -23,7 +23,7 @@ export interface ISettingsService {
2323

2424
export class SettingsManager extends UserSettings implements ISettingsService {
2525

26-
serviceId = ISettingsService;
26+
_serviceBrand: any;
2727

2828
constructor(@IEnvironmentService envService: IEnvironmentService) {
2929
super(envService.appSettingsPath, envService.appKeybindingsPath);

‎src/vs/code/electron-main/storage.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as path from 'path';
99
import * as fs from 'original-fs';
1010
import { EventEmitter } from 'events';
1111
import { IEnvironmentService } from 'vs/code/electron-main/env';
12-
import { ServiceIdentifier, createDecorator } from 'vs/platform/instantiation/common/instantiation';
12+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1313

1414
const EventTypes = {
1515
STORE: 'store'
@@ -18,7 +18,7 @@ const EventTypes = {
1818
export const IStorageService = createDecorator<IStorageService>('storageService');
1919

2020
export interface IStorageService {
21-
serviceId: ServiceIdentifier<any>;
21+
_serviceBrand: any;
2222
onStore<T>(clb: (key: string, oldValue: T, newValue: T) => void): () => void;
2323
getItem<T>(key: string, defaultValue?: T): T;
2424
setItem(key: string, data: any): void;
@@ -27,7 +27,7 @@ export interface IStorageService {
2727

2828
export class StorageService implements IStorageService {
2929

30-
serviceId = IStorageService;
30+
_serviceBrand: any;
3131

3232
private dbPath: string;
3333
private database: any = null;

‎src/vs/code/electron-main/update-manager.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { ISettingsService } from 'vs/code/electron-main/settings';
1515
import { Win32AutoUpdaterImpl } from 'vs/code/electron-main/auto-updater.win32';
1616
import { LinuxAutoUpdaterImpl } from 'vs/code/electron-main/auto-updater.linux';
1717
import { ILifecycleService } from 'vs/code/electron-main/lifecycle';
18-
import { ServiceIdentifier, createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
18+
import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1919

2020
export enum State {
2121
Uninitialized,
@@ -45,7 +45,7 @@ interface IAutoUpdater extends NodeJS.EventEmitter {
4545
export const IUpdateService = createDecorator<IUpdateService>('updateService');
4646

4747
export interface IUpdateService {
48-
serviceId: ServiceIdentifier<any>;
48+
_serviceBrand: any;
4949
feedUrl: string;
5050
channel: string;
5151
initialize(): void;
@@ -58,7 +58,7 @@ export interface IUpdateService {
5858

5959
export class UpdateManager extends EventEmitter implements IUpdateService {
6060

61-
serviceId = IUpdateService;
61+
_serviceBrand: any;
6262

6363
private _state: State;
6464
private explicitState: ExplicitState;

‎src/vs/code/electron-main/windows.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { ILifecycleService } from 'vs/code/electron-main/lifecycle';
2222
import { ISettingsService } from 'vs/code/electron-main/settings';
2323
import { IUpdateService, IUpdate } from 'vs/code/electron-main/update-manager';
2424
import { ILogService } from 'vs/code/electron-main/log';
25-
import { ServiceIdentifier, createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
25+
import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
2626

2727
const EventTypes = {
2828
OPEN: 'open',
@@ -83,7 +83,7 @@ const ReopenFoldersSetting = {
8383
export const IWindowsService = createDecorator<IWindowsService>('windowsService');
8484

8585
export interface IWindowsService {
86-
serviceId: ServiceIdentifier<any>;
86+
_serviceBrand: any;
8787

8888
// TODO make proper events
8989
// events
@@ -113,7 +113,7 @@ export interface IWindowsService {
113113

114114
export class WindowsManager implements IWindowsService {
115115

116-
serviceId = IWindowsService;
116+
_serviceBrand: any;
117117

118118
public static openedPathsListStorageKey = 'openedPathsList';
119119

‎src/vs/editor/browser/standalone/simpleServices.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export interface IOpenEditorDelegate {
7373
}
7474

7575
export class SimpleEditorService implements IEditorService {
76-
public serviceId = IEditorService;
76+
public _serviceBrand: any;
7777

7878
private editor:SimpleEditor;
7979
private openEditorDelegate:IOpenEditorDelegate;
@@ -164,7 +164,7 @@ export class SimpleEditorService implements IEditorService {
164164
}
165165

166166
export class SimpleMessageService implements IMessageService {
167-
public serviceId = IMessageService;
167+
public _serviceBrand: any;
168168

169169
private static Empty = function() { /* nothing */};
170170

‎src/vs/editor/common/services/abstractCodeEditorService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {ICommonCodeEditor, IDecorationRenderOptions, IModelDecorationOptions} fr
99
import {ICodeEditorService} from 'vs/editor/common/services/codeEditorService';
1010

1111
export abstract class AbstractCodeEditorService implements ICodeEditorService {
12-
public serviceId = ICodeEditorService;
12+
public _serviceBrand: any;
1313
private _onCodeEditorAdd: Emitter<ICommonCodeEditor>;
1414
private _onCodeEditorRemove: Emitter<ICommonCodeEditor>;
1515
private _codeEditors: {

‎src/vs/editor/common/services/codeEditorService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
'use strict';
66

77
import Event from 'vs/base/common/event';
8-
import {ServiceIdentifier, createDecorator} from 'vs/platform/instantiation/common/instantiation';
8+
import {createDecorator} from 'vs/platform/instantiation/common/instantiation';
99
import {ICommonCodeEditor, IDecorationRenderOptions, IModelDecorationOptions} from 'vs/editor/common/editorCommon';
1010

1111
export var ID_CODE_EDITOR_SERVICE = 'codeEditorService';
1212
export var ICodeEditorService = createDecorator<ICodeEditorService>(ID_CODE_EDITOR_SERVICE);
1313

1414
export interface ICodeEditorService {
15-
serviceId: ServiceIdentifier<any>;
15+
_serviceBrand: any;
1616

1717
addCodeEditor(editor: ICommonCodeEditor): void;
1818
onCodeEditorAdd: Event<ICommonCodeEditor>;

0 commit comments

Comments
 (0)