Merge from vscode 7eaf220cafb9d9e901370ffce02229171cbf3ea6

This commit is contained in:
ADS Merger
2020-09-03 02:34:56 +00:00
committed by Anthony Dresser
parent 39d9eed585
commit a63578e6f7
519 changed files with 14338 additions and 6670 deletions

View File

@@ -56,7 +56,6 @@ import 'vs/workbench/browser/parts/views/viewsService';
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';
import 'vs/workbench/services/decorations/browser/decorationsService';
import 'vs/workbench/services/progress/browser/progressService';
@@ -271,7 +270,8 @@ import 'vs/workbench/contrib/files/browser/files.contribution';
import 'vs/workbench/contrib/backup/common/backup.contribution';
// bulkEdit
import 'vs/workbench/contrib/bulkEdit/browser/bulkEdit.contribution';
import 'vs/workbench/contrib/bulkEdit/browser/bulkEditService';
import 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution';
// Search
import 'vs/workbench/contrib/search/browser/search.contribution';