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

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts
View File

@@ -22,7 +22,7 @@ import * as DOM from 'vs/base/browser/dom';
import { IDataSource, ITree, IRenderer } from 'vs/base/parts/tree/browser/tree';
import { TPromise } from 'vs/base/common/winjs.base';
import { attachListStyler } from 'vs/platform/theme/common/styler';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';

11
src/sql/parts/profiler/editor/controller/profilerTableEditor.ts
View File

@@ -21,11 +21,12 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IEditorAction } from 'vs/editor/common/editorCommon';
import { IOverlayWidget } from 'vs/editor/browser/editorBrowser';
import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/findState';
import { Dimension, Builder } from 'vs/base/browser/builder';
import { Builder } from 'vs/base/browser/builder';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { Dimension } from 'vs/base/browser/dom';
export class ProfilerTableEditor extends BaseEditor implements IProfilerController, ITableController {
@@ -57,15 +58,15 @@ export class ProfilerTableEditor extends BaseEditor implements IProfilerControll
this._actionMap[ACTION_IDS.FIND_PREVIOUS] = this._instantiationService.createInstance(ProfilerFindPrevious, this);
}
public createEditor(parent: Builder): void {
public createEditor(parent: HTMLElement): void {
this._overlay = document.createElement('div');
this._overlay.className = 'overlayWidgets';
this._overlay.style.width = '100%';
this._overlay.style.zIndex = '4';
parent.getHTMLElement().appendChild(this._overlay);
parent.appendChild(this._overlay);
this._profilerTable = new Table(parent.getHTMLElement());
this._profilerTable = new Table(parent);
this._profilerTable.setSelectionModel(new RowSelectionModel());
attachTableStyler(this._profilerTable, this._themeService);

16
src/sql/parts/profiler/editor/profilerEditor.ts
View File

@@ -19,7 +19,7 @@ import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
import * as DOM from 'vs/base/browser/dom';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { Dimension, Builder } from 'vs/base/browser/builder';
import { Builder } from 'vs/base/browser/builder';
import { TPromise } from 'vs/base/common/winjs.base';
import { EditorOptions } from 'vs/workbench/common/editor';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -138,13 +138,13 @@ export class ProfilerEditor extends BaseEditor {
this._profilerEditorContextKey = CONTEXT_PROFILER_EDITOR.bindTo(this._contextKeyService);
}
protected createEditor(parent: Builder): void {
protected createEditor(parent: HTMLElement): void {
// test backend
//this._profilerService.registerProvider('default', this._instantiationService.createInstance(ProfilerTestBackend));
this._container = document.createElement('div');
this._container.className = 'carbon-profiler';
parent.append(this._container);
parent.appendChild(this._container);
this._createHeader();
@@ -159,7 +159,7 @@ export class ProfilerEditor extends BaseEditor {
300,
tableContainer,
() => this._profilerTableEditor.focus(),
size => this._profilerTableEditor.layout(new Dimension(parseFloat(DOM.getComputedStyle(this._body).width), size)),
size => this._profilerTableEditor.layout(new DOM.Dimension(parseFloat(DOM.getComputedStyle(this._body).width), size)),
{}
));
@@ -167,7 +167,7 @@ export class ProfilerEditor extends BaseEditor {
300,
paneContainer,
() => this._tabbedPanel.focus(),
size => this._tabbedPanel.layout(new Dimension(DOM.getTotalWidth(this._body), size)),
size => this._tabbedPanel.layout(new DOM.Dimension(DOM.getTotalWidth(this._body), size)),
{ minimumSize: 35 }
);
this._panelView.headerSize = 35;
@@ -222,7 +222,7 @@ export class ProfilerEditor extends BaseEditor {
profilerTableContainer.style.overflow = 'hidden';
profilerTableContainer.style.position = 'relative';
this._profilerTableEditor = this._instantiationService.createInstance(ProfilerTableEditor);
this._profilerTableEditor.createEditor(new Builder(profilerTableContainer));
this._profilerTableEditor.createEditor(profilerTableContainer);
this._profilerTableEditor.onSelectedRowsChanged((e, args) => {
let data = this.input.data.getItem(args.rows[0]);
if (data) {
@@ -302,7 +302,7 @@ export class ProfilerEditor extends BaseEditor {
this._editor = this._instantiationService.createInstance(ProfilerResourceEditor);
let editorContainer = document.createElement('div');
editorContainer.className = 'profiler-editor';
this._editor.create(new Builder(editorContainer));
this._editor.create(editorContainer);
this._editor.setVisible(true);
this._editorInput = this._instantiationService.createInstance(UntitledEditorInput, URI.from({ scheme: Schemas.untitled }), false, 'sql', '', '');
this._editor.setInput(this._editorInput, undefined);
@@ -410,7 +410,7 @@ export class ProfilerEditor extends BaseEditor {
}
}
public layout(dimension: Dimension): void {
public layout(dimension: DOM.Dimension): void {
this._container.style.width = dimension.width + 'px';
this._container.style.height = dimension.height + 'px';
this._body.style.width = dimension.width + 'px';

2
src/sql/parts/profiler/editor/profilerInput.ts
View File

@@ -14,7 +14,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
import { EditorInput } from 'vs/workbench/common/editor';
import { IEditorModel } from 'vs/platform/editor/common/editor';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { generateUuid } from 'vs/base/common/uuid';
import * as nls from 'vs/nls';

8
src/sql/parts/profiler/editor/profilerResourceEditor.ts
View File

@@ -5,7 +5,7 @@
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
import * as nls from 'vs/nls';
import { Dimension, Builder } from 'vs/base/browser/builder';
import * as DOM from 'vs/base/browser/dom';
import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
import { TPromise } from 'vs/base/common/winjs.base';
import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel';
@@ -56,8 +56,8 @@ export class ProfilerResourceEditor extends BaseTextEditor {
super(ProfilerResourceEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorGroupService);
}
public createEditorControl(parent: Builder, configuration: IEditorOptions): editorCommon.IEditor {
return this.instantiationService.createInstance(ProfilerResourceCodeEditor, parent.getHTMLElement(), configuration);
public createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
return this.instantiationService.createInstance(ProfilerResourceCodeEditor, parent, configuration);
}
protected getConfigurationOverrides(): IEditorOptions {
@@ -90,7 +90,7 @@ export class ProfilerResourceEditor extends BaseTextEditor {
return nls.localize('profilerTextEditorAriaLabel', 'Profiler editor for event text. Readonly');
}
public layout(dimension: Dimension) {
public layout(dimension: DOM.Dimension) {
this.getControl().layout(dimension);
}
}