From 936c3361f3e0b6af32332ccc448893e69fc77937 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Fri, 13 Oct 2017 10:05:37 -0700 Subject: [PATCH] Removing env variables (#36242) --- src/vs/vscode.d.ts | 2 +- .../parts/terminal/electron-browser/terminalInstance.ts | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index a2df3e091fe..dcf0d7b8852 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -4855,7 +4855,7 @@ declare module 'vscode' { /** * Object with environment variables that will be added to the VS Code process. */ - env?: { [key: string]: string }; + env?: { [key: string]: string | null }; } /** diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts index 8c365585b2f..7916f16cc40 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts @@ -778,7 +778,12 @@ export class TerminalInstance implements ITerminalInstance { const env = TerminalInstance._cloneEnv(parentEnv); if (shell.env) { Object.keys(shell.env).forEach((key) => { - env[key] = shell.env[key]; + const value = shell.env[key]; + if (typeof value === 'string') { + env[key] = value; + } else { + delete env[key]; + } }); } -- GitLab