ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-21 09:35: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/modelComponents/button.component.ts
View File

@@ -9,7 +9,7 @@ import {
} from '@angular/core';
import * as sqlops from 'sqlops';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';

2
src/sql/parts/modelComponents/checkbox.component.ts
View File

@@ -9,7 +9,7 @@ import {
} from '@angular/core';
import * as sqlops from 'sqlops';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';

2
src/sql/parts/modelComponents/componentBase.ts
View File

@@ -15,7 +15,7 @@ import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, Com
import { FlexLayout, FlexItemLayout } from 'sqlops';
import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive';
import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';

2
src/sql/parts/modelComponents/dropdown.component.ts
View File

@@ -19,7 +19,7 @@ import { attachEditableDropdownStyler , attachSelectBoxStyler} from 'sql/common/
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { attachListStyler } from 'vs/platform/theme/common/styler';
@Component({

2
src/sql/parts/modelComponents/inputbox.component.ts
View File

@@ -18,7 +18,7 @@ import { IInputOptions, MessageType } from 'vs/base/browser/ui/inputbox/inputBox
import { attachInputBoxStyler, attachListStyler } from 'vs/platform/theme/common/styler';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import * as nls from 'vs/nls';
@Component({

2
src/sql/parts/modelComponents/interfaces.ts
View File

@@ -5,7 +5,7 @@
import { InjectionToken } from '@angular/core';
import * as sqlops from 'sqlops';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { IDisposable } from 'vs/base/common/lifecycle';
/**

9
src/sql/parts/modelComponents/modelEditor/modelViewEditor.ts
View File

@@ -9,7 +9,6 @@ import { TPromise } from 'vs/base/common/winjs.base';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { Dimension } from 'vs/workbench/services/part/common/partService';
import { EditorOptions } from 'vs/workbench/common/editor';
import * as DOM from 'vs/base/browser/dom';
import { Position } from 'vs/platform/editor/common/editor';
@@ -31,10 +30,10 @@ export class ModelViewEditor 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 {
this._editorFrame = parent.getHTMLElement();
public createEditor(parent: HTMLElement): void {
this._editorFrame = parent;
}
/**
@@ -93,7 +92,7 @@ export class ModelViewEditor 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 {
if (this.input instanceof ModelViewInput) {
if (this.input.container && this.input.dialogPane) {
this.doUpdateContainer();

2
src/sql/parts/modelComponents/modelViewContent.component.ts
View File

@@ -6,7 +6,7 @@
import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef, ElementRef } from '@angular/core';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { Parts } from 'vs/workbench/services/part/common/partService';
import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
import { addDisposableListener, EventType } from 'vs/base/browser/dom';

2
src/sql/parts/modelComponents/radioButton.component.ts
View File

@@ -10,7 +10,7 @@ import {
} from '@angular/core';
import * as sqlops from 'sqlops';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';

14
src/sql/parts/modelComponents/table.component.ts
View File

@@ -4,8 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import {
Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit
Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, ElementRef, OnDestroy, AfterViewInit
} from '@angular/core';
import * as sqlops from 'sqlops';
@@ -18,10 +17,7 @@ import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
import { attachTableStyler } from 'sql/common/theme/styler';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import Event, { Emitter } from 'vs/base/common/event';
import { Dimension } from 'vs/base/browser/builder';
import * as nls from 'vs/nls';
import { getContentHeight, getContentWidth } from 'vs/base/browser/dom';
import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/dom';
import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin';
@Component({
@@ -40,9 +36,7 @@ export default class TableComponent extends ComponentBase implements IComponent,
@ViewChild('table', { read: ElementRef }) private _inputContainer: ElementRef;
constructor(
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
@Inject(IContextViewService) private contextViewService: IContextViewService
) {
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService) {
super(changeRef);
}
@@ -140,7 +134,7 @@ export default class TableComponent extends ComponentBase implements IComponent,
this._changeRef.detectChanges();
}
public setLayout(layout: any): void {
public setLayout(): void {
// TODO allow configuring the look and feel
this.layout();
}

2
src/sql/parts/modelComponents/text.component.ts
View File

@@ -10,7 +10,7 @@ import {
} from '@angular/core';
import * as sqlops from 'sqlops';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';

2
src/sql/parts/modelComponents/viewBase.ts
View File

@@ -16,7 +16,7 @@ import { IModelView } from 'sql/services/model/modelViewService';
import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
import { AngularDisposable } from 'sql/base/common/lifecycle';
import { ModelStore } from 'sql/parts/modelComponents/modelStore';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
const componentRegistry = <IComponentRegistry>Registry.as(Extensions.ComponentContribution);

10
src/sql/parts/modelComponents/webview.component.ts
View File

@@ -9,14 +9,14 @@ import {
} from '@angular/core';
import * as sqlops from 'sqlops';
import Event, { Emitter } from 'vs/base/common/event';
import { Webview } from 'vs/workbench/parts/html/browser/webview';
import { Event, Emitter } from 'vs/base/common/event';
import { addDisposableListener, EventType } from 'vs/base/browser/dom';
import { Parts, IPartService } from 'vs/workbench/services/part/common/partService';
import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
@@ -29,7 +29,7 @@ export default class WebViewComponent extends ComponentBase implements IComponen
@Input() descriptor: IComponentDescriptor;
@Input() modelStore: IModelStore;
private _webview: Webview;
private _webview: WebviewElement;
private _onMessage = new Emitter<any>();
private _renderedHtml: string;
@@ -54,7 +54,7 @@ export default class WebViewComponent extends ComponentBase implements IComponen
}
private _createWebview(): void {
this._webview = this._register(new Webview(this._el.nativeElement,
this._webview = this._register(new WebviewElement(
this.partService.getContainer(Parts.EDITOR_PART),
this.themeService,
this.environmentService,
@@ -66,7 +66,7 @@ export default class WebViewComponent extends ComponentBase implements IComponen
enableWrappedPostMessage: true
}
));
this._webview.mountTo(this._el.nativeElement);
this._register(this._webview.onMessage(e => {
this._onEventEmitter.fire({