ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 17:22:48 -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

3
src/sql/workbench/contrib/resourceViewer/browser/resourceViewer.contribution.ts
View File

@@ -3,7 +3,8 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { EditorDescriptor, Extensions as EditorExtensions, IEditorRegistry } from 'vs/workbench/browser/editor';
import { EditorDescriptor, IEditorRegistry } from 'vs/workbench/browser/editor';
import { EditorExtensions } from 'vs/workbench/common/editor';
import { Registry } from 'vs/platform/registry/common/platform';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { ResourceViewerEditor } from 'sql/workbench/contrib/resourceViewer/browser/resourceViewerEditor';

2
src/sql/workbench/contrib/resourceViewer/browser/resourceViewerActions.ts
View File

@@ -15,7 +15,7 @@ export class ResourceViewerRefresh extends Action {
super(ResourceViewerRefresh.ID, ResourceViewerRefresh.LABEL, 'codicon refresh');
}
public async run(input: ResourceViewerInput): Promise<void> {
public override async run(input: ResourceViewerInput): Promise<void> {
this.enabled = false;
try {
await input.refresh();

10
src/sql/workbench/contrib/resourceViewer/browser/resourceViewerEditor.ts
View File

@@ -84,11 +84,11 @@ export class ResourceViewerEditor extends EditorPane {
return resourceViewerTableContainer;
}
public get input(): ResourceViewerInput | undefined {
public override get input(): ResourceViewerInput | undefined {
return this._input as ResourceViewerInput;
}
async setInput(input: ResourceViewerInput, options: EditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
override async setInput(input: ResourceViewerInput, options: EditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
await super.setInput(input, options, context, token);
this._resourceViewerTable.title = input.title;
@@ -144,10 +144,8 @@ export class ResourceViewerEditor extends EditorPane {
private getMenuActions(context: azdata.DataGridItem): IAction[] {
// Get the contributed menu action items. Note that this currently doesn't
// have any item-level support for action filtering, that can be added to the scoped context as
// needed in the future
const scopedContext = this._contextKeyService.createScoped();
const menu = this._menuService.createMenu(MenuId.DataGridItemContext, scopedContext);
// have any item-level support for action filtering, that can be added as needed in the future
const menu = this._menuService.createMenu(MenuId.DataGridItemContext, this._contextKeyService);
const options = { arg: context };
const groups = menu.getActions(options);
const actions: IAction[] = [];

4
src/sql/workbench/contrib/resourceViewer/browser/resourceViewerView.ts
View File

@@ -47,7 +47,7 @@ export class ResourceViewerView extends ViewPane {
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
}
protected renderBody(container: HTMLElement): void {
protected override renderBody(container: HTMLElement): void {
super.renderBody(container);
this.listContainer = append(container, $('.resource-view'));
@@ -83,7 +83,7 @@ export class ResourceViewerView extends ViewPane {
}
}
protected layoutBody(height: number, width: number): void {
protected override layoutBody(height: number, width: number): void {
super.layoutBody(height, width);
this.tree.layout(height, width);
}