enable strictFunctionTypes

isidorn · isidorn · commit 5fe0604806c0 · 2019-10-07T13:06:00.000+02:00
microsoft#81574
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
@@ -54,8 +54,9 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 	private hitCountInput = '';
 	private logMessageInput = '';
 	private breakpoint: IBreakpoint | undefined;
+	private context: Context;
 
-	constructor(editor: ICodeEditor, private lineNumber: number, private column: number | undefined, private context: Context,
+	constructor(editor: ICodeEditor, private lineNumber: number, private column: number | undefined, context: Context | undefined,
 		@IContextViewService private readonly contextViewService: IContextViewService,
 		@IDebugService private readonly debugService: IDebugService,
 		@IThemeService private readonly themeService: IThemeService,
@@ -74,14 +75,16 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 			this.breakpoint = breakpoints.length ? breakpoints[0] : undefined;
 		}
 
-		if (this.context === undefined) {
+		if (context === undefined) {
 			if (this.breakpoint && !this.breakpoint.condition && !this.breakpoint.hitCondition && this.breakpoint.logMessage) {
 				this.context = Context.LOG_MESSAGE;
 			} else if (this.breakpoint && !this.breakpoint.condition && this.breakpoint.hitCondition) {
 				this.context = Context.HIT_COUNT;
 			} else {
 				this.context = Context.CONDITION;
 			}
+		} else {
+			this.context = context;
 		}
 
 		this.toDispose.push(this.debugService.getModel().onDidChangeBreakpoints(e => {
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -65,7 +65,7 @@ export class DebugSession implements IDebugSession {
 
 	constructor(
 		private _configuration: { resolved: IConfig, unresolved: IConfig | undefined },
-		public root: IWorkspaceFolder,
+		public root: IWorkspaceFolder | undefined,
 		private model: DebugModel,
 		options: IDebugSessionOptions | undefined,
 		@IDebugService private readonly debugService: IDebugService,
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -160,7 +160,7 @@ export interface IDebugSession extends ITreeElement {
 	readonly configuration: IConfig;
 	readonly unresolvedConfiguration: IConfig | undefined;
 	readonly state: State;
-	readonly root: IWorkspaceFolder;
+	readonly root: IWorkspaceFolder | undefined;
 	readonly parentSession: IDebugSession | undefined;
 	readonly subId: string | undefined;
 
