Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

This reverts commit d15a3fcc98.

src/sql/workbench/parts/query/browser/flavorStatus.ts

@@ -87,7 +87,7 @@ export class SqlFlavorStatusbarItem implements IStatusbarItem {
 			this._editorService.onDidVisibleEditorsChange(() => this._onEditorsChanged()),
 			this._editorService.onDidCloseEditor(event => this._onEditorClosed(event))
 		);
-		return combinedDisposable(...this._toDispose);
+		return combinedDisposable(this._toDispose);
 	}
 
 	private _onSelectionClick() {

src/sql/workbench/parts/query/browser/queryEditor.ts

@@ -156,7 +156,7 @@ export class QueryEditor extends BaseEditor {
 
 		this.setTaskbarContent();
 
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
+		this._toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectedKeys.includes('workbench.enablePreviewFeatures')) {
 				this.setTaskbarContent();
 			}

src/sql/workbench/parts/query/browser/queryStatus.ts

@@ -47,7 +47,7 @@ export class QueryStatusbarItem implements IStatusbarItem {
 			this._editorService.onDidCloseEditor(event => this._onEditorClosed(event))
 		);
 
-		return combinedDisposable(...this._toDispose);
+		return combinedDisposable(this._toDispose);
 	}
 
 	private _onEditorClosed(event: IEditorCloseEvent): void {

src/sql/workbench/parts/query/browser/rowCountStatus.ts

@@ -40,7 +40,7 @@ export class RowCountStatusBarItem implements IStatusbarItem {
 
 		this._showStatus();
 
-		return combinedDisposable(...disposables);
+		return combinedDisposable(disposables);
 	}
 
 	private _onEditorsChanged() {

src/sql/workbench/parts/query/browser/timeElapsedStatus.ts

@@ -43,7 +43,7 @@ export class TimeElapsedStatusBarItem implements IStatusbarItem {
 
 		this._showStatus();
 
-		return combinedDisposable(...disposables);
+		return combinedDisposable(disposables);
 	}
 
 	private _onEditorsChanged() {