Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions

View File

@@ -53,7 +53,7 @@ import 'vs/workbench/browser/parts/views/views';
//#region --- workbench services
import 'vs/workbench/services/extensions/common/inactiveExtensionUrlHandler';
import 'vs/workbench/services/extensions/common/extensionUrlHandler';
import 'vs/workbench/services/bulkEdit/browser/bulkEditService';
import 'vs/workbench/services/keybinding/common/keybindingEditing';
import 'vs/workbench/services/decorations/browser/decorationsService';
@@ -76,6 +76,7 @@ import 'vs/workbench/services/label/common/labelService';
import 'vs/workbench/services/extensionManagement/common/extensionEnablementService';
import 'vs/workbench/services/notification/common/notificationService';
import 'vs/workbench/services/extensions/common/staticExtensions';
import 'vs/workbench/services/workspace/browser/workspaceEditingService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
@@ -173,6 +174,7 @@ import 'vs/workbench/contrib/url/common/url.contribution';
// Webview
import 'vs/workbench/contrib/webview/browser/webview.contribution';
import 'vs/workbench/contrib/customEditor/browser/webviewEditor.contribution';
// Extensions Management
import 'vs/workbench/contrib/extensions/browser/extensions.contribution';
@@ -220,11 +222,13 @@ import 'vs/workbench/contrib/format/browser/format.contribution';
// Themes
import 'vs/workbench/contrib/themes/browser/themes.contribution';
// Update
import 'vs/workbench/contrib/update/browser/update.contribution';
// Watermark
import 'vs/workbench/contrib/watermark/browser/watermark';
// Welcome
import 'vs/workbench/contrib/welcome/walkThrough/browser/walkThrough.contribution';
import 'vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay';
// Call Hierarchy