Add commands to control workspace shell settings

Fixes microsoft#23362

src/vs/workbench/parts/terminal/common/terminal.ts

@@ -71,6 +71,8 @@ export interface ITerminalConfigHelper {
  * Merges the default shell path and args into the provided launch configuration
  */
  mergeDefaultShellPathAndArgs(shell: IShellLaunchConfig): void;
+ /** Sets whether a workspace shell configuration is allowed or not */
+ setWorkspaceShellAllowed(isAllowed: boolean): void;
 }
 
 export interface ITerminalFont {
@@ -146,6 +148,7 @@ export interface ITerminalService {
  setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
  updateConfig(): void;
  selectDefaultWindowsShell(): TPromise<string>;
+ setWorkspaceShellAllowed(isAllowed: boolean): void;
 }
 
 export interface ITerminalInstance {

src/vs/workbench/parts/terminal/common/terminalService.ts

@@ -210,4 +210,8 @@ export abstract class TerminalService implements ITerminalService {
  public updateConfig(): void {
  this.terminalInstances.forEach(instance => instance.updateConfig());
  }
+
+ public setWorkspaceShellAllowed(isAllowed: boolean): void {
+ this.configHelper.setWorkspaceShellAllowed(isAllowed);
+ }
 }

src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts

@@ -17,7 +17,7 @@ import { TERMINAL_DEFAULT_SHELL_LINUX, TERMINAL_DEFAULT_SHELL_OSX, TERMINAL_DEFA
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actionRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KillTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, FocusTerminalAtIndexAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
+import { KillTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, FocusTerminalAtIndexAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Registry } from 'vs/platform/platform';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
@@ -266,5 +266,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClearTerminalAct
 if (platform.isWindows) {
  actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SelectDefaultShellWindowsTerminalAction, SelectDefaultShellWindowsTerminalAction.ID, SelectDefaultShellWindowsTerminalAction.LABEL), 'Terminal: Select Default Shell', category);
 }
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(AllowWorkspaceShellTerminalCommand, AllowWorkspaceShellTerminalCommand.ID, AllowWorkspaceShellTerminalCommand.LABEL), 'Terminal: Allow Workspace Shell Configuration', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(DisallowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand.ID, DisallowWorkspaceShellTerminalCommand.LABEL), 'Terminal: Disallow Workspace Shell Configuration', category);
 
 registerColors();

src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts

@@ -496,4 +496,40 @@ export class ClearTerminalAction extends Action {
  }
  return TPromise.as(void 0);
  }
-}
+}
+
+export class AllowWorkspaceShellTerminalCommand extends Action {
+
+ public static ID = 'workbench.action.terminal.allowWorkspaceShell';
+ public static LABEL = nls.localize('workbench.action.terminal.allowWorkspaceShell', "Allow Workspace Shell Configuration");
+
+ constructor(
+ id: string, label: string,
+ @ITerminalService private terminalService: ITerminalService
+ ) {
+ super(id, label);
+ }
+
+ public run(event?: any): TPromise<any> {
+ this.terminalService.setWorkspaceShellAllowed(true);
+ return TPromise.as(void 0);
+ }
+}
+
+export class DisallowWorkspaceShellTerminalCommand extends Action {
+
+ public static ID = 'workbench.action.terminal.disallowWorkspaceShell';
+ public static LABEL = nls.localize('workbench.action.terminal.disallowWorkspaceShell', "Disallow Workspace Shell Configuration");
+
+ constructor(
+ id: string, label: string,
+ @ITerminalService private terminalService: ITerminalService
+ ) {
+ super(id, label);
+ }
+
+ public run(event?: any): TPromise<any> {
+ this.terminalService.setWorkspaceShellAllowed(false);
+ return TPromise.as(void 0);
+ }
+}

src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts

@@ -100,6 +100,10 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
  return this._measureFont(fontFamily, fontSize, lineHeight);
  }
 
+ public setWorkspaceShellAllowed(isAllowed: boolean): void {
+ this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, isAllowed, StorageScope.WORKSPACE);
+ }
+
  public mergeDefaultShellPathAndArgs(shell: IShellLaunchConfig): void {
  // Check whether there is a workspace setting
  const platformKey = platform.isWindows ? 'windows' : platform.isMacintosh ? 'osx' : 'linux';