ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-23 09:35:39 -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

5
src/sql/workbench/contrib/queryPlan/browser/queryPlan.contribution.ts
View File

@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import { QueryPlanInput, QueryPlanConverter } from 'sql/workbench/contrib/queryPlan/common/queryPlanInput';
import { EditorDescriptor, IEditorRegistry, Extensions } from 'vs/workbench/browser/editor';
import { EditorDescriptor, IEditorRegistry } from 'vs/workbench/browser/editor';
import { EditorExtensions } from 'vs/workbench/common/editor';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { Registry } from 'vs/platform/registry/common/platform';
import { QueryPlanEditor } from 'sql/workbench/contrib/queryPlan/browser/queryPlanEditor';
@@ -18,7 +19,7 @@ const queryPlanEditorDescriptor = EditorDescriptor.create(
'QueryPlan'
);
Registry.as<IEditorRegistry>(Extensions.Editors)
Registry.as<IEditorRegistry>(EditorExtensions.Editors)
.registerEditor(queryPlanEditorDescriptor, [new SyncDescriptor(QueryPlanInput)]);
Registry.as<ILanguageAssociationRegistry>(LanguageAssociationExtensions.LanguageAssociations)

6
src/sql/workbench/contrib/queryPlan/browser/queryPlanEditor.ts
View File

@@ -48,7 +48,7 @@ export class QueryPlanEditor extends EditorPane {
/**
* Sets focus on this editor. Specifically, it sets the focus on the hosted text editor.
*/
public focus(): void {
public override focus(): void {
this.view.focus();
}
@@ -60,7 +60,7 @@ export class QueryPlanEditor extends EditorPane {
this.view.layout(dimension);
}
public async setInput(input: QueryPlanInput, options: EditorOptions, context: IEditorOpenContext): Promise<void> {
public override async setInput(input: QueryPlanInput, options: EditorOptions, context: IEditorOpenContext): Promise<void> {
if (this.input instanceof QueryPlanInput && this.input.matches(input)) {
return Promise.resolve(undefined);
}
@@ -71,7 +71,7 @@ export class QueryPlanEditor extends EditorPane {
this.view.showPlan(input.planXml!);
}
public dispose(): void {
public override dispose(): void {
super.dispose();
}
}

6
src/sql/workbench/contrib/queryPlan/common/queryPlanInput.ts
View File

@@ -45,11 +45,11 @@ export class QueryPlanInput extends EditorInput {
super();
}
public getTypeId(): string {
override get typeId(): string {
return UntitledTextEditorInput.ID;
}
public getName(): string {
public override getName(): string {
return 'Query Plan';
}
@@ -65,7 +65,7 @@ export class QueryPlanInput extends EditorInput {
return false;
}
public async resolve(refresh?: boolean): Promise<EditorModel | null> {
public override async resolve(refresh?: boolean): Promise<EditorModel | null> {
if (!this._xml) {
this._xml = (await this.fileService.read(this._uri, { acceptTextOnly: true })).value;
}