Fix naming issue with serviceBrand

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<void> = new EventEmitter<void>().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');
   }

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;

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,

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;

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;
 

src/browser/services/Services.ts

@@ -11,7 +11,7 @@ import { createDecorator } from 'common/services/ServiceRegistry';
 
 export const ICharSizeService = createDecorator<ICharSizeService>('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<IMouseService>('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<IRenderService>('RenderService');
 export interface IRenderService {
-  _serviceBrand: any;
+  serviceBrand: any;
 
   onDimensionsChange: IEvent<IRenderDimensions>;
   onRender: IEvent<{ start: number, end: number }>;
@@ -60,7 +60,7 @@ export interface IRenderService {
 
 export const ISelectionService = createDecorator<ISelectionService>('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<ISoundService>('SoundService');
 export interface ISoundService {
-  _serviceBrand: any;
+  serviceBrand: any;
 
   playBellSound(): void;
 }

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;