ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 17:20:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

Browse Source 
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/contrib/preferences/browser/preferencesActions.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { Action } from 'vs/base/common/actions';
import { dispose, IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { URI } from 'vs/base/common/uri';
import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
import { IModelService } from 'vs/editor/common/services/modelService';
@@ -198,9 +198,6 @@ export class OpenFolderSettingsAction extends Action {
static readonly ID = 'workbench.action.openFolderSettings';
static readonly LABEL = OPEN_FOLDER_SETTINGS_LABEL;
private disposables: IDisposable[] = [];
constructor(
id: string,
label: string,
@@ -210,8 +207,8 @@ export class OpenFolderSettingsAction extends Action {
) {
super(id, label);
this.update();
this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this, this.disposables);
this.workspaceContextService.onDidChangeWorkspaceFolders(() => this.update(), this, this.disposables);
this._register(this.workspaceContextService.onDidChangeWorkbenchState(() => this.update(), this));
this._register(this.workspaceContextService.onDidChangeWorkspaceFolders(() => this.update(), this));
}
private update(): void {
@@ -228,11 +225,6 @@ export class OpenFolderSettingsAction extends Action {
return undefined;
});
}
dispose(): void {
this.disposables = dispose(this.disposables);
super.dispose();
}
}
export class ConfigureLanguageBasedSettingsAction extends Action {