Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix debug console after restarting debug session #192949

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Fix debug console after restarting debug session #192949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e091dc0
Don't add global DebugSession listeners to rawListeners, which are di…
roblourens Sep 12, 2023
4059ba8
Fix failing unit test
roblourens Sep 13, 2023
d532382
Fix failing unit tests
roblourens Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/vs/workbench/contrib/debug/browser/debugSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cance
import { canceled } from 'vs/base/common/errors';
import { Emitter, Event } from 'vs/base/common/event';
import { normalizeDriveLetter } from 'vs/base/common/labels';
import { DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
import { DisposableStore, IDisposable, MutableDisposable, dispose } from 'vs/base/common/lifecycle';
import { mixin } from 'vs/base/common/objects';
import * as platform from 'vs/base/common/platform';
import * as resources from 'vs/base/common/resources';
Expand Down Expand Up @@ -103,11 +103,14 @@ export class DebugSession implements IDebugSession, IDisposable {
this.repl = (this.parentSession as DebugSession).repl;
}

const toDispose = this.rawListeners.add(new DisposableStore());
const toDispose = new DisposableStore();
const replListener = toDispose.add(new MutableDisposable());
replListener.value = this.repl.onDidChangeElements(() => this._onDidChangeREPLElements.fire());
if (lifecycleService) {
toDispose.add(lifecycleService.onWillShutdown(() => this.shutdown()));
toDispose.add(lifecycleService.onWillShutdown(() => {
this.shutdown();
dispose(toDispose);
}));
}

const compoundRoot = this._options.compoundRoot;
Expand Down
3 changes: 0 additions & 3 deletions src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import * as dom from 'vs/base/browser/dom';
import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { isWindows } from 'vs/base/common/platform';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { renderExpressionValue, renderVariable, renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
Expand Down Expand Up @@ -38,8 +37,6 @@ suite('Debug - Base Debug View', () => {
disposables.dispose();
});

ensureNoDisposablesAreLeakedInTestSuite();

test('render view tree', () => {
const container = $('.container');
const treeContainer = renderViewTree(container);
Expand Down
3 changes: 0 additions & 3 deletions src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import * as assert from 'assert';
import { MarkdownString } from 'vs/base/common/htmlContent';
import { DisposableStore, dispose } from 'vs/base/common/lifecycle';
import { URI as uri } from 'vs/base/common/uri';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { Range } from 'vs/editor/common/core/range';
import { ILanguageService } from 'vs/editor/common/languages/language';
import { OverviewRulerLane } from 'vs/editor/common/model';
Expand Down Expand Up @@ -59,8 +58,6 @@ suite('Debug - Breakpoints', () => {
disposables.dispose();
});

ensureNoDisposablesAreLeakedInTestSuite();

// Breakpoints

test('simple', () => {
Expand Down
3 changes: 0 additions & 3 deletions src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { DisposableStore } from 'vs/base/common/lifecycle';
import { ThemeIcon } from 'vs/base/common/themables';
import { Constants } from 'vs/base/common/uint';
import { generateUuid } from 'vs/base/common/uuid';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { Range } from 'vs/editor/common/core/range';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
Expand Down Expand Up @@ -85,8 +84,6 @@ suite('Debug - CallStack', () => {
sinon.restore();
});

ensureNoDisposablesAreLeakedInTestSuite();

// Threads

test('threads simple', () => {
Expand Down
3 changes: 0 additions & 3 deletions src/vs/workbench/contrib/debug/test/browser/debugHover.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import * as assert from 'assert';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { NullLogService } from 'vs/platform/log/common/log';
import { findExpressionInStackFrame } from 'vs/workbench/contrib/debug/browser/debugHover';
import type { IExpression, IScope } from 'vs/workbench/contrib/debug/common/debug';
Expand All @@ -24,8 +23,6 @@ suite('Debug - Hover', () => {
disposables.dispose();
});

ensureNoDisposablesAreLeakedInTestSuite();

test('find expression in stack frame', async () => {
const model = createMockDebugModel(disposables);
const session = disposables.add(createTestSession(model));
Expand Down
3 changes: 0 additions & 3 deletions src/vs/workbench/contrib/debug/test/browser/repl.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { TreeVisibility } from 'vs/base/browser/ui/tree/tree';
import { timeout } from 'vs/base/common/async';
import { DisposableStore } from 'vs/base/common/lifecycle';
import severity from 'vs/base/common/severity';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
import { RawDebugSession } from 'vs/workbench/contrib/debug/browser/rawDebugSession';
import { ReplFilter } from 'vs/workbench/contrib/debug/browser/replFilter';
Expand All @@ -36,8 +35,6 @@ suite('Debug - REPL', () => {
disposables.dispose();
});

ensureNoDisposablesAreLeakedInTestSuite();

test('repl output', () => {
const session = disposables.add(createTestSession(model));
const repl = new ReplModel(configurationService);
Expand Down
3 changes: 0 additions & 3 deletions src/vs/workbench/contrib/debug/test/common/debugModel.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@ import * as assert from 'assert';
import { DeferredPromise } from 'vs/base/common/async';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { mockObject } from 'vs/base/test/common/mock';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { NullLogService } from 'vs/platform/log/common/log';
import { DebugModel, ExceptionBreakpoint, FunctionBreakpoint, Thread } from 'vs/workbench/contrib/debug/common/debugModel';
import { MockDebugStorage } from 'vs/workbench/contrib/debug/test/common/mockDebug';
import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';

suite('DebugModel', () => {
ensureNoDisposablesAreLeakedInTestSuite();

suite('FunctionBreakpoint', () => {
test('Id is saved', () => {
const fbp = new FunctionBreakpoint('function', true, 'hit condition', 'condition', 'log message');
Expand Down