eng: revert microsoft#190623 until everyone can review it (microsoft#190752)

This reverts commit 6336ee7.

Author: connor4312

src/vs/base/browser/ui/grid/gridview.ts

@@ -705,7 +705,6 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 		this.splitviewSashResetDisposable.dispose();
 		this.childrenSashResetDisposable.dispose();
 		this.childrenChangeDisposable.dispose();
-		this.onDidScrollDisposable.dispose();
 		this.splitview.dispose();
 	}
 }

src/vs/base/browser/ui/splitview/splitview.ts

@@ -565,11 +565,11 @@ export class SplitView<TLayoutContext = undefined> extends Disposable {
 		this.sashContainer = append(this.el, $('.sash-container'));
 		this.viewContainer = $('.split-view-container');
 
-		this.scrollable = this._register(new Scrollable({
+		this.scrollable = new Scrollable({
 			forceIntegerValues: true,
 			smoothScrollDuration: 125,
 			scheduleAtNextAnimationFrame
-		}));
+		});
 		this.scrollableElement = this._register(new SmoothScrollableElement(this.viewContainer, {
 			vertical: this.orientation === Orientation.VERTICAL ? (options.scrollbarVisibility ?? ScrollbarVisibility.Auto) : ScrollbarVisibility.Hidden,
 			horizontal: this.orientation === Orientation.HORIZONTAL ? (options.scrollbarVisibility ?? ScrollbarVisibility.Auto) : ScrollbarVisibility.Hidden

src/vs/base/browser/ui/toolbar/toolbar.ts

@@ -212,7 +212,6 @@ export class ToolBar extends Disposable {
 
 	override dispose(): void {
 		this.clear();
-		this.disposables.dispose();
 		super.dispose();
 	}
 }

src/vs/base/common/stream.ts

@@ -519,22 +519,20 @@ export function consumeStream<T, R = T>(stream: ReadableStreamEvents<T>, reducer
 	return new Promise((resolve, reject) => {
 		const chunks: T[] = [];
 
-		const l = listenStream(stream, {
+		listenStream(stream, {
 			onData: chunk => {
 				if (reducer) {
 					chunks.push(chunk);
 				}
 			},
 			onError: error => {
-				l.dispose();
 				if (reducer) {
 					reject(error);
 				} else {
 					resolve(undefined);
 				}
 			},
 			onEnd: () => {
-				l.dispose();
 				if (reducer) {
 					resolve(reducer(chunks));
 				} else {
@@ -572,18 +570,15 @@ export interface IStreamListener<T> {
 export function listenStream<T>(stream: ReadableStreamEvents<T>, listener: IStreamListener<T>): IDisposable {
 	let destroyed = false;
 
-	// error and end events are in the next microtask so that a stream that is
-	// closed synchronously (e.g from a memory `toStream`) can get its disposable
-	// and destroy the stream.
 	stream.on('error', error => {
 		if (!destroyed) {
-			queueMicrotask(() => listener.onError(error));
+			listener.onError(error);
 		}
 	});
 
 	stream.on('end', () => {
 		if (!destroyed) {
-			queueMicrotask(() => listener.onEnd());
+			listener.onEnd();
 		}
 	});
 
@@ -697,16 +692,10 @@ export function toReadable<T>(t: T): Readable<T> {
 export function transform<Original, Transformed>(stream: ReadableStreamEvents<Original>, transformer: ITransformer<Original, Transformed>, reducer: IReducer<Transformed>): ReadableStream<Transformed> {
 	const target = newWriteableStream<Transformed>(reducer);
 
-	const l = listenStream(stream, {
+	listenStream(stream, {
 		onData: data => target.write(transformer.data(data)),
-		onError: error => {
-			l.dispose();
-			target.error(transformer.error ? transformer.error(error) : error);
-		},
-		onEnd: () => {
-			l.dispose();
-			target.end();
-		}
+		onError: error => target.error(transformer.error ? transformer.error(error) : error),
+		onEnd: () => target.end()
 	});
 
 	return target;
@@ -751,7 +740,7 @@ export function prefixedStream<T>(prefix: T, stream: ReadableStream<T>, reducer:
 
 	const target = newWriteableStream<T>(reducer);
 
-	const l = listenStream(stream, {
+	listenStream(stream, {
 		onData: data => {
 
 			// Handle prefix only once
@@ -763,12 +752,8 @@ export function prefixedStream<T>(prefix: T, stream: ReadableStream<T>, reducer:
 
 			return target.write(data);
 		},
-		onError: error => {
-			l.dispose();
-			target.error(error);
-		},
+		onError: error => target.error(error),
 		onEnd: () => {
-			l.dispose();
 
 			// Handle prefix only once
 			if (!prefixHandled) {

src/vs/base/test/common/stream.test.ts

@@ -315,14 +315,14 @@ suite('Stream', () => {
 		assert.strictEqual(consumed, undefined);
 	});
 
-	test('listenStream', async () => {
+	test('listenStream', () => {
 		const stream = newWriteableStream<string>(strings => strings.join());
 
 		let error = false;
 		let end = false;
 		let data = '';
 
-		const l = listenStream(stream, {
+		listenStream(stream, {
 			onData: d => {
 				data = d;
 			},
@@ -345,14 +345,10 @@ suite('Stream', () => {
 		assert.strictEqual(end, false);
 
 		stream.error(new Error());
-		await new Promise<void>(r => queueMicrotask(r));
 		assert.strictEqual(error, true);
 
 		stream.end('Final Bit');
-		await new Promise<void>(r => queueMicrotask(r));
 		assert.strictEqual(end, true);
-
-		l.dispose();
 	});
 
 	test('listenStream - dispose', () => {

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts

@@ -35,8 +35,8 @@ export class DiffEditorEditors extends Disposable {
 	) {
 		super();
 
-		this.original = this._register(this._createLeftHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.originalEditor || {}));
-		this.modified = this._register(this._createRightHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.modifiedEditor || {}));
+		this.original = this._createLeftHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.originalEditor || {});
+		this.modified = this._createRightHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.modifiedEditor || {});
 
 		this._register(autorunHandleChanges({
 			createEmptyChangeSummary: () => ({} as IDiffEditorConstructionOptions),

src/vs/editor/common/model/textModel.ts

@@ -67,21 +67,19 @@ export function createTextBufferFactoryFromStream(stream: ITextStream | VSBuffer
 
 		let done = false;
 
-		const l = listenStream<string | VSBuffer>(stream, {
+		listenStream<string | VSBuffer>(stream, {
 			onData: chunk => {
 				builder.acceptChunk((typeof chunk === 'string') ? chunk : chunk.toString());
 			},
 			onError: error => {
 				if (!done) {
 					done = true;
-					l.dispose();
 					reject(error);
 				}
 			},
 			onEnd: () => {
 				if (!done) {
 					done = true;
-					l.dispose();
 					resolve(builder.finish());
 				}
 			}

src/vs/editor/contrib/suggest/browser/suggestController.ts

@@ -143,7 +143,7 @@ export class SuggestController implements IEditorContribution {
 		// context key: update insert/replace mode
 		const ctxInsertMode = SuggestContext.InsertMode.bindTo(_contextKeyService);
 		ctxInsertMode.set(editor.getOption(EditorOption.suggest).insertMode);
-		this._toDispose.add(this.model.onDidTrigger(() => ctxInsertMode.set(editor.getOption(EditorOption.suggest).insertMode)));
+		this.model.onDidTrigger(() => ctxInsertMode.set(editor.getOption(EditorOption.suggest).insertMode));
 
 		this.widget = this._toDispose.add(new IdleValue(() => {
 

src/vs/platform/actions/browser/buttonbar.ts

@@ -55,7 +55,7 @@ export class MenuWorkbenchButtonBar extends ButtonBar {
 					'workbenchActionExecuted',
 					{ id: e.action.id, from: options.telemetrySource! }
 				);
-			}, undefined, this._store);
+			}, this._store);
 		}
 
 		const conifgProvider: IButtonConfigProvider = options?.buttonConfigProvider ?? (() => ({ showLabel: true }));

src/vs/platform/checksum/node/checksumService.ts

@@ -20,16 +20,10 @@ export class ChecksumService implements IChecksumService {
 		return new Promise<string>((resolve, reject) => {
 			const hash = createHash('md5');
 
-			const l = listenStream(stream, {
+			listenStream(stream, {
 				onData: data => hash.update(data.buffer),
-				onError: error => {
-					l.dispose();
-					reject(error);
-				},
-				onEnd: () => {
-					l.dispose();
-					resolve(hash.digest('base64').replace(/=+$/, ''));
-				}
+				onError: error => reject(error),
+				onEnd: () => resolve(hash.digest('base64').replace(/=+$/, ''))
 			});
 		});
 	}