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

Merge remote-tracking branch 'origin/master' into ads-master-vscode-2020-05-31T19-47-47

Browse Source
This commit is contained in:
Anthony Dresser
2020-06-03 12:35:26 -07:00
parent 8b0b0a029e 2e4aee944c
commit 15d8e09491
114 changed files with 2815 additions and 2428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/api/browser/viewsExtensionPoint.ts
View File

@@ -20,6 +20,7 @@ import { VIEWLET_ID as EXPLORER } from 'vs/workbench/contrib/files/common/files'
import { VIEWLET_ID as SCM } from 'vs/workbench/contrib/scm/common/scm';
import { VIEWLET_ID as DEBUG } from 'vs/workbench/contrib/debug/common/debug';
import { VIEWLET_ID as REMOTE } from 'vs/workbench/contrib/remote/common/remote.contribution';
import { VIEWLET_ID as NOTEBOOK } from 'sql/workbench/contrib/notebook/browser/notebookExplorer/notebookExplorerViewlet'; // {{SQL CARBON EDIT}}
import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { URI } from 'vs/base/common/uri';
import { ViewletRegistry, Extensions as ViewletExtensions, ShowViewletAction } from 'vs/workbench/browser/viewlet';
@@ -175,6 +176,13 @@ const viewsContribution: IJSONSchema = {
type: 'array',
items: remoteViewDescriptor,
default: []
},
// {{SQL CARBON EDIT}}
'notebooks': {
description: localize('views.notebooks', "Contributes views to Notebooks container in the Activity bar."),
type: 'array',
items: viewDescriptor,
default: []
}
},
additionalProperties: {
@@ -500,6 +508,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
case 'debug': return this.viewContainersRegistry.get(DEBUG);
case 'scm': return this.viewContainersRegistry.get(SCM);
case 'remote': return this.viewContainersRegistry.get(REMOTE);
case 'notebooks': return this.viewContainersRegistry.get(NOTEBOOK); // {{SQL CARBON EDIT}}
default: return this.viewContainersRegistry.get(`workbench.view.extension.${value}`);
}
}

1
src/vs/workbench/api/common/menusExtensionPoint.ts
View File

@@ -52,6 +52,7 @@ namespace schema {
case 'notebook/toolbar': return MenuId.NotebookToolbar;
case 'dataExplorer/context': return MenuId.DataExplorerContext;
case 'dataExplorer/action': return MenuId.DataExplorerAction;
case 'notebooks/title': return MenuId.NotebookTitle;
case 'comments/commentThread/title': return MenuId.CommentThreadTitle;
case 'comments/commentThread/context': return MenuId.CommentThreadActions;
case 'comments/comment/title': return MenuId.CommentTitle;

4
src/vs/workbench/browser/layout.ts
View File

@@ -600,6 +600,10 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
case 'remote':
viewletId = 'workbench.view.remote';
break;
// {{SQL CARBON EDIT}} add notebook view container to views
case 'notebooks':
viewletId = 'workbench.view.notebooks';
break;
default:
viewletId = `workbench.view.extension.${container.id}`;
}

2
src/vs/workbench/workbench.common.main.ts
View File

@@ -398,6 +398,8 @@ import 'sql/workbench/contrib/query/common/resultsGrid.contribution';
// data explorer
import 'sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution';
import 'sql/workbench/contrib/dataExplorer/browser/nodeActions.common.contribution';
import 'sql/workbench/contrib/dataExplorer/browser/extensions.contribution';
//editor replacement
import 'sql/workbench/contrib/editorReplacement/common/editorReplacer.contribution';