Skip to content

Commit df6d9b3

Browse files
authored
remove overrides of getActionsContext on viewpanecontainer (microsoft#226492)
always use the single view context in case of merged
1 parent 5b7d2e1 commit df6d9b3

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/vs/workbench/browser/parts/views/viewPaneContainer.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,9 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
593593
}
594594

595595
getActionsContext(): unknown {
596+
if (this.isViewMergedWithContainer()) {
597+
return this.panes[0].getActionsContext();
598+
}
596599
return undefined;
597600
}
598601

src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import 'vs/css!./media/scm';
77
import { localize } from 'vs/nls';
88
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
9-
import { ISCMViewService, VIEWLET_ID } from 'vs/workbench/contrib/scm/common/scm';
9+
import { VIEWLET_ID } from 'vs/workbench/contrib/scm/common/scm';
1010
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1111
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
1212
import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -21,7 +21,6 @@ import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneCont
2121
export class SCMViewPaneContainer extends ViewPaneContainer {
2222

2323
constructor(
24-
@ISCMViewService private readonly scmViewService: ISCMViewService,
2524
@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
2625
@ITelemetryService telemetryService: ITelemetryService,
2726
@IInstantiationService instantiationService: IInstantiationService,
@@ -49,8 +48,4 @@ export class SCMViewPaneContainer extends ViewPaneContainer {
4948
return localize('source control', "Source Control");
5049
}
5150

52-
override getActionsContext(): unknown {
53-
return this.scmViewService.visibleRepositories.length === 1 ? this.scmViewService.visibleRepositories[0].provider : undefined;
54-
}
55-
5651
}

0 commit comments

Comments
 (0)