Merge from vscode 10492ba146318412cbee8b76a8c630f226914734

This commit is contained in:
ADS Merger
2020-04-08 06:33:38 +00:00
parent fca2344c2e
commit 1868a7d370
339 changed files with 3795 additions and 3146 deletions

View File

@@ -168,7 +168,7 @@ export function workbenchInstantiationService(overrides?: { textFileService?: (i
instantiationService.stub(ICodeEditorService, new CodeEditorService(editorService, themeService));
instantiationService.stub(IViewletService, new TestViewletService());
instantiationService.stub(IListService, new TestListService());
instantiationService.stub(IQuickInputService, new QuickInputService(TestEnvironmentService, configService, instantiationService, keybindingService, contextKeyService, themeService, accessibilityService, layoutService));
instantiationService.stub(IQuickInputService, new QuickInputService(configService, instantiationService, keybindingService, contextKeyService, themeService, accessibilityService, layoutService));
instantiationService.stub(IStorageKeysSyncRegistryService, new StorageKeysSyncRegistryService());
return instantiationService;
@@ -261,7 +261,11 @@ export class TestTextFileService extends BrowserTextFileService {
}
}
export const TestEnvironmentService = new BrowserWorkbenchEnvironmentService(Object.create(null));
class TestEnvironmentServiceWithArgs extends BrowserWorkbenchEnvironmentService {
args = [];
}
export const TestEnvironmentService = new TestEnvironmentServiceWithArgs(Object.create(null));
export class TestProgressService implements IProgressService {
@@ -1105,7 +1109,8 @@ export class TestRemotePathService implements IRemotePathService {
get path() { return Promise.resolve(isWindows ? win32 : posix); }
get userHome() { return Promise.resolve(URI.file(this.environmentService.userHome)); }
get userHome() { return Promise.resolve(this.environmentService.userHome!); }
get userHomeSync() { return this.environmentService.userHome; }
async fileURI(path: string): Promise<URI> {
return URI.file(path);