mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-17 07:13:45 +01:00
Merge pull request #300350 from mjbvz/dev/mjbvz/appalling-tahr
Reduce `any` usage in consoleForwarder
This commit is contained in:
@@ -46,13 +46,13 @@ export abstract class AbstractExtHostConsoleForwarder {
|
||||
|
||||
Object.defineProperty(console, method, {
|
||||
set: () => { },
|
||||
get: () => function () {
|
||||
that._handleConsoleCall(method, severity, original, arguments);
|
||||
get: () => (...args: unknown[]) => {
|
||||
that._handleConsoleCall(method, severity, original, args);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
private _handleConsoleCall(method: 'log' | 'info' | 'warn' | 'error' | 'debug', severity: 'log' | 'warn' | 'error' | 'debug', original: (...args: any[]) => void, args: IArguments): void {
|
||||
private _handleConsoleCall(method: 'log' | 'info' | 'warn' | 'error' | 'debug', severity: 'log' | 'warn' | 'error' | 'debug', original: (...args: unknown[]) => void, args: unknown[]): void {
|
||||
this._mainThreadConsole.$logExtensionHostMessage({
|
||||
type: '__$console',
|
||||
severity,
|
||||
@@ -63,7 +63,7 @@ export abstract class AbstractExtHostConsoleForwarder {
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract _nativeConsoleLogMessage(method: 'log' | 'info' | 'warn' | 'error' | 'debug', original: (...args: any[]) => void, args: IArguments): void;
|
||||
protected abstract _nativeConsoleLogMessage(method: 'log' | 'info' | 'warn' | 'error' | 'debug', original: (...args: unknown[]) => void, args: unknown[]): void;
|
||||
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ const MAX_LENGTH = 100000;
|
||||
/**
|
||||
* Prevent circular stringify and convert arguments to real array
|
||||
*/
|
||||
function safeStringifyArgumentsToArray(args: IArguments, includeStack: boolean): string {
|
||||
function safeStringifyArgumentsToArray(args: unknown[], includeStack: boolean): string {
|
||||
const argsArray = [];
|
||||
|
||||
// Massage some arguments with special treatment
|
||||
|
||||
@@ -24,12 +24,11 @@ export class ExtHostConsoleForwarder extends AbstractExtHostConsoleForwarder {
|
||||
this._wrapStream('stdout', 'log');
|
||||
}
|
||||
|
||||
protected override _nativeConsoleLogMessage(method: 'log' | 'info' | 'warn' | 'error' | 'debug', original: (...args: any[]) => void, args: IArguments) {
|
||||
protected override _nativeConsoleLogMessage(method: 'log' | 'info' | 'warn' | 'error' | 'debug', original: (...args: unknown[]) => void, args: unknown[]): void {
|
||||
const stream = method === 'error' || method === 'warn' ? process.stderr : process.stdout;
|
||||
this._isMakingConsoleCall = true;
|
||||
stream.write(`\n${NativeLogMarkers.Start}\n`);
|
||||
// eslint-disable-next-line local/code-no-any-casts
|
||||
original.apply(console, args as any);
|
||||
original.apply(console, args);
|
||||
stream.write(`\n${NativeLogMarkers.End}\n`);
|
||||
this._isMakingConsoleCall = false;
|
||||
}
|
||||
|
||||
@@ -16,8 +16,7 @@ export class ExtHostConsoleForwarder extends AbstractExtHostConsoleForwarder {
|
||||
super(extHostRpc, initData);
|
||||
}
|
||||
|
||||
protected override _nativeConsoleLogMessage(_method: unknown, original: (...args: any[]) => void, args: IArguments) {
|
||||
// eslint-disable-next-line local/code-no-any-casts
|
||||
original.apply(console, args as any);
|
||||
protected override _nativeConsoleLogMessage(_method: unknown, original: (...args: unknown[]) => void, args: unknown[]) {
|
||||
original.apply(console, args);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user