Merge branch 'master' into ben/test-custom-editor

This commit is contained in:
Benjamin Pasero
2019-11-06 12:53:37 +01:00
52 changed files with 391 additions and 389 deletions

View File

@@ -70,7 +70,7 @@ import 'vs/workbench/services/editor/browser/editorService';
import 'vs/workbench/services/history/browser/history';
import 'vs/workbench/services/activity/browser/activityService';
import 'vs/workbench/services/keybinding/browser/keybindingService';
import 'vs/workbench/services/untitled/common/untitledEditorService';
import 'vs/workbench/services/untitled/common/untitledTextEditorService';
import 'vs/workbench/services/textfile/common/textResourcePropertiesService';
import 'vs/workbench/services/mode/common/workbenchModeService';
import 'vs/workbench/services/commands/common/commandService';