From e08e8b025f615ccaacfe461f66ddae35795fd45d Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 14 Jun 2019 09:15:39 -0700
Subject: [PATCH] Move window.shell to env.shell

Part of #75091
---
 src/vs/vscode.proposed.d.ts                   | 12 ++++++------
 src/vs/workbench/api/node/extHost.api.impl.ts |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index f75173510e5..edcdf8c66a7 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -629,6 +629,12 @@ declare module 'vscode' {
 		 */
 		export const logLevel: LogLevel;
 
+		/**
+		 * The detected default shell for the extension host, this is overridden by the
+		 * `terminal.integrated.shell` setting for the extension host's platform.
+		 */
+		export const shell: string;
+
 		/**
 		 * An [event](#Event) that fires when the log level has changed.
 		 */
@@ -1110,12 +1116,6 @@ declare module 'vscode' {
 	}
 
 	namespace window {
-		/**
-		 * The detected default shell for the extension host, this is overridden by the
-		 * `terminal.integrated.shell` setting for the extension host's platform.
-		 */
-		export const shell: string;
-
 		/**
 		 * An event which fires when the [dimensions](#Terminal.dimensions) of the terminal change.
 		 */
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 12450c7efb0..126d3e3d6bd 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -254,6 +254,9 @@ export function createApiFactory(
 			get clipboard(): vscode.Clipboard {
 				return extHostClipboard;
 			},
+			get shell() {
+				return extHostTerminalService.getDefaultShell(configProvider);
+			},
 			openExternal(uri: URI) {
 				return extHostWindow.openUri(uri, { allowTunneling: !!initData.remoteAuthority });
 			}
@@ -389,9 +392,6 @@ export function createApiFactory(
 			get terminals() {
 				return extHostTerminalService.terminals;
 			},
-			get shell() {
-				return extHostTerminalService.getDefaultShell(configProvider);
-			},
 			showTextDocument(documentOrUri: vscode.TextDocument | vscode.Uri, columnOrOptions?: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): Thenable<vscode.TextEditor> {
 				let documentPromise: Promise<vscode.TextDocument>;
 				if (URI.isUri(documentOrUri)) {