mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-30 08:40:29 -04:00
Vscode merge (#4582)
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd * fix issues with merges * bump node version in azpipe * replace license headers * remove duplicate launch task * fix build errors * fix build errors * fix tslint issues * working through package and linux build issues * more work * wip * fix packaged builds * working through linux build errors * wip * wip * wip * fix mac and linux file limits * iterate linux pipeline * disable editor typing * revert series to parallel * remove optimize vscode from linux * fix linting issues * revert testing change * add work round for new node * readd packaging for extensions * fix issue with angular not resolving decorator dependencies
This commit is contained in:
@@ -7,12 +7,26 @@
|
||||
|
||||
import { ServiceIdentifier, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { Event } from 'vs/base/common/event';
|
||||
import { IEditorGroupsService, GroupOrientation, IEditorGroup, GroupDirection, GroupsArrangement, IMoveEditorOptions, GroupsOrder, EditorGroupLayout, IFindGroupScope, IAddGroupOptions, IMergeGroupOptions } from 'vs/workbench/services/group/common/editorGroupsService';
|
||||
import { IEditorOpeningEvent } from 'vs/workbench/browser/parts/editor/editor';
|
||||
import { IEditorInput, EditorInput, GroupIdentifier } from 'vs/workbench/common/editor';
|
||||
import { IEditorInput, EditorInput, GroupIdentifier, IEditorPartOptions } from 'vs/workbench/common/editor';
|
||||
import { EditorGroup } from 'vs/workbench/common/editor/editorGroup';
|
||||
import { IEditorGroupsService, IFindGroupScope, IEditorGroup, GroupDirection, IAddGroupOptions, IMergeGroupOptions, GroupOrientation, GroupsOrder, GroupsArrangement, IMoveEditorOptions, EditorGroupLayout } from 'vs/workbench/services/editor/common/editorGroupsService';
|
||||
import { IDimension } from 'vs/editor/common/editorCommon';
|
||||
import { IDisposable } from 'vs/base/common/lifecycle';
|
||||
|
||||
export class EditorGroupTestService implements IEditorGroupsService {
|
||||
dimension: IDimension;
|
||||
whenRestored: Promise<void>;
|
||||
centerLayout(active: boolean): void {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
isLayoutCentered(): boolean {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
partOptions: IEditorPartOptions;
|
||||
enforcePartOptions(options: IEditorPartOptions): IDisposable {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
_serviceBrand: ServiceIdentifier<any>;
|
||||
|
||||
findGroup(scope: IFindGroupScope, source?: IEditorGroup | GroupIdentifier, wrap?: boolean): IEditorGroup {
|
||||
@@ -43,12 +57,16 @@ export class EditorGroupTestService implements IEditorGroupsService {
|
||||
|
||||
onEditorGroupMoved: Event<void>;
|
||||
|
||||
onDidLayout: Event<IDimension>;
|
||||
|
||||
/**
|
||||
* An event for when the active editor group changes. The active editor
|
||||
* group is the default location for new editors to open.
|
||||
*/
|
||||
readonly onDidActiveGroupChange: Event<IEditorGroup>;
|
||||
|
||||
onDidActivateGroup: Event<IEditorGroup>;
|
||||
|
||||
/**
|
||||
* An event for when a new group was added.
|
||||
*/
|
||||
@@ -214,4 +232,4 @@ export class EditorGroupTestService implements IEditorGroupsService {
|
||||
applyLayout(layout: EditorGroupLayout): void {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,6 +65,12 @@ export class StorageTestService implements IStorageService {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
getNumber(key: string, scope: StorageScope, fallbackValue: number): number;
|
||||
getNumber(key: string, scope: StorageScope, fallbackValue?: number): number;
|
||||
getNumber(key: any, scope: any, fallbackValue?: any): number {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve an element stored with the given key from local storage. Use
|
||||
* the provided defaultValue if the element is null or undefined. The element
|
||||
@@ -86,4 +92,4 @@ export class StorageTestService implements IStorageService {
|
||||
getBoolean(key: string, scope?: StorageScope, defaultValue?: boolean): boolean {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,9 +9,9 @@ import { IEditorOptions, IResourceInput, ITextEditorOptions } from 'vs/platform
|
||||
import { IEditor, IEditorInput, IResourceDiffInput, IResourceSideBySideInput, GroupIdentifier, ITextEditor, IUntitledResourceInput, ITextDiffEditor, ITextSideBySideEditor, IEditorInputWithOptions } from 'vs/workbench/common/editor';
|
||||
import { Event } from 'vs/base/common/event';
|
||||
import { Position } from 'vs/editor/common/core/position';
|
||||
import { IEditorGroup, IEditorReplacement } from 'vs/workbench/services/group/common/editorGroupsService';
|
||||
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
|
||||
import { IDisposable } from 'vs/base/common/lifecycle';
|
||||
import { IEditorGroup, IEditorReplacement } from 'vs/workbench/services/editor/common/editorGroupsService';
|
||||
|
||||
export class WorkbenchEditorTestService implements IEditorService {
|
||||
_serviceBrand: ServiceIdentifier<any>;
|
||||
@@ -109,4 +109,4 @@ export class WorkbenchEditorTestService implements IEditorService {
|
||||
getOpened(editor: IResourceInput | IUntitledResourceInput, group?: IEditorGroup | GroupIdentifier): IEditorInput {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,13 +4,12 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
'use strict';
|
||||
|
||||
import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
|
||||
import { IConfigurationData, IConfigurationOverrides, ConfigurationTarget, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
|
||||
import { IConfigurationData, IConfigurationOverrides, ConfigurationTarget, IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
||||
|
||||
import { Event } from 'vs/base/common/event';
|
||||
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
|
||||
|
||||
export class WorkspaceConfigurationTestService implements IWorkspaceConfigurationService {
|
||||
export class WorkspaceConfigurationTestService implements IConfigurationService {
|
||||
_serviceBrand: any;
|
||||
|
||||
getValue<T>(): T;
|
||||
|
||||
Reference in New Issue
Block a user