ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

Browse Source 
* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vs/workbench/workbench.web.main.ts
View File

@@ -7,7 +7,7 @@
import 'vs/editor/editor.all';
// import 'vs/workbench/api/electron-browser/extensionHost.contribution';
import 'vs/workbench/api/browser/extensionHost.contribution';
// import 'vs/workbench/electron-browser/main.contribution';
import 'vs/workbench/browser/workbench.contribution';
@@ -90,7 +90,6 @@ import { ContextViewService } from 'vs/platform/contextview/browser/contextViewS
// import { IURLService } from 'vs/platform/url/common/url';
// import { RelayURLService } from 'vs/platform/url/electron-browser/urlService';
import { IHeapService, NullHeapService } from 'vs/workbench/services/heap/common/heap';
import { IBroadcastService, NullBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast';
import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
@@ -101,14 +100,13 @@ import 'vs/platform/dialogs/browser/dialogService';
import 'vs/workbench/services/bulkEdit/browser/bulkEditService';
// import 'vs/workbench/services/integrity/node/integrityService';
import 'vs/workbench/services/keybinding/common/keybindingEditing';
// import 'vs/workbench/services/textMate/electron-browser/textMateService';
import 'vs/workbench/services/textMate/browser/textMateService';
// import 'vs/workbench/services/workspace/electron-browser/workspaceEditingService';
// import 'vs/workbench/services/extensions/electron-browser/inactiveExtensionUrlHandler';
import 'vs/workbench/services/decorations/browser/decorationsService';
// import 'vs/workbench/services/search/node/searchService';
import 'vs/workbench/services/progress/browser/progressService2';
import 'vs/workbench/services/progress/browser/progressService';
import 'vs/workbench/services/editor/browser/codeEditorService';
// import 'vs/workbench/services/broadcast/electron-browser/broadcastService';
import 'vs/workbench/services/preferences/browser/preferencesService';
import 'vs/workbench/services/output/common/outputChannelModelService';
import 'vs/workbench/services/configuration/common/jsonEditingService';
@@ -128,7 +126,7 @@ import 'vs/workbench/services/mode/common/workbenchModeService';
import 'vs/workbench/services/commands/common/commandService';
import 'vs/workbench/services/themes/browser/workbenchThemeService';
// import 'vs/workbench/services/extensionManagement/node/extensionEnablementService';
// import 'vs/workbench/services/extensions/electron-browser/extensionService';
import 'vs/workbench/services/extensions/browser/extensionService';
// import 'vs/workbench/services/contextmenu/electron-browser/contextmenuService';
// import 'vs/workbench/services/extensionManagement/node/multiExtensionManagement';
import 'vs/workbench/services/label/common/labelService';
@@ -167,7 +165,6 @@ registerSingleton(IContextViewService, ContextViewService, true);
// registerSingleton(IMenubarService, MenubarService);
// registerSingleton(IURLService, RelayURLService);
registerSingleton(IHeapService, NullHeapService);
registerSingleton(IBroadcastService, NullBroadcastService);
registerSingleton(IContextMenuService, ContextMenuService);
registerSingleton(IConfigurationResolverService, ConfigurationResolverService, true);
@@ -198,8 +195,11 @@ import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';
// import 'vs/workbench/contrib/localizations/browser/localizations.contribution';
// Preferences
// import 'vs/workbench/contrib/preferences/electron-browser/preferences.contribution';
import 'vs/workbench/contrib/preferences/browser/preferences.contribution';
import 'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution';
import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences';
import { PreferencesSearchService } from 'vs/workbench/contrib/preferences/browser/preferencesSearch';
registerSingleton(IPreferencesSearchService, PreferencesSearchService, true);
// Logs
import 'vs/workbench/contrib/logs/common/logs.contribution';
@@ -249,6 +249,8 @@ import 'vs/workbench/contrib/url/common/url.contribution';
// Webview
// import 'vs/workbench/contrib/webview/electron-browser/webview.contribution';
registerSingleton(IWebviewService, NullWebviewService, true);
registerSingleton(IWebviewEditorService, WebviewEditorService, true);
// Extensions Management
// import 'vs/workbench/contrib/extensions/electron-browser/extensions.contribution';
@@ -322,13 +324,13 @@ import 'vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay';
// Outline
import 'vs/workbench/contrib/outline/browser/outline.contribution';
import { IWebviewService } from 'vs/workbench/contrib/webview/common/webview';
import { NullWebviewService } from 'vs/workbench/contrib/webview/browser/webviewService';
import { IWebviewEditorService, WebviewEditorService } from 'vs/workbench/contrib/webview/browser/webviewEditorService';
// Experiments
// import 'vs/workbench/contrib/experiments/electron-browser/experiments.contribution';
// Code Insets
// import 'vs/workbench/contrib/codeinset/electron-browser/codeInset.contribution';
// Issues
// import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';