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

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/workbench/contrib/charts/browser/actions.ts
View File

@@ -45,7 +45,7 @@ export class CreateInsightAction extends Action {
super(CreateInsightAction.ID, CreateInsightAction.LABEL, CreateInsightAction.ICON);
}
public async run(context: IChartActionContext): Promise<void> {
public override async run(context: IChartActionContext): Promise<void> {
let uriString = this.getActiveUriString();
if (!uriString) {
this.showError(localize('createInsightNoEditor', "Cannot create insight as the active editor is not a SQL Editor"));
@@ -115,7 +115,7 @@ export class ConfigureChartAction extends Action {
super(ConfigureChartAction.ID, ConfigureChartAction.LABEL, ConfigureChartAction.ICON);
}
public async run(context: IChartActionContext): Promise<void> {
public override async run(context: IChartActionContext): Promise<void> {
if (!this.dialog) {
this.dialog = this.instantiationService.createInstance(ConfigureChartDialog, ConfigureChartAction.LABEL, ConfigureChartAction.ID, this._chart);
this.dialog.render();
@@ -136,7 +136,7 @@ export class CopyAction extends Action {
super(CopyAction.ID, CopyAction.LABEL, CopyAction.ICON);
}
public async run(context: IChartActionContext): Promise<void> {
public override async run(context: IChartActionContext): Promise<void> {
if (context.insight instanceof Graph) {
let data = context.insight.getCanvasData();
if (!data) {
@@ -170,7 +170,7 @@ export class SaveImageAction extends Action {
super(SaveImageAction.ID, SaveImageAction.LABEL, SaveImageAction.ICON);
}
public async run(context: IChartActionContext): Promise<void> {
public override async run(context: IChartActionContext): Promise<void> {
if (context.insight instanceof Graph) {
let fileFilters = new Array<FileFilter>({ extensions: ['png'], name: localize('resultsSerializer.saveAsFileExtensionPNGTitle', "PNG") });

2
src/sql/workbench/contrib/charts/browser/chartView.ts
View File

@@ -165,7 +165,7 @@ export class ChartView extends Disposable implements IPanelView {
return option.map(o => altNameHash[o] || o);
}
public dispose() {
public override dispose() {
dispose(this.optionDisposables);
super.dispose();
}

2
src/sql/workbench/contrib/charts/browser/configureChartDialog.ts
View File

@@ -36,7 +36,7 @@ export class ConfigureChartDialog extends Modal {
this.show();
}
public render() {
public override render() {
super.render();
attachModalDialogStyler(this, this._themeService);