ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-22 17:22:59 -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/profiler/browser/profiler.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 { IJSONSchema } from 'vs/base/common/jsonSchema';
import { Registry } from 'vs/platform/registry/common/platform';
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationNode } from 'vs/platform/configuration/common/configurationRegistry';

22
src/sql/workbench/contrib/profiler/browser/profilerActions.ts
View File

@@ -34,7 +34,7 @@ export class ProfilerConnect extends Action {
super(id, label, 'connect');
}
public async run(input: ProfilerInput): Promise<void> {
public override async run(input: ProfilerInput): Promise<void> {
this.enabled = false;
if (!this._connected) {
await this._profilerService.connectSession(input.id);
@@ -71,7 +71,7 @@ export class ProfilerStart extends Action {
super(id, label, 'sql start');
}
public async run(input: ProfilerInput): Promise<void> {
public override async run(input: ProfilerInput): Promise<void> {
input.data.clear();
await this._profilerService.startSession(input.id, input.sessionName);
}
@@ -88,7 +88,7 @@ export class ProfilerCreate extends Action {
super(id, label, 'add');
}
public async run(input: ProfilerInput): Promise<void> {
public override async run(input: ProfilerInput): Promise<void> {
return this._profilerService.launchCreateSessionDialog(input);
}
}
@@ -111,7 +111,7 @@ export class ProfilerPause extends Action {
super(id, label, ProfilerPause.PauseCssClass);
}
public async run(input: ProfilerInput): Promise<void> {
public override async run(input: ProfilerInput): Promise<void> {
await this._profilerService.pauseSession(input.id);
this.paused = !this._paused;
input.state.change({ isPaused: this.paused, isStopped: false, isRunning: !this.paused });
@@ -139,7 +139,7 @@ export class ProfilerStop extends Action {
super(id, label, 'sql stop');
}
public async run(input: ProfilerInput): Promise<void> {
public override async run(input: ProfilerInput): Promise<void> {
await this._profilerService.stopSession(input.id);
}
}
@@ -154,7 +154,7 @@ export class ProfilerClear extends Action {
super(id, label, 'clear-results');
}
async run(input: ProfilerInput): Promise<void> {
override async run(input: ProfilerInput): Promise<void> {
this._notificationService.prompt(Severity.Warning, nls.localize('profiler.clearDataPrompt', "Are you sure you want to clear the data?"), [
{
label: nls.localize('profiler.yes', "Yes"),
@@ -181,7 +181,7 @@ export class ProfilerAutoScroll extends Action {
super(id, label, ProfilerAutoScroll.CheckedCssClass);
}
async run(input: ProfilerInput): Promise<void> {
override async run(input: ProfilerInput): Promise<void> {
this.checked = !this.checked;
this.label = this.checked ? ProfilerAutoScroll.AutoScrollOnText : ProfilerAutoScroll.AutoScrollOffText;
this._setClass(this.checked ? ProfilerAutoScroll.CheckedCssClass : '');
@@ -199,7 +199,7 @@ export class ProfilerCollapsablePanelAction extends Action {
super(id, label, 'codicon-chevron-down');
}
public async run(input: ProfilerInput): Promise<void> {
public override async run(input: ProfilerInput): Promise<void> {
this.collapsed = !this._collapsed;
input.state.change({ isPanelCollapsed: this._collapsed });
}
@@ -225,7 +225,7 @@ export class ProfilerEditColumns extends Action {
super(id, label);
}
public async run(input: ProfilerInput): Promise<void> {
public override async run(input: ProfilerInput): Promise<void> {
await this._profilerService.launchColumnEditor(input);
}
}
@@ -303,7 +303,7 @@ export class ProfilerFilterSession extends Action {
super(id, label, 'filterLabel');
}
public async run(input: ProfilerInput): Promise<void> {
public override async run(input: ProfilerInput): Promise<void> {
this._profilerService.launchFilterSessionDialog(input);
}
}
@@ -320,7 +320,7 @@ export class ProfilerClearSessionFilter extends Action {
super(id, label, 'clear-filter');
}
public async run(input: ProfilerInput): Promise<void> {
public override async run(input: ProfilerInput): Promise<void> {
this._notificationService.prompt(Severity.Warning, nls.localize('profiler.clearFilterPrompt', "Are you sure you want to clear the filters?"), [
{
label: nls.localize('profiler.yes', "Yes"),

8
src/sql/workbench/contrib/profiler/browser/profilerEditor.ts
View File

@@ -445,11 +445,11 @@ export class ProfilerEditor extends EditorPane {
return editorContainer;
}
public get input(): ProfilerInput {
public override get input(): ProfilerInput {
return this._input as ProfilerInput;
}
public setInput(input: ProfilerInput, options?: EditorOptions): Promise<void> {
public override setInput(input: ProfilerInput, options?: EditorOptions): Promise<void> {
let savedViewState = this._savedTableViewStates.get(input);
this._profilerEditorContextKey.set(true);
@@ -491,7 +491,7 @@ export class ProfilerEditor extends EditorPane {
});
}
public clearInput(): void {
public override clearInput(): void {
this._profilerEditorContextKey.set(false);
}
@@ -615,7 +615,7 @@ export class ProfilerEditor extends EditorPane {
}
}
public focus() {
public override focus() {
this._profilerEditorContextKey.set(true);
super.focus();
let savedViewState = this._savedTableViewStates.get(this.input);

18
src/sql/workbench/contrib/profiler/browser/profilerResourceEditor.ts
View File

@@ -45,18 +45,18 @@ export class ProfilerResourceEditor extends BaseTextEditor {
@IStorageService storageService: IStorageService,
@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
@IThemeService themeService: IThemeService,
@IEditorService protected editorService: IEditorService,
@IEditorService editorService: IEditorService,
@IEditorGroupsService editorGroupService: IEditorGroupsService
) {
super(ProfilerResourceEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, editorService, editorGroupService);
}
public createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
public override createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
return this.instantiationService.createInstance(ProfilerResourceCodeEditor, parent, configuration, {});
}
protected getConfigurationOverrides(): IEditorOptions {
protected override getConfigurationOverrides(): IEditorOptions {
const options = super.getConfigurationOverrides();
options.readOnly = true;
if (this.input) {
@@ -75,18 +75,18 @@ export class ProfilerResourceEditor extends BaseTextEditor {
return options;
}
setInput(input: UntitledTextEditorInput, options: EditorOptions, context: IEditorOpenContext): Promise<void> {
return super.setInput(input, options, context, CancellationToken.None)
.then(() => this.input.resolve()
.then(editorModel => editorModel.load())
.then(editorModel => this.getControl().setModel((<ResourceEditorModel>editorModel).textEditorModel)));
override async setInput(input: UntitledTextEditorInput, options: EditorOptions, context: IEditorOpenContext): Promise<void> {
await super.setInput(input, options, context, CancellationToken.None);
const editorModel = await this.input.resolve() as ResourceEditorModel;
await editorModel.resolve();
this.getControl().setModel(editorModel.textEditorModel);
}
protected getAriaLabel(): string {
return nls.localize('profilerTextEditorAriaLabel', "Profiler editor for event text. Readonly");
}
public layout(dimension: DOM.Dimension) {
public override layout(dimension: DOM.Dimension) {
this.getControl().layout(dimension);
}
}

8
src/sql/workbench/contrib/profiler/browser/profilerTableEditor.ts
View File

@@ -42,7 +42,7 @@ export interface ProfilerTableViewState {
export class ProfilerTableEditor extends EditorPane implements IProfilerController, ITableController {
public static ID: string = 'workbench.editor.profiler.table';
protected _input: ProfilerInput;
protected override _input: ProfilerInput;
private _profilerTable: Table<Slick.SlickData>;
private _columnListener: IDisposable;
private _stateListener: IDisposable;
@@ -121,7 +121,7 @@ export class ProfilerTableEditor extends EditorPane implements IProfilerControll
);
}
public setInput(input: ProfilerInput): Promise<void> {
public override setInput(input: ProfilerInput): Promise<void> {
this._showStatusBarItem = true;
this._input = input;
@@ -169,7 +169,7 @@ export class ProfilerTableEditor extends EditorPane implements IProfilerControll
this._updateFinderMatchState();
}, er => { });
this._input.onDispose(() => {
this._input.onWillDispose(() => {
this._disposeStatusbarItem();
});
return Promise.resolve(null);
@@ -219,7 +219,7 @@ export class ProfilerTableEditor extends EditorPane implements IProfilerControll
return this._actionMap[id];
}
public focus(): void {
public override focus(): void {
this._profilerTable.focus();
}