Fix 37385 by introducing addition configuration setting

Anton Vildyaev · Anton Vildyaev · commit 6387ea60fd0c · 2017-11-06T13:11:14.000+01:00
diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
@@ -47,6 +47,11 @@ export const INTERNAL_CONSOLE_OPTIONS_SCHEMA = {
 	default: 'openOnFirstSessionStart',
 	description: nls.localize('internalConsoleOptions', "Controls behavior of the internal debug console.")
 };
+export const DEBUG_VIEWLET_OPTIONS_SCHEMA = {
+	enum: ['neverOpen', 'openOnSessionStart', 'openOnFirstSessionStart'],
+	default: 'openOnFirstSessionStart',
+	description: nls.localize('debugViewletOptions', "Controls whether debug viewlet should be open on debugging session start.")
+};
 
 // raw
 
@@ -323,6 +328,7 @@ export interface IDebugConfiguration {
 	inlineValues: boolean;
 	hideActionBar: boolean;
 	internalConsoleOptions: string;
+	debugViewletOptions: string;
 }
 
 export interface IGlobalConfig {
@@ -336,6 +342,7 @@ export interface IEnvConfig {
 	type: string;
 	request: string;
 	internalConsoleOptions?: string;
+	debugViewletOptions?: string;
 	preLaunchTask?: string;
 	__restart?: any;
 	__sessionId?: string;
diff --git a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
@@ -20,7 +20,7 @@ import { VariablesView, WatchExpressionsView, CallStackView, BreakpointsView } f
 import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
 import {
 	IDebugService, VIEWLET_ID, REPL_ID, CONTEXT_NOT_IN_DEBUG_MODE, CONTEXT_IN_DEBUG_MODE, INTERNAL_CONSOLE_OPTIONS_SCHEMA,
-	CONTEXT_DEBUG_STATE, VARIABLES_VIEW_ID, CALLSTACK_VIEW_ID, WATCH_VIEW_ID, BREAKPOINTS_VIEW_ID
+	CONTEXT_DEBUG_STATE, VARIABLES_VIEW_ID, CALLSTACK_VIEW_ID, WATCH_VIEW_ID, BREAKPOINTS_VIEW_ID, DEBUG_VIEWLET_OPTIONS_SCHEMA
 } from 'vs/workbench/parts/debug/common/debug';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
@@ -188,6 +188,7 @@ configurationRegistry.registerConfiguration({
 			default: false
 		},
 		'debug.internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
+		'debug.debugViewletOptions': DEBUG_VIEWLET_OPTIONS_SCHEMA,
 		'launch': {
 			type: 'object',
 			description: nls.localize({ comment: ['This is the description for a setting'], key: 'launch' }, "Global debug launch configuration. Should be used as an alternative to 'launch.json' that is shared across workspaces"),
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -872,8 +872,11 @@ export class DebugService implements debug.IDebugService {
 					this.panelService.openPanel(debug.REPL_ID, false).done(undefined, errors.onUnexpectedError);
 				}
 
-				if (!this.viewModel.changedWorkbenchViewState && (this.partService.isVisible(Parts.SIDEBAR_PART) || this.contextService.getWorkbenchState() === WorkbenchState.EMPTY)) {
-					// We only want to change the workbench view state on the first debug session #5738 and if the side bar is not hidden
+				const debugViewletOptions = configuration.debugViewletOptions || this.configurationService.getConfiguration<debug.IDebugConfiguration>('debug').debugViewletOptions;
+				// Open debug viewlet based on the visibility of the side bar and debugViewletOptions setting
+				if ((this.partService.isVisible(Parts.SIDEBAR_PART) || this.contextService.getWorkbenchState() === WorkbenchState.EMPTY)
+					&& ((debugViewletOptions === 'openOnSessionStart')
+						|| ((debugViewletOptions === 'openOnFirstSessionStart' && !this.viewModel.changedWorkbenchViewState)) {
 					this.viewModel.changedWorkbenchViewState = true;
 					this.viewletService.openViewlet(debug.VIEWLET_ID);
 				}

Original file line number	Diff line number	Diff line change
`@@ -872,8 +872,11 @@ export class DebugService implements debug.IDebugService {`
`872`	`872`	`this.panelService.openPanel(debug.REPL_ID, false).done(undefined, errors.onUnexpectedError);`
`873`	`873`	`}`
`874`	`874`
`875`		`- if (!this.viewModel.changedWorkbenchViewState && (this.partService.isVisible(Parts.SIDEBAR_PART) \|\| this.contextService.getWorkbenchState() === WorkbenchState.EMPTY)) {`
`876`		`- // We only want to change the workbench view state on the first debug session #5738 and if the side bar is not hidden`
	`875`	`+ const debugViewletOptions = configuration.debugViewletOptions \|\| this.configurationService.getConfiguration<debug.IDebugConfiguration>('debug').debugViewletOptions;`
	`876`	`+ // Open debug viewlet based on the visibility of the side bar and debugViewletOptions setting`
	`877`	`+ if ((this.partService.isVisible(Parts.SIDEBAR_PART) \|\| this.contextService.getWorkbenchState() === WorkbenchState.EMPTY)`
	`878`	`+ && ((debugViewletOptions === 'openOnSessionStart')`
	`879`	`+ \|\| ((debugViewletOptions === 'openOnFirstSessionStart' && !this.viewModel.changedWorkbenchViewState)) {`
`877`	`880`	`this.viewModel.changedWorkbenchViewState = true;`
`878`	`881`	`this.viewletService.openViewlet(debug.VIEWLET_ID);`
`879`	`882`	`}`