ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-27 01:25:36 -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/query/common/queryInput.ts
View File

@@ -10,7 +10,7 @@ import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorIn
import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
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 URI from 'vs/base/common/uri';
import { ISelectionData, ExecutionPlanOptions } from 'sqlops';
import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService';

43
src/sql/parts/query/editor/queryEditor.ts
View File

@@ -7,7 +7,6 @@ import 'vs/css!sql/parts/query/editor/media/queryEditor';
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 { Builder, Dimension, withElementById } from 'vs/base/browser/builder';
import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -65,7 +64,7 @@ export class QueryEditor extends BaseEditor {
private _sash: IFlexibleSash;
private _editorTopOffset: number;
private _orientation: Orientation;
private _dimension: Dimension;
private _dimension: DOM.Dimension;
private _resultsEditor: QueryResultsEditor;
private _resultsEditorContainer: HTMLElement;
@@ -137,10 +136,10 @@ export class QueryEditor 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);
}
@@ -244,7 +243,7 @@ export class QueryEditor 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) {
@@ -301,7 +300,7 @@ export class QueryEditor extends BaseEditor {
this._createEditor(<QueryResultsInput>input.results, this._resultsEditorContainer)
.then(result => {
this._onResultsEditorCreated(<QueryResultsEditor>result, input.results, this.options);
this._onResultsEditorCreated(<any>result, input.results, this.options);
this.resultsEditorVisibility = true;
this.hideQueryResultsView = false;
this._doLayout(true);
@@ -571,7 +570,7 @@ export class QueryEditor 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);
}
@@ -596,7 +595,7 @@ export class QueryEditor 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';
}
@@ -609,7 +608,7 @@ export class QueryEditor extends BaseEditor {
private _createResultsEditorContainer() {
this._createSash();
const parentElement = this.getContainer().getHTMLElement();
const parentElement = this.getContainer();
let input = <QueryInput>this.input;
if (!input.results.container) {
@@ -632,7 +631,7 @@ export class QueryEditor extends BaseEditor {
*/
private _createSash(): void {
if (!this._sash) {
let parentElement: HTMLElement = this.getContainer().getHTMLElement();
let parentElement: HTMLElement = this.getContainer();
if (this._orientation === Orientation.HORIZONTAL) {
this._sash = this._register(new HorizontalFlexibleSash(parentElement, this._minEditorSize));
@@ -655,7 +654,7 @@ export class QueryEditor extends BaseEditor {
if (this._orientation === Orientation.HORIZONTAL) {
this._sash.setDimenesion(this._dimension);
} else {
this._sash.setDimenesion(new Dimension(this._dimension.width, this._dimension.height - this.getTaskBarHeight()));
this._sash.setDimenesion(new DOM.Dimension(this._dimension.width, this._dimension.height - this.getTaskBarHeight()));
}
}
@@ -692,13 +691,13 @@ export class QueryEditor 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 = splitPointTop - (parent.top + this.getTaskBarHeight());
let titleBar = withElementById('workbench.parts.titlebar');
let titleBar = document.getElementById('workbench.parts.titlebar');
if (titleBar) {
sqlEditorHeight += DOM.getContentHeight(titleBar.getHTMLElement());
sqlEditorHeight += DOM.getContentHeight(titleBar);
}
let queryResultsEditorHeight = parent.bottom - splitPointTop;
@@ -711,13 +710,13 @@ export class QueryEditor extends BaseEditor {
this._resultsEditorContainer.style.width = `${this._dimension.width}px`;
this._resultsEditorContainer.style.top = `${splitPointTop}px`;
this._sqlEditor.layout(new Dimension(this._dimension.width, sqlEditorHeight));
this._resultsEditor.layout(new Dimension(this._dimension.width, queryResultsEditorHeight));
this._sqlEditor.layout(new DOM.Dimension(this._dimension.width, sqlEditorHeight));
this._resultsEditor.layout(new DOM.Dimension(this._dimension.width, queryResultsEditorHeight));
}
private _doLayoutVertical(): void {
let splitPointLeft: number = this._sash.getSplitPoint();
let parent: ClientRect = this.getContainer().getHTMLElement().getBoundingClientRect();
let parent: ClientRect = this.getContainer().getBoundingClientRect();
let sqlEditorWidth = splitPointLeft;
let queryResultsEditorWidth = parent.width - splitPointLeft;
@@ -732,8 +731,8 @@ export class QueryEditor extends BaseEditor {
this._resultsEditorContainer.style.height = `${this._dimension.height - taskbarHeight}px`;
this._resultsEditorContainer.style.left = `${splitPointLeft}px`;
this._sqlEditor.layout(new Dimension(sqlEditorWidth, this._dimension.height - taskbarHeight));
this._resultsEditor.layout(new Dimension(queryResultsEditorWidth, this._dimension.height - taskbarHeight));
this._sqlEditor.layout(new DOM.Dimension(sqlEditorWidth, this._dimension.height - taskbarHeight));
this._resultsEditor.layout(new DOM.Dimension(queryResultsEditorWidth, this._dimension.height - taskbarHeight));
}
private _doLayoutSql() {
@@ -745,7 +744,7 @@ export class QueryEditor extends BaseEditor {
}
if (this._dimension) {
this._sqlEditor.layout(new Dimension(this._dimension.width, this._dimension.height - this.getTaskBarHeight()));
this._sqlEditor.layout(new DOM.Dimension(this._dimension.width, this._dimension.height - this.getTaskBarHeight()));
}
}
@@ -769,7 +768,7 @@ export class QueryEditor 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;

12
src/sql/parts/query/editor/queryResultsEditor.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { Builder, Dimension } from 'vs/base/browser/builder';
import { Builder } from 'vs/base/browser/builder';
import { EditorOptions } from 'vs/workbench/common/editor';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -16,7 +16,7 @@ import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
import { getZoomLevel } from 'vs/base/browser/browser';
import { Configuration } from 'vs/editor/browser/config/configuration';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import * as dom from 'vs/base/browser/dom';
import * as DOM from 'vs/base/browser/dom';
import * as types from 'vs/base/common/types';
import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
@@ -120,7 +120,7 @@ export class QueryResultsEditor extends BaseEditor {
private applySettings() {
if (this.input && this.input.container) {
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)) {
@@ -134,10 +134,10 @@ export class QueryResultsEditor extends BaseEditor {
}
}
createEditor(parent: Builder): void {
createEditor(parent: HTMLElement): void {
}
layout(dimension: Dimension): void {
layout(dimension: DOM.Dimension): void {
}
setInput(input: QueryResultsInput, options: EditorOptions): TPromise<void> {
@@ -172,7 +172,7 @@ export class QueryResultsEditor extends BaseEditor {
let params: IQueryComponentParams = { dataService: dataService };
this._instantiationService.invokeFunction(bootstrapAngular,
QueryOutputModule,
this.getContainer().getHTMLElement(),
this.getContainer(),
QUERY_OUTPUT_SELECTOR,
params,
input);

2
src/sql/parts/query/execution/queryModel.ts
View File

@@ -7,7 +7,7 @@ import QueryRunner from 'sql/parts/query/execution/queryRunner';
import { DataService } from 'sql/parts/grid/services/dataService';
import { ISlickRange } from 'angular2-slickgrid';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import Event from 'vs/base/common/event';
import { Event } from 'vs/base/common/event';
import { QueryInput } from 'sql/parts/query/common/queryInput';
import {
ISelectionData,

2
src/sql/parts/query/execution/queryModelService.ts
View File

@@ -21,7 +21,7 @@ import * as nls from 'vs/nls';
import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar';
import * as platform from 'vs/platform/registry/common/platform';
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 { TPromise } from 'vs/base/common/winjs.base';
import * as strings from 'vs/base/common/strings';
import * as types from 'vs/base/common/types';

2
src/sql/parts/query/services/queryEditorService.ts
View File

@@ -245,7 +245,7 @@ export class QueryEditorService implements IQueryEditorService {
let index: number = group.indexOf(editor.input);
let position: Position = editor.position;
let options: IQueryEditorOptions = editor.options ? editor.options : {};
options.index = index;
options = Object.assign(options, { index: index });
options.pinned = group.isPinned(index);
// Return a promise that will resovle when the old editor has been replaced by a new editor

4
src/sql/parts/query/views/flexibleSash.ts
View File

@@ -5,9 +5,9 @@
'use strict';
import { Dimension } from 'vs/base/browser/dom';
import { Disposable } from 'vs/base/common/lifecycle';
import { Dimension } from 'vs/base/browser/builder';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { IHorizontalSashLayoutProvider, IVerticalSashLayoutProvider,
ISashEvent, Orientation, VSash, Sash } from 'vs/base/browser/ui/sash/sash';
// There is no need to import the sash CSS - 'vs/base/browser/ui/sash/sash' already includes it