debug: introduce IBaseBreakpoint

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

@@ -238,24 +238,26 @@ export interface IBreakpointUpdateData extends DebugProtocol.Breakpoint {
 	hitCondition?: string;
 }
 
-export interface IBreakpoint extends IEnablement {
+export interface IBaseBreakpoint extends IEnablement {
+	condition: string;
+	hitCondition: string;
+}
+
+export interface IBreakpoint extends IBaseBreakpoint {
 	uri: uri;
 	lineNumber: number;
 	endLineNumber?: number;
 	column: number;
 	endColumn?: number;
-	condition: string;
-	hitCondition: string;
 	verified: boolean;
 	idFromAdapter: number;
 	message: string;
 }
 
-export interface IFunctionBreakpoint extends IEnablement {
+export interface IFunctionBreakpoint extends IBaseBreakpoint {
 	name: string;
 	verified: boolean;
 	idFromAdapter: number;
-	hitCondition: string;
 }
 
 export interface IExceptionBreakpoint extends IEnablement {

src/vs/workbench/parts/debug/common/debugModel.ts

@@ -697,7 +697,7 @@ export class FunctionBreakpoint implements IFunctionBreakpoint {
 	public verified: boolean;
 	public idFromAdapter: number;
 
-	constructor(public name: string, public enabled: boolean, public hitCondition: string, private id = generateUuid()) {
+	constructor(public name: string, public enabled: boolean, public hitCondition: string, public condition: string, private id = generateUuid()) {
 		this.verified = false;
 	}
 

src/vs/workbench/parts/debug/electron-browser/debugService.ts

@@ -472,7 +472,7 @@ export class DebugService implements debug.IDebugService {
 		let result: FunctionBreakpoint[];
 		try {
 			result = JSON.parse(this.storageService.get(DEBUG_FUNCTION_BREAKPOINTS_KEY, StorageScope.WORKSPACE, '[]')).map((fb: any) => {
-				return new FunctionBreakpoint(fb.name, fb.enabled, fb.hitCondition);
+				return new FunctionBreakpoint(fb.name, fb.enabled, fb.hitCondition, fb.condition);
 			});
 		} catch (e) { }