development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

enable strictFunctionTypes

Browse source 
#81574
This commit is contained in:
isidor 2019-10-07 13:05:51 +02:00
parent 511137f876
commit 5fe0604806
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
View file

@ -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,7 +75,7 @@ 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) {
@ -82,6 +83,8 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
} else {
this.context = Context.CONDITION;
}
} else {
this.context = context;
}
this.toDispose.push(this.debugService.getModel().onDidChangeBreakpoints(e => {

2
src/vs/workbench/contrib/debug/browser/debugSession.ts
View file

@ -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,

2
src/vs/workbench/contrib/debug/common/debug.ts
View file

@ -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;