ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-12 02:58:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

Browse Source 
* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/parts/query/browser/flavorStatus.ts
View File

@@ -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() {

2
src/sql/workbench/parts/query/browser/queryEditor.ts
View File

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

2
src/sql/workbench/parts/query/browser/queryStatus.ts
View File

@@ -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 {

2
src/sql/workbench/parts/query/browser/rowCountStatus.ts
View File

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

2
src/sql/workbench/parts/query/browser/timeElapsedStatus.ts
View File

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