Skip to content

Commit f6caa53

Browse files
isidornisidorn
committed
1 parent 0585660 commit f6caa53

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎src/vs/workbench/contrib/debug/electron-browser/debugSession.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
3232
import { ReplModel } from 'vs/workbench/contrib/debug/common/replModel';
3333
import { onUnexpectedError } from 'vs/base/common/errors';
3434
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
35+
import { INotificationService } from 'vs/platform/notification/common/notification';
3536

3637
export class DebugSession implements IDebugSession {
3738
private id: string;
@@ -62,7 +63,8 @@ export class DebugSession implements IDebugSession {
6263
@IConfigurationService private readonly configurationService: IConfigurationService,
6364
@IViewletService private readonly viewletService: IViewletService,
6465
@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
65-
@IEnvironmentService private readonly environmentService: IEnvironmentService
66+
@IEnvironmentService private readonly environmentService: IEnvironmentService,
67+
@INotificationService private readonly notificationService: INotificationService
6668
) {
6769
this.id = generateUuid();
6870
this.repl = new ReplModel(this);
@@ -591,7 +593,7 @@ export class DebugSession implements IDebugSession {
591593
this.raw.disconnect();
592594
}
593595
if (e.command !== 'canceled' && e.message !== 'canceled') {
594-
onUnexpectedError(e);
596+
this.notificationService.error(e);
595597
}
596598
});
597599
}

‎src/vs/workbench/contrib/debug/test/electron-browser/debugModel.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ suite('Debug - Model', () => {
110110
test('threads simple', () => {
111111
const threadId = 1;
112112
const threadName = 'firstThread';
113-
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
113+
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
114114
model.addSession(session);
115115

116116
assert.equal(model.getSessions(true).length, 1);
@@ -138,7 +138,7 @@ suite('Debug - Model', () => {
138138
const stoppedReason = 'breakpoint';
139139

140140
// Add the threads
141-
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
141+
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
142142
model.addSession(session);
143143

144144
session['raw'] = <any>rawSession;
@@ -225,7 +225,7 @@ suite('Debug - Model', () => {
225225
const runningThreadId = 2;
226226
const runningThreadName = 'runningThread';
227227
const stoppedReason = 'breakpoint';
228-
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
228+
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
229229
model.addSession(session);
230230

231231
session['raw'] = <any>rawSession;
@@ -338,7 +338,7 @@ suite('Debug - Model', () => {
338338
});
339339

340340
test('repl expressions', () => {
341-
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
341+
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
342342
assert.equal(session.getReplElements().length, 0);
343343
model.addSession(session);
344344

@@ -362,7 +362,7 @@ suite('Debug - Model', () => {
362362
});
363363

364364
test('stack frame get specific source name', () => {
365-
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
365+
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
366366
model.addSession(session);
367367

368368
let firstStackFrame: StackFrame;
@@ -393,7 +393,7 @@ suite('Debug - Model', () => {
393393
// Repl output
394394

395395
test('repl output', () => {
396-
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
396+
const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined, model, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
397397
const repl = new ReplModel(session);
398398
repl.appendToRepl('first line\n', severity.Error);
399399
repl.appendToRepl('second line', severity.Error);

0 commit comments

Comments
 (0)