Fix debug console after restarting session (microsoft#192911)

* Don't add global DebugSession listeners to rawListeners, which are disposed when a DebugSession is restarted
Fix microsoft#192653

* Fix failing unit test
Now we don't dispose some listeners in DebugSession, this is by design

* Fix failing unit tests

Author: roblourens

src/vs/workbench/contrib/debug/browser/debugSession.ts

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

src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts

@@ -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';
@@ -38,8 +37,6 @@ suite('Debug - Base Debug View', () => {
 		disposables.dispose();
 	});
 
-	ensureNoDisposablesAreLeakedInTestSuite();
-
 	test('render view tree', () => {
 		const container = $('.container');
 		const treeContainer = renderViewTree(container);

src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts

@@ -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';
@@ -59,8 +58,6 @@ suite('Debug - Breakpoints', () => {
 		disposables.dispose();
 	});
 
-	ensureNoDisposablesAreLeakedInTestSuite();
-
 	// Breakpoints
 
 	test('simple', () => {

src/vs/workbench/contrib/debug/test/browser/callStack.test.ts

@@ -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';
@@ -85,8 +84,6 @@ suite('Debug - CallStack', () => {
 		sinon.restore();
 	});
 
-	ensureNoDisposablesAreLeakedInTestSuite();
-
 	// Threads
 
 	test('threads simple', () => {

src/vs/workbench/contrib/debug/test/browser/debugHover.test.ts

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

src/vs/workbench/contrib/debug/test/browser/repl.test.ts

@@ -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';
@@ -36,8 +35,6 @@ suite('Debug - REPL', () => {
 		disposables.dispose();
 	});
 
-	ensureNoDisposablesAreLeakedInTestSuite();
-
 	test('repl output', () => {
 		const session = disposables.add(createTestSession(model));
 		const repl = new ReplModel(configurationService);

src/vs/workbench/contrib/debug/test/common/debugModel.test.ts

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