ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-23 11:01: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/sqltest/parts/connection/objectExplorerService.test.ts
View File

@@ -18,7 +18,7 @@ import * as TypeMoq from 'typemoq';
import * as assert from 'assert';
import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView';
import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { CapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService';

4
src/sqltest/parts/query/editor/queryEditor.test.ts
View File

@@ -31,7 +31,7 @@ import * as assert from 'assert';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { INotification, INotificationService } from 'vs/platform/notification/common/notification';
import { TestNotificationService } from 'vs/workbench/test/workbenchTestServices';
import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
suite('SQL QueryEditor Tests', () => {
let queryModelService: QueryModelService;
@@ -140,7 +140,7 @@ suite('SQL QueryEditor Tests', () => {
test('createEditor creates only the taskbar', (done) => {
// If I call createEditor
let editor: QueryEditor = getQueryEditor();
editor.createEditor(parentBuilder);
editor.createEditor(parentBuilder.getHTMLElement());
// The taskbar should be created
assert.equal(!!editor.taskbar, true);

2
src/sqltest/stubs/accountManagementStubs.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import * as sqlops from 'sqlops';
import Event from 'vs/base/common/event';
import { Event } from 'vs/base/common/event';
import { IAccountManagementService } from 'sql/services/accountManagement/interfaces';
import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes';
import { TPromise } from 'vs/base/common/winjs.base';

2
src/sqltest/stubs/capabilitiesTestService.ts
View File

@@ -9,7 +9,7 @@ import { ConnectionManagementInfo } from 'sql/parts/connection/common/connection
import { ICapabilitiesService, clientCapabilities, ProviderFeatures } from 'sql/services/capabilities/capabilitiesService';
import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { Action } from 'vs/base/common/actions';
export class CapabilitiesTestService implements ICapabilitiesService {

2
src/sqltest/stubs/connectionManagementService.test.ts
View File

@@ -10,7 +10,7 @@ import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo';
import * as sqlops from 'sqlops';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
// Test stubs for commonly used objects

2
src/sqltest/stubs/contextKeyServiceStub.ts
View File

@@ -5,7 +5,7 @@
import { IContextKeyService, IContextKeyServiceTarget, IContextKey, ContextKeyExpr, IContext, IContextKeyChangeEvent } from 'vs/platform/contextkey/common/contextkey';
import Event from 'vs/base/common/event';
import { Event } from 'vs/base/common/event';
export class ContextKeyServiceStub implements IContextKeyService {
_serviceBrand: any;

2
src/sqltest/stubs/editorGroupService.ts
View File

@@ -8,7 +8,7 @@
import { ServiceIdentifier, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { Position, IEditorInput } from 'vs/platform/editor/common/editor';
import { IEditorStacksModel, IEditorGroup, EditorInput, IEditorOpeningEvent } from 'vs/workbench/common/editor';
import Event from 'vs/base/common/event';
import { Event } from 'vs/base/common/event';
import { IEditorTabOptions, GroupArrangement, GroupOrientation, IEditorGroupService, IMoveOptions } from 'vs/workbench/services/group/common/groupService';
import { EditorGroup } from 'vs/workbench/common/editor/editorStacksModel';

2
src/sqltest/stubs/workspaceConfigurationTestService.ts
View File

@@ -10,7 +10,7 @@ import { IConfigurationValue } from 'vs/workbench/services/configuration/node/co
import { IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
import { TPromise } from 'vs/base/common/winjs.base';
import Event from 'vs/base/common/event';
import { Event } from 'vs/base/common/event';
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
export class WorkspaceConfigurationTestService implements IWorkspaceConfigurationService {