diff --git a/src/browser/TestUtils.test.ts b/src/browser/TestUtils.test.ts index 70624e48..60861112 100644 --- a/src/browser/TestUtils.test.ts +++ b/src/browser/TestUtils.test.ts @@ -7,7 +7,7 @@ import { IEvent, EventEmitter } from 'common/EventEmitter'; import { ICharSizeService, IMouseService } from 'browser/services/Services'; export class MockCharSizeService implements ICharSizeService { - _serviceBrand: any; + serviceBrand: any; get hasValidSize(): boolean { return this.width > 0 && this.height > 0; } onCharSizeChange: IEvent = new EventEmitter().event; constructor(public width: number, public height: number) {} @@ -15,7 +15,7 @@ export class MockCharSizeService implements ICharSizeService { } export class MockMouseService implements IMouseService { - _serviceBrand: any; + serviceBrand: any; public getCoords(event: {clientX: number, clientY: number}, element: HTMLElement, colCount: number, rowCount: number, isSelection?: boolean): [number, number] | undefined { throw new Error('Not implemented'); } diff --git a/src/browser/services/CharSizeService.ts b/src/browser/services/CharSizeService.ts index 6f381c69..0749a420 100644 --- a/src/browser/services/CharSizeService.ts +++ b/src/browser/services/CharSizeService.ts @@ -8,7 +8,7 @@ import { IEvent, EventEmitter } from 'common/EventEmitter'; import { ICharSizeService } from 'browser/services/Services'; export class CharSizeService implements ICharSizeService { - _serviceBrand: any; + serviceBrand: any; public width: number = 0; public height: number = 0; diff --git a/src/browser/services/MouseService.ts b/src/browser/services/MouseService.ts index 306cde59..b0f8c358 100644 --- a/src/browser/services/MouseService.ts +++ b/src/browser/services/MouseService.ts @@ -7,7 +7,7 @@ import { ICharSizeService, IRenderService, IMouseService } from './Services'; import { getCoords, getRawByteCoords } from 'browser/input/Mouse'; export class MouseService implements IMouseService { - _serviceBrand: any; + serviceBrand: any; constructor( @IRenderService private readonly _renderService: IRenderService, diff --git a/src/browser/services/RenderService.ts b/src/browser/services/RenderService.ts index 72ce77a8..ecf20e28 100644 --- a/src/browser/services/RenderService.ts +++ b/src/browser/services/RenderService.ts @@ -14,7 +14,7 @@ import { IOptionsService } from 'common/services/Services'; import { ICharSizeService, IRenderService } from 'browser/services/Services'; export class RenderService extends Disposable implements IRenderService { - _serviceBrand: any; + serviceBrand: any; private _renderDebouncer: RenderDebouncer; private _screenDprMonitor: ScreenDprMonitor; diff --git a/src/browser/services/SelectionService.ts b/src/browser/services/SelectionService.ts index dd7fe48e..e4c703eb 100644 --- a/src/browser/services/SelectionService.ts +++ b/src/browser/services/SelectionService.ts @@ -67,7 +67,7 @@ export const enum SelectionMode { * when the selection is ready to be redrawn (on an animation frame). */ export class SelectionService implements ISelectionService { - _serviceBrand: any; + serviceBrand: any; protected _model: SelectionModel; diff --git a/src/browser/services/Services.ts b/src/browser/services/Services.ts index 8c626e18..863f3a9e 100644 --- a/src/browser/services/Services.ts +++ b/src/browser/services/Services.ts @@ -11,7 +11,7 @@ import { createDecorator } from 'common/services/ServiceRegistry'; export const ICharSizeService = createDecorator('CharSizeService'); export interface ICharSizeService { - _serviceBrand: any; + serviceBrand: any; readonly width: number; readonly height: number; @@ -24,7 +24,7 @@ export interface ICharSizeService { export const IMouseService = createDecorator('MouseService'); export interface IMouseService { - _serviceBrand: any; + serviceBrand: any; getCoords(event: {clientX: number, clientY: number}, element: HTMLElement, colCount: number, rowCount: number, isSelection?: boolean): [number, number] | undefined; getRawByteCoords(event: MouseEvent, element: HTMLElement, colCount: number, rowCount: number): { x: number, y: number } | undefined; @@ -32,7 +32,7 @@ export interface IMouseService { export const IRenderService = createDecorator('RenderService'); export interface IRenderService { - _serviceBrand: any; + serviceBrand: any; onDimensionsChange: IEvent; onRender: IEvent<{ start: number, end: number }>; @@ -60,7 +60,7 @@ export interface IRenderService { export const ISelectionService = createDecorator('SelectionService'); export interface ISelectionService { - _serviceBrand: any; + serviceBrand: any; readonly selectionText: string; readonly hasSelection: boolean; @@ -88,7 +88,7 @@ export interface ISelectionService { export const ISoundService = createDecorator('SoundService'); export interface ISoundService { - _serviceBrand: any; + serviceBrand: any; playBellSound(): void; } diff --git a/src/browser/services/SoundService.ts b/src/browser/services/SoundService.ts index 89353f45..1772c750 100644 --- a/src/browser/services/SoundService.ts +++ b/src/browser/services/SoundService.ts @@ -7,7 +7,7 @@ import { IOptionsService } from 'common/services/Services'; import { ISoundService } from 'browser/services/Services'; export class SoundService implements ISoundService { - _serviceBrand: any; + serviceBrand: any; private static _audioContext: AudioContext; diff --git a/src/common/TestUtils.test.ts b/src/common/TestUtils.test.ts index 60ae3225..ec36be2f 100644 --- a/src/common/TestUtils.test.ts +++ b/src/common/TestUtils.test.ts @@ -12,7 +12,7 @@ import { BufferSet } from 'common/buffer/BufferSet'; import { IDecPrivateModes } from 'common/Types'; export class MockBufferService implements IBufferService { - _serviceBrand: any; + serviceBrand: any; public get buffer(): IBuffer { return this.buffers.active; } public buffers: IBufferSet = {} as any; constructor( @@ -30,7 +30,7 @@ export class MockBufferService implements IBufferService { } export class MockCoreService implements ICoreService { - _serviceBrand: any; + serviceBrand: any; decPrivateModes: IDecPrivateModes = {} as any; onData: IEvent = new EventEmitter().event; onUserInput: IEvent = new EventEmitter().event; @@ -39,7 +39,7 @@ export class MockCoreService implements ICoreService { } export class MockDirtyRowService implements IDirtyRowService { - _serviceBrand: any; + serviceBrand: any; start: number = 0; end: number = 0; clearRange(): void {} @@ -49,7 +49,7 @@ export class MockDirtyRowService implements IDirtyRowService { } export class MockLogService implements ILogService { - _serviceBrand: any; + serviceBrand: any; debug(message: any, ...optionalParams: any[]): void {} info(message: any, ...optionalParams: any[]): void {} warn(message: any, ...optionalParams: any[]): void {} @@ -57,7 +57,7 @@ export class MockLogService implements ILogService { } export class MockOptionsService implements IOptionsService { - _serviceBrand: any; + serviceBrand: any; options: ITerminalOptions = clone(DEFAULT_OPTIONS); onOptionChange: IEvent = new EventEmitter().event; constructor(testOptions?: IPartialTerminalOptions) { diff --git a/src/common/services/BufferService.ts b/src/common/services/BufferService.ts index 130fbee2..c7b6afce 100644 --- a/src/common/services/BufferService.ts +++ b/src/common/services/BufferService.ts @@ -11,7 +11,7 @@ export const MINIMUM_COLS = 2; // Less than 2 can mess with wide chars export const MINIMUM_ROWS = 1; export class BufferService implements IBufferService { - _serviceBrand: any; + serviceBrand: any; public cols: number; public rows: number; diff --git a/src/common/services/CoreService.ts b/src/common/services/CoreService.ts index 3887d95a..674cfedb 100644 --- a/src/common/services/CoreService.ts +++ b/src/common/services/CoreService.ts @@ -13,7 +13,7 @@ const DEFAULT_DEC_PRIVATE_MODES: IDecPrivateModes = Object.freeze({ }); export class CoreService implements ICoreService { - _serviceBrand: any; + serviceBrand: any; public decPrivateModes: IDecPrivateModes; diff --git a/src/common/services/DirtyRowService.ts b/src/common/services/DirtyRowService.ts index 835d4069..0f2f14f5 100644 --- a/src/common/services/DirtyRowService.ts +++ b/src/common/services/DirtyRowService.ts @@ -6,7 +6,7 @@ import { IBufferService, IDirtyRowService } from 'common/services/Services'; export class DirtyRowService implements IDirtyRowService { - _serviceBrand: any; + serviceBrand: any; private _start!: number; private _end!: number; diff --git a/src/common/services/LogService.ts b/src/common/services/LogService.ts index 1e14f06c..6740ad4a 100644 --- a/src/common/services/LogService.ts +++ b/src/common/services/LogService.ts @@ -37,7 +37,7 @@ const optionsKeyToLogLevel: { [key: string]: LogLevel } = { const LOG_PREFIX = 'xterm.js: '; export class LogService implements ILogService { - _serviceBrand: any; + serviceBrand: any; private _logLevel!: LogLevel; diff --git a/src/common/services/OptionsService.ts b/src/common/services/OptionsService.ts index 4f534dc4..9a5d2151 100644 --- a/src/common/services/OptionsService.ts +++ b/src/common/services/OptionsService.ts @@ -56,7 +56,7 @@ export const DEFAULT_OPTIONS: ITerminalOptions = Object.freeze({ const CONSTRUCTOR_ONLY_OPTIONS = ['cols', 'rows']; export class OptionsService implements IOptionsService { - _serviceBrand: any; + serviceBrand: any; public options: ITerminalOptions; diff --git a/src/common/services/Services.ts b/src/common/services/Services.ts index 4ff0bc0c..1af55e9a 100644 --- a/src/common/services/Services.ts +++ b/src/common/services/Services.ts @@ -10,7 +10,7 @@ import { createDecorator } from 'common/services/ServiceRegistry'; export const IBufferService = createDecorator('BufferService'); export interface IBufferService { - _serviceBrand: any; + serviceBrand: any; readonly cols: number; readonly rows: number; @@ -25,7 +25,7 @@ export interface IBufferService { export const ICoreService = createDecorator('CoreService'); export interface ICoreService { - _serviceBrand: any; + serviceBrand: any; readonly decPrivateModes: IDecPrivateModes; @@ -47,7 +47,7 @@ export interface ICoreService { export const IDirtyRowService = createDecorator('DirtyRowService'); export interface IDirtyRowService { - _serviceBrand: any; + serviceBrand: any; readonly start: number; readonly end: number; @@ -64,39 +64,39 @@ export interface IServiceIdentifier { } export interface IConstructorSignature0 { - new(...services: { _serviceBrand: any; }[]): T; + new(...services: { serviceBrand: any; }[]): T; } export interface IConstructorSignature1 { - new(first: A1, ...services: { _serviceBrand: any; }[]): T; + new(first: A1, ...services: { serviceBrand: any; }[]): T; } export interface IConstructorSignature2 { - new(first: A1, second: A2, ...services: { _serviceBrand: any; }[]): T; + new(first: A1, second: A2, ...services: { serviceBrand: any; }[]): T; } export interface IConstructorSignature3 { - new(first: A1, second: A2, third: A3, ...services: { _serviceBrand: any; }[]): T; + new(first: A1, second: A2, third: A3, ...services: { serviceBrand: any; }[]): T; } export interface IConstructorSignature4 { - new(first: A1, second: A2, third: A3, fourth: A4, ...services: { _serviceBrand: any; }[]): T; + new(first: A1, second: A2, third: A3, fourth: A4, ...services: { serviceBrand: any; }[]): T; } export interface IConstructorSignature5 { - new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, ...services: { _serviceBrand: any; }[]): T; + new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, ...services: { serviceBrand: any; }[]): T; } export interface IConstructorSignature6 { - new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, ...services: { _serviceBrand: any; }[]): T; + new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, ...services: { serviceBrand: any; }[]): T; } export interface IConstructorSignature7 { - new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, ...services: { _serviceBrand: any; }[]): T; + new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, ...services: { serviceBrand: any; }[]): T; } export interface IConstructorSignature8 { - new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, eigth: A8, ...services: { _serviceBrand: any; }[]): T; + new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, eigth: A8, ...services: { serviceBrand: any; }[]): T; } export const IInstantiationService = createDecorator('InstantiationService'); @@ -116,7 +116,7 @@ export interface IInstantiationService { export const ILogService = createDecorator('LogService'); export interface ILogService { - _serviceBrand: any; + serviceBrand: any; debug(message: any, ...optionalParams: any[]): void; info(message: any, ...optionalParams: any[]): void; @@ -126,7 +126,7 @@ export interface ILogService { export const IOptionsService = createDecorator('OptionsService'); export interface IOptionsService { - _serviceBrand: any; + serviceBrand: any; readonly options: ITerminalOptions; diff --git a/tslint.json b/tslint.json index 4445e97c..43662039 100644 --- a/tslint.json +++ b/tslint.json @@ -94,8 +94,6 @@ {"type": "member", "modifiers": ["private"], "format": "camelCase", "leadingUnderscore": "require"}, {"type": "variable", "modifiers": ["const"], "format": ["camelCase", "UPPER_CASE"]}, {"type": "variable", "modifiers": ["const", "export"], "filter": "^I.+Service$", "format": "PascalCase", "prefix": "I"}, - {"type": "member", "filter": "^_serviceBrand$", "leadingUnderscore": "require"}, - {"type": "property", "filter": "^_serviceBrand$", "leadingUnderscore": "require"}, {"type": "interface", "prefix": "I"} ], "no-else-after-return": {