mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-04 01:25:38 -05:00
Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 * fix config changes * fix strictnull checks
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user