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

Merge from vscode e0762af258c0b20320ed03f3871a41967acc4421 (#7404)

Browse Source 
* Merge from vscode e0762af258c0b20320ed03f3871a41967acc4421

* readd svgs
This commit is contained in:
Anthony Dresser
2019-09-27 11:13:19 -07:00
committed by GitHub
parent 6385443a4c
commit 07109617b5
348 changed files with 4219 additions and 4307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@ interface IUserFriendlyViewDescriptor {
// From 'remoteViewDescriptor' type
group?: string;
remoteAuthority?: string;
remoteName?: string | string[];
}
const viewDescriptor: IJSONSchema = {
@@ -123,9 +123,12 @@ const remoteViewDescriptor: IJSONSchema = {
description: localize('vscode.extension.contributes.view.group', 'Nested group in the viewlet'),
type: 'string'
},
remoteAuthority: {
description: localize('vscode.extension.contributes.view.remoteAuthority', 'The remote authority associated with this view'),
type: 'string'
remoteName: {
description: localize('vscode.extension.contributes.view.remoteName', 'The name of the remote type associated with this view'),
type: ['string', 'array'],
items: {
type: 'string'
}
}
}
};
@@ -435,7 +438,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
extensionId: extension.description.identifier,
originalContainerId: entry.key,
group: item.group,
remoteAuthority: item.remoteAuthority
remoteAuthority: item.remoteName || (<any>item).remoteAuthority // TODO@roblou - delete after remote extensions are updated
};
viewIds.push(viewDescriptor.id);