Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

This commit is contained in:
ADS Merger
2020-06-18 04:32:54 +00:00
committed by AzureDataStudio
parent a971aee5bd
commit 5e7071e466
1002 changed files with 24201 additions and 13193 deletions

View File

@@ -38,6 +38,7 @@ import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/wo
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { INativeWindowConfiguration } from 'vs/platform/windows/node/window';
import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
export const TestWindowConfiguration: INativeWindowConfiguration = {
windowId: 0,
@@ -74,7 +75,8 @@ export class TestTextFileService extends NativeTextFileService {
@ICodeEditorService codeEditorService: ICodeEditorService,
@IPathService athService: IPathService,
@IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService,
@ILogService logService: ILogService
@ILogService logService: ILogService,
@IUriIdentityService uriIdentityService: IUriIdentityService
) {
super(
fileService,
@@ -92,7 +94,8 @@ export class TestTextFileService extends NativeTextFileService {
codeEditorService,
athService,
workingCopyFileService,
logService
logService,
uriIdentityService
);
}
@@ -149,7 +152,7 @@ class TestEncodingOracle extends EncodingOracle {
export class TestSharedProcessService implements ISharedProcessService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
getChannel(channelName: string): any { return undefined; }
@@ -161,7 +164,7 @@ export class TestSharedProcessService implements ISharedProcessService {
export class TestElectronService implements IElectronService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
readonly windowId = -1;
@@ -170,6 +173,7 @@ export class TestElectronService implements IElectronService {
onWindowUnmaximize: Event<number> = Event.None;
onWindowFocus: Event<number> = Event.None;
onWindowBlur: Event<number> = Event.None;
onOSResume: Event<unknown> = Event.None;
windowCount = Promise.resolve(1);
getWindowCount(): Promise<number> { return this.windowCount; }
@@ -209,11 +213,13 @@ export class TestElectronService implements IElectronService {
async moveWindowTabToNewWindow(): Promise<void> { }
async mergeAllWindowTabs(): Promise<void> { }
async toggleWindowTabsBar(): Promise<void> { }
async notifyReady(): Promise<void> { }
async relaunch(options?: { addArgs?: string[] | undefined; removeArgs?: string[] | undefined; } | undefined): Promise<void> { }
async reload(): Promise<void> { }
async closeWindow(): Promise<void> { }
async closeWindowById(): Promise<void> { }
async quit(): Promise<void> { }
async exit(code: number): Promise<void> { }
async openDevTools(options?: Electron.OpenDevToolsOptions | undefined): Promise<void> { }
async toggleDevTools(): Promise<void> { }
async startCrashReporter(options: Electron.CrashReporterStartOptions): Promise<void> { }
@@ -257,7 +263,7 @@ export class TestServiceAccessor {
export class TestNativePathService extends TestPathService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
constructor(@IWorkbenchEnvironmentService environmentService: INativeWorkbenchEnvironmentService) {
super(environmentService.userHome);