ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-20 17:22:51 -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/editData/common/editDataInput.ts
View File

@@ -8,7 +8,7 @@ import { EditorInput, EditorModel, ConfirmResult, EncodingMode } from 'vs/workbe
import { IConnectionManagementService, IConnectableInput, INewConnectionParams } from 'sql/parts/connection/common/connectionManagement';
import { IQueryModelService } from 'sql/parts/query/execution/queryModel';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { EditSessionReadyParams, ISelectionData } from 'sqlops';
import URI from 'vs/base/common/uri';
import nls = require('vs/nls');

36
src/sql/parts/editData/editor/editDataEditor.ts
View File

@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
import * as strings from 'vs/base/common/strings';
import * as DOM from 'vs/base/browser/dom';
import * as nls from 'vs/nls';
import { Builder, Dimension, withElementById } from 'vs/base/browser/builder';
import { Builder } from 'vs/base/browser/builder';
import { EditorOptions, EditorInput } from 'vs/workbench/common/editor';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -58,7 +58,7 @@ export class EditDataEditor extends BaseEditor {
private readonly _minEditorSize: number = 220;
private _sash: IFlexibleSash;
private _dimension: Dimension;
private _dimension: DOM.Dimension;
private _resultsEditor: EditDataResultsEditor;
private _resultsEditorContainer: HTMLElement;
@@ -142,10 +142,10 @@ export class EditDataEditor extends BaseEditor {
}
/**
* Called to create the editor in the parent builder.
* Called to create the editor in the parent element.
*/
public createEditor(parent: Builder): void {
const parentElement = parent.getHTMLElement();
public createEditor(parent: HTMLElement): void {
const parentElement = parent;
DOM.addClass(parentElement, 'side-by-side-editor');
this._createTaskbar(parentElement);
}
@@ -197,7 +197,7 @@ export class EditDataEditor extends BaseEditor {
* Updates the internal variable keeping track of the editor's size, and re-calculates the sash position.
* To be called when the container of this editor changes size.
*/
public layout(dimension: Dimension): void {
public layout(dimension: DOM.Dimension): void {
this._dimension = dimension;
if (this._sash) {
@@ -274,7 +274,7 @@ export class EditDataEditor extends BaseEditor {
}
let editor = descriptor.instantiate(this._instantiationService);
editor.create(new Builder(container));
editor.create(container);
editor.setVisible(this.isVisible(), this.position);
return TPromise.as(editor);
}
@@ -287,7 +287,7 @@ export class EditDataEditor extends BaseEditor {
private _createResultsEditorContainer() {
this._createSash();
const parentElement = this.getContainer().getHTMLElement();
const parentElement = this.getContainer();
let input = <EditDataInput>this.input;
if (!input.results.container) {
@@ -305,7 +305,7 @@ export class EditDataEditor extends BaseEditor {
*/
private _createSash(): void {
if (!this._sash) {
let parentElement: HTMLElement = this.getContainer().getHTMLElement();
let parentElement: HTMLElement = this.getContainer();
this._sash = this._register(new HorizontalFlexibleSash(parentElement, this._minEditorSize));
this._setSashDimension();
@@ -320,7 +320,7 @@ export class EditDataEditor extends BaseEditor {
* Appends the HTML for the SQL editor. Creates new HTML every time.
*/
private _createSqlEditorContainer() {
const parentElement = this.getContainer().getHTMLElement();
const parentElement = this.getContainer();
this._sqlEditorContainer = DOM.append(parentElement, DOM.$('.details-editor-container'));
this._sqlEditorContainer.style.position = 'absolute';
}
@@ -382,7 +382,7 @@ export class EditDataEditor extends BaseEditor {
this._resultsEditor = null;
}
let thisEditorParent: HTMLElement = this.getContainer().getHTMLElement();
let thisEditorParent: HTMLElement = this.getContainer();
if (this._sqlEditorContainer) {
let sqlEditorParent: HTMLElement = this._sqlEditorContainer.parentElement;
@@ -420,7 +420,7 @@ export class EditDataEditor extends BaseEditor {
private _doLayoutHorizontal(): void {
let splitPointTop: number = this._sash.getSplitPoint();
let parent: ClientRect = this.getContainer().getHTMLElement().getBoundingClientRect();
let parent: ClientRect = this.getContainer().getBoundingClientRect();
let sqlEditorHeight: number;
let sqlEditorTop: number;
@@ -431,7 +431,7 @@ export class EditDataEditor extends BaseEditor {
this._resultsEditorContainer.hidden = false;
let titleBar = withElementById('workbench.parts.titlebar');
let titleBar = document.getElementById('workbench.parts.titlebar');
if (this.queryPaneEnabled()) {
this._sqlEditorContainer.hidden = false;
@@ -442,7 +442,7 @@ export class EditDataEditor extends BaseEditor {
resultsEditorHeight = parent.bottom - resultsEditorTop;
if (titleBar) {
sqlEditorHeight += DOM.getContentHeight(titleBar.getHTMLElement());
sqlEditorHeight += DOM.getContentHeight(titleBar);
}
} else {
this._sqlEditorContainer.hidden = true;
@@ -454,7 +454,7 @@ export class EditDataEditor extends BaseEditor {
resultsEditorHeight = parent.bottom - resultsEditorTop;
if (titleBar) {
resultsEditorHeight += DOM.getContentHeight(titleBar.getHTMLElement());
resultsEditorHeight += DOM.getContentHeight(titleBar);
}
}
@@ -466,8 +466,8 @@ export class EditDataEditor extends BaseEditor {
this._resultsEditorContainer.style.width = `${this._dimension.width}px`;
this._resultsEditorContainer.style.top = `${resultsEditorTop}px`;
this._sqlEditor.layout(new Dimension(this._dimension.width, sqlEditorHeight));
this._resultsEditor.layout(new Dimension(this._dimension.width, resultsEditorHeight));
this._sqlEditor.layout(new DOM.Dimension(this._dimension.width, sqlEditorHeight));
this._resultsEditor.layout(new DOM.Dimension(this._dimension.width, resultsEditorHeight));
}
private _doLayoutSql() {
@@ -492,7 +492,7 @@ export class EditDataEditor extends BaseEditor {
this._sqlEditorContainer.style.height = `${sqlEditorHeight}px`;
this._sqlEditorContainer.style.width = `${this._dimension.width}px`;
this._sqlEditor.layout(new Dimension(this._dimension.width, sqlEditorHeight));
this._sqlEditor.layout(new DOM.Dimension(this._dimension.width, sqlEditorHeight));
}
}

12
src/sql/parts/editData/editor/editDataResultsEditor.ts
View File

@@ -3,8 +3,9 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as DOM from 'vs/base/browser/dom';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { Dimension, Builder } from 'vs/base/browser/builder';
import { Builder } from 'vs/base/browser/builder';
import { EditorOptions } from 'vs/workbench/common/editor';
import { TPromise } from 'vs/base/common/winjs.base';
import { getZoomLevel } from 'vs/base/browser/browser';
@@ -13,7 +14,6 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import * as dom from 'vs/base/browser/dom';
import * as types from 'vs/base/common/types';
import { IQueryModelService } from 'sql/parts/query/execution/queryModel';
@@ -52,14 +52,14 @@ export class EditDataResultsEditor extends BaseEditor {
return this._input;
}
public createEditor(parent: Builder): void {
public createEditor(parent: HTMLElement): void {
}
public dispose(): void {
super.dispose();
}
public layout(dimension: Dimension): void {
public layout(dimension: DOM.Dimension): void {
}
public setInput(input: EditDataResultsInput, options: EditorOptions): TPromise<void> {
@@ -73,9 +73,9 @@ export class EditDataResultsEditor extends BaseEditor {
private _applySettings() {
if (this.input && this.input.container) {
Configuration.applyFontInfoSlow(this.getContainer().getHTMLElement(), this._rawOptions);
Configuration.applyFontInfoSlow(this.getContainer(), this._rawOptions);
if (!this.input.css) {
this.input.css = dom.createStyleSheet(this.input.container);
this.input.css = DOM.createStyleSheet(this.input.container);
}
let cssRuleText = '';
if (types.isNumber(this._rawOptions.cellPadding)) {