fixes microsoft#97464

isidorn · isidorn · commit 4fee76e61ba1 · 2020-05-12T10:34:14.000+02:00
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -366,7 +366,7 @@ export class DebugSession implements IDebugSession {
 		}
 	}
 
-	async dataBreakpointInfo(name: string, variablesReference?: number): Promise<{ dataId: string | null, description: string, canPersist?: boolean }> {
+	async dataBreakpointInfo(name: string, variablesReference?: number): Promise<{ dataId: string | null, description: string, canPersist?: boolean } | undefined> {
 		if (!this.raw) {
 			throw new Error(localize('noDebugAdapter', "No debug adapter, can not send '{0}'", 'data breakpoints info'));
 		}
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -194,8 +194,8 @@ export class VariablesView extends ViewPane {
 			}
 			if (session && session.capabilities.supportsDataBreakpoints) {
 				const response = await session.dataBreakpointInfo(variable.name, variable.parent.reference);
-				const dataid = response.dataId;
-				if (dataid) {
+				const dataid = response?.dataId;
+				if (response && dataid) {
 					actions.push(new Separator());
 					actions.push(new Action('debug.breakWhenValueChanges', nls.localize('breakWhenValueChanges', "Break When Value Changes"), undefined, true, () => {
 						return this.debugService.addDataBreakpoint(response.description, dataid, !!response.canPersist, response.accessTypes);
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -214,7 +214,7 @@ export interface IDebugSession extends ITreeElement {
 
 	sendBreakpoints(modelUri: uri, bpts: IBreakpoint[], sourceModified: boolean): Promise<void>;
 	sendFunctionBreakpoints(fbps: IFunctionBreakpoint[]): Promise<void>;
-	dataBreakpointInfo(name: string, variablesReference?: number): Promise<{ dataId: string | null, description: string, canPersist?: boolean, accessTypes?: DebugProtocol.DataBreakpointAccessType[] }>;
+	dataBreakpointInfo(name: string, variablesReference?: number): Promise<{ dataId: string | null, description: string, canPersist?: boolean, accessTypes?: DebugProtocol.DataBreakpointAccessType[] } | undefined>;
 	sendDataBreakpoints(dbps: IDataBreakpoint[]): Promise<void>;
 	sendExceptionBreakpoints(exbpts: IExceptionBreakpoint[]): Promise<void>;
 	breakpointsLocations(uri: uri, lineNumber: number): Promise<IPosition[]>;
diff --git a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
@@ -144,7 +144,7 @@ export class MockSession implements IDebugSession {
 		throw new Error('Method not implemented.');
 	}
 
-	dataBreakpointInfo(name: string, variablesReference?: number | undefined): Promise<{ dataId: string | null; description: string; canPersist?: boolean | undefined; }> {
+	dataBreakpointInfo(name: string, variablesReference?: number | undefined): Promise<{ dataId: string | null; description: string; canPersist?: boolean | undefined; } | undefined> {
 		throw new Error('Method not implemented.');
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ export class DebugSession implements IDebugSession {`
`366`	`366`	`}`
`367`	`367`	`}`
`368`	`368`
`369`		`- async dataBreakpointInfo(name: string, variablesReference?: number): Promise<{ dataId: string \| null, description: string, canPersist?: boolean }> {`
	`369`	`+ async dataBreakpointInfo(name: string, variablesReference?: number): Promise<{ dataId: string \| null, description: string, canPersist?: boolean } \| undefined> {`
`370`	`370`	`if (!this.raw) {`
`371`	`371`	`throw new Error(localize('noDebugAdapter', "No debug adapter, can not send '{0}'", 'data breakpoints info'));`
`372`	`372`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ export class MockSession implements IDebugSession {`
`144`	`144`	`throw new Error('Method not implemented.');`
`145`	`145`	`}`
`146`	`146`
`147`		`- dataBreakpointInfo(name: string, variablesReference?: number \| undefined): Promise<{ dataId: string \| null; description: string; canPersist?: boolean \| undefined; }> {`
	`147`	`+ dataBreakpointInfo(name: string, variablesReference?: number \| undefined): Promise<{ dataId: string \| null; description: string; canPersist?: boolean \| undefined; } \| undefined> {`
`148`	`148`	`throw new Error('Method not implemented.');`
`149`	`149`	`}`
`150`	`150`