Skip to content

Commit b30d9c3

Browse files
committed
Remove trace decorator and unused platform consts
1 parent 01450f0 commit b30d9c3

3 files changed

Lines changed: 1 addition & 39 deletions

File tree

addons/addon-webgl/src/WebglAddon.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRender
99
import { ITerminal } from 'browser/Types';
1010
import { Disposable, toDisposable } from 'common/Lifecycle';
1111
import { getSafariVersion, isSafari } from 'common/Platform';
12-
import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
12+
import { ICoreService, IDecorationService, IOptionsService } from 'common/services/Services';
1313
import { IWebGL2RenderingContext } from './Types';
1414
import { WebglRenderer } from './WebglRenderer';
15-
import { setTraceLogger } from 'common/services/LogService';
1615
import { Emitter, EventUtils } from 'common/Event';
1716

1817
export class WebglAddon extends Disposable implements ITerminalAddon , IWebglApi {
@@ -66,13 +65,8 @@ export class WebglAddon extends Disposable implements ITerminalAddon , IWebglApi
6665
const charSizeService: ICharSizeService = unsafeCore._charSizeService;
6766
const coreBrowserService: ICoreBrowserService = unsafeCore._coreBrowserService;
6867
const decorationService: IDecorationService = unsafeCore._decorationService;
69-
const logService: ILogService = unsafeCore._logService;
7068
const themeService: IThemeService = unsafeCore._themeService;
7169

72-
// Set trace logger just in case it hasn't been yet which could happen when the addon is
73-
// bundled separately to the core module
74-
setTraceLogger(logService);
75-
7670
this._renderer = this._register(new WebglRenderer(
7771
terminal,
7872
characterJoinerService,

src/common/Platform.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ export function getSafariVersion(): number {
3939
// and ISO third level shifts.
4040
// http://stackoverflow.com/q/19877924/577598
4141
export const isMac = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'].includes(platform);
42-
export const isIpad = platform === 'iPad';
43-
export const isIphone = platform === 'iPhone';
4442
export const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].includes(platform);
4543
export const isLinux = platform.indexOf('Linux') >= 0;
4644
// Note that when this is true, isLinux will also be true.

src/common/services/LogService.ts

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ export class LogService extends Disposable implements ILogService {
4343
super();
4444
this._updateLogLevel();
4545
this._register(this._optionsService.onSpecificOptionChange('logLevel', () => this._updateLogLevel()));
46-
47-
// For trace logging, assume the latest created log service is valid
48-
traceLogger = this;
4946
}
5047

5148
private _updateLogLevel(): void {
@@ -95,30 +92,3 @@ export class LogService extends Disposable implements ILogService {
9592
}
9693
}
9794
}
98-
99-
let traceLogger: ILogService;
100-
export function setTraceLogger(logger: ILogService): void {
101-
traceLogger = logger;
102-
}
103-
104-
/**
105-
* A decorator that can be used to automatically log trace calls to the decorated function.
106-
*/
107-
export function traceCall(_target: any, key: string, descriptor: any): any {
108-
if (typeof descriptor.value !== 'function') {
109-
throw new Error('not supported');
110-
}
111-
const fnKey = 'value';
112-
const fn = descriptor.value;
113-
descriptor[fnKey] = function (...args: any[]) {
114-
// Early exit
115-
if (traceLogger.logLevel !== LogLevelEnum.TRACE) {
116-
return fn.apply(this, args);
117-
}
118-
119-
traceLogger.trace(`GlyphRenderer#${fn.name}(${args.map(e => JSON.stringify(e)).join(', ')})`);
120-
const result = fn.apply(this, args);
121-
traceLogger.trace(`GlyphRenderer#${fn.name} return`, result);
122-
return result;
123-
};
124-
}

0 commit comments

Comments
 (0)