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

@@ -11,7 +11,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import * as sqlops from 'sqlops';
import * as nls from 'vs/nls';
import * as TelemetryKeys from 'sql/common/telemetryKeys';

2
src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts
View File

@@ -14,7 +14,7 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { attachInputBoxStyler, attachCheckboxStyler } from 'vs/platform/theme/common/styler';
import { IPartService } from 'vs/workbench/services/part/common/partService';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { localize } from 'vs/nls';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';

15
src/sql/parts/objectExplorer/viewlet/connectionViewlet.ts
View File

@@ -6,13 +6,13 @@
'use strict';
import 'vs/css!./media/connectionViewlet';
import * as DOM from 'vs/base/browser/dom';
import { ThrottledDelayer } from 'vs/base/common/async';
import { TPromise } from 'vs/base/common/winjs.base';
import { Builder, Dimension } from 'vs/base/browser/builder';
import { Builder } from 'vs/base/browser/builder';
import { Viewlet } from 'vs/workbench/browser/viewlet';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { IAction } from 'vs/base/common/actions';
import { toggleClass } from 'vs/base/browser/dom';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
@@ -81,11 +81,12 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet {
});
}
public create(parent: Builder): TPromise<void> {
public create(parent: HTMLElement): TPromise<void> {
return new TPromise<void>((resolve) => {
super.create(parent);
this._root = parent.getHTMLElement();
parent.div({ class: 'server-explorer-viewlet' }, (viewletContainer) => {
this._root = parent;
let parentBuilder = new Builder(parent);
parentBuilder.div({ class: 'server-explorer-viewlet' }, (viewletContainer) => {
this._viewletContainer = viewletContainer;
viewletContainer.div({ class: 'search-box' }, (searchBoxContainer) => {
this._searchBoxContainer = searchBoxContainer;
@@ -147,10 +148,10 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet {
super.focus();
}
public layout({ height, width }: Dimension): void {
public layout({ height, width }: DOM.Dimension): void {
this._searchBox.layout();
this._serverTreeView.layout(height - 36); // account for search box
toggleClass(this._root, 'narrow', width <= 350);
DOM.toggleClass(this._root, 'narrow', width <= 350);
}
public getOptimalWidth(): number {

2
src/sql/parts/objectExplorer/viewlet/serverTreeController.ts
View File

@@ -103,7 +103,7 @@ export class ServerTreeController extends treedefaults.DefaultController {
getKeyBinding: (action) => this.keybindingService.lookupKeybinding(action.id),
onHide: (wasCancelled?: boolean) => {
if (wasCancelled) {
tree.DOMFocus();
tree.domFocus();
}
},
getActionsContext: () => (actionContext)

2
src/sql/parts/objectExplorer/viewlet/serverTreeView.ts
View File

@@ -27,7 +27,7 @@ import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
import { Button } from 'sql/base/browser/ui/button/button';
import { attachButtonStyler } from 'sql/common/theme/styler';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { SERVER_GROUP_CONFIG, SERVER_GROUP_AUTOEXPAND_CONFIG } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution';

2
src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts
View File

@@ -63,7 +63,7 @@ export class TreeUpdateUtils {
let targetsToExpand: any[];
// Focus
tree.DOMFocus();
tree.domFocus();
if (tree) {
let selection = tree.getSelection();