Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2

This commit is contained in:
ADS Merger
2020-05-31 19:47:51 +00:00
parent 84492049e8
commit 28be33cfea
913 changed files with 28242 additions and 15549 deletions

View File

@@ -54,6 +54,7 @@ import 'vs/workbench/browser/parts/views/viewsService';
//#region --- workbench services
import 'vs/platform/undoRedo/common/undoRedoService';
import 'vs/workbench/services/uriIdentity/common/uriIdentityService';
import 'vs/workbench/services/extensions/browser/extensionUrlHandler';
import 'vs/workbench/services/bulkEdit/browser/bulkEditService';
import 'vs/workbench/services/keybinding/common/keybindingEditing';
@@ -83,6 +84,7 @@ import 'vs/workbench/services/workingCopy/common/workingCopyFileService';
import 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
import 'vs/workbench/services/views/browser/viewDescriptorService';
import 'vs/workbench/services/quickinput/browser/quickInputService';
import 'vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
@@ -272,6 +274,9 @@ import 'vs/workbench/contrib/search/browser/searchView';
// Search Editor
import 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution';
// Sash
import 'vs/workbench/contrib/sash/browser/sash.contribution';
// SCM
import 'vs/workbench/contrib/scm/browser/scm.contribution';
import 'vs/workbench/contrib/scm/browser/scmViewlet';
@@ -292,7 +297,7 @@ import 'vs/workbench/contrib/markers/browser/markers.contribution';
import 'vs/workbench/contrib/comments/browser/comments.contribution';
// URL Support
import 'vs/workbench/contrib/url/common/url.contribution';
import 'vs/workbench/contrib/url/browser/url.contribution';
// Webview
import 'vs/workbench/contrib/webview/browser/webview.contribution';