ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-08 09:38:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/workbench.main.ts
View File

@@ -19,10 +19,11 @@ import 'vs/editor/editor.all';
import 'vs/workbench/services/actions/electron-browser/menusExtensionPoint';
// Views
import 'vs/workbench/api/browser/viewsContainersExtensionPoint';
import 'vs/workbench/api/browser/viewsExtensionPoint';
// Localizations
import 'vs/workbench/parts/localizations/browser/localizations.contribution';
import 'vs/workbench/parts/localizations/electron-browser/localizations.contribution';
// Workbench
import 'vs/workbench/browser/actions/toggleActivityBarVisibility';
@@ -64,10 +65,12 @@ import 'vs/workbench/parts/scm/electron-browser/scmViewlet'; // can be packaged
// import 'vs/workbench/parts/debug/browser/debugEditorActions';
// import 'vs/workbench/parts/debug/browser/debugViewlet'; // can be packaged separately
import 'vs/workbench/parts/markers/markers.contribution';
import 'vs/workbench/parts/markers/browser/markersPanel'; // can be packaged separately
import 'vs/workbench/parts/markers/electron-browser/markers.contribution';
import 'vs/workbench/parts/html/browser/html.contribution';
import 'vs/workbench/parts/html/electron-browser/html.contribution';
import 'vs/workbench/parts/url/electron-browser/url.contribution';
import 'vs/workbench/parts/webview/electron-browser/webview.contribution';
// {{SQL CARBON EDIT}}
// import 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution';
@@ -87,8 +90,6 @@ import 'vs/workbench/parts/terminal/electron-browser/terminalPanel'; // can be p
import 'vs/workbench/electron-browser/workbench';
import 'vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution';
import 'vs/workbench/parts/relauncher/electron-browser/relauncher.contribution';
import 'vs/workbench/parts/tasks/electron-browser/task.contribution';