Merge from vscode bd0efff9e3f36d6b3e1045cee9887003af8034d7

This commit is contained in:
ADS Merger
2020-05-06 02:35:49 +00:00
parent 9a7810cbee
commit 8420d9f04e
243 changed files with 4276 additions and 2478 deletions

View File

@@ -487,7 +487,7 @@ export class ResetViewLocationsAction extends Action {
}
async run(): Promise<void> {
this.viewDescriptorService.getViewContainers().forEach(viewContainer => {
this.viewDescriptorService.viewContainers.forEach(viewContainer => {
const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
viewContainerModel.allViewDescriptors.forEach(viewDescriptor => {
@@ -596,7 +596,7 @@ export class MoveFocusedViewAction extends Action {
});
}
const pinnedViewlets = this.activityBarService.getPinnedViewletIds();
const pinnedViewlets = this.activityBarService.getPinnedViewContainerIds();
items.push(...pinnedViewlets
.filter(viewletId => {
if (viewletId === this.viewDescriptorService.getViewContainerByViewId(focusedViewId)!.id) {