From 3d24f7854f8c42f26d2a9f91ecc7a9dd2b9f2580 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Fri, 7 Nov 2025 08:14:20 -0800 Subject: [PATCH] Remove in operator from platform/externalTerminal Part of #276071 --- eslint.config.js | 1 - .../externalTerminal/node/externalTerminalService.ts | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 69a9a692433..dab49945495 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -239,7 +239,6 @@ export default tseslint.config( 'src/vs/platform/contextkey/browser/contextKeyService.ts', 'src/vs/platform/contextkey/test/common/scanner.test.ts', 'src/vs/platform/dataChannel/browser/forwardingTelemetryService.ts', - 'src/vs/platform/externalTerminal/node/externalTerminalService.ts', 'src/vs/platform/hover/browser/hoverService.ts', 'src/vs/platform/hover/browser/hoverWidget.ts', 'src/vs/platform/instantiation/common/instantiationService.ts', diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts index ca6c82b31d7..0eaaf4b885d 100644 --- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts +++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts @@ -75,7 +75,7 @@ export class WindowsExternalTerminalService extends ExternalTerminalService impl } public async runInTerminal(title: string, dir: string, args: string[], envVars: ITerminalEnvironment, settings: IExternalTerminalSettings): Promise { - const exec = 'windowsExec' in settings && settings.windowsExec ? settings.windowsExec : WindowsExternalTerminalService.getDefaultTerminalWindows(); + const exec = settings.windowsExec ?? WindowsExternalTerminalService.getDefaultTerminalWindows(); const wt = await WindowsExternalTerminalService.getWtExePath(); return new Promise((resolve, reject) => { @@ -348,8 +348,8 @@ function getSanitizedEnvironment(process: NodeJS.Process) { * tries to turn OS errors into more meaningful error messages */ function improveError(err: Error & { errno?: string; path?: string }): Error { - if ('errno' in err && err['errno'] === 'ENOENT' && 'path' in err && typeof err['path'] === 'string') { - return new Error(nls.localize('ext.term.app.not.found', "can't find terminal application '{0}'", err['path'])); + if (err.errno === 'ENOENT' && err.path) { + return new Error(nls.localize('ext.term.app.not.found', "can't find terminal application '{0}'", err.path)); } return err; }