maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

testing: fix hidden tests not being un-hidable

Browse source 
Fixes #124544
This commit is contained in:
Connor Peet 2021-05-26 15:56:52 -07:00
parent ade83f0589
commit 561b836400
No known key found for this signature in database
GPG key ID: CF8FD2EA0DBC61BD
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
View file

@ -539,7 +539,7 @@ export class TestingExplorerViewModel extends Disposable {
return;
}
const actions = getActionableElementActions(this.contextKeyService, this.menuService, element);
const actions = getActionableElementActions(this.contextKeyService, this.menuService, this.testService, element);
this.contextMenuService.showContextMenu({
getAnchor: () => evt.anchor,
getActions: () => [
@ -949,6 +949,7 @@ abstract class ActionableItemTemplateData<T extends IActionableTestTreeElement>
protected readonly labels: ResourceLabels,
private readonly actionRunner: TestExplorerActionRunner,
private readonly menuService: IMenuService,
protected readonly testService: ITestService,
private readonly contextKeyService: IContextKeyService,
private readonly instantiationService: IInstantiationService,
) {
@ -1006,7 +1007,7 @@ abstract class ActionableItemTemplateData<T extends IActionableTestTreeElement>
}
private fillActionBar(element: T, data: IActionableElementTemplateData) {
const actions = getActionableElementActions(this.contextKeyService, this.menuService, element);
const actions = getActionableElementActions(this.contextKeyService, this.menuService, this.testService, element);
data.elementDisposable.push(actions);
data.actionBar.clear();
data.actionBar.context = element;
@ -1021,11 +1022,11 @@ class TestItemRenderer extends ActionableItemTemplateData<TestItemTreeElement> {
labels: ResourceLabels,
actionRunner: TestExplorerActionRunner,
@IMenuService menuService: IMenuService,
@ITestService testService: ITestService,
@IContextKeyService contextKeyService: IContextKeyService,
@IInstantiationService instantiationService: IInstantiationService,
@ITestService private readonly testService: ITestService
) {
super(labels, actionRunner, menuService, contextKeyService, instantiationService);
super(labels, actionRunner, menuService, testService, contextKeyService, instantiationService);
}
/**
@ -1083,16 +1084,6 @@ const formatDuration = (ms: number) => {
class WorkspaceFolderRenderer extends ActionableItemTemplateData<TestTreeWorkspaceFolder> {
public static readonly ID = 'workspaceFolder';
constructor(
labels: ResourceLabels,
actionRunner: TestExplorerActionRunner,
@IMenuService menuService: IMenuService,
@IContextKeyService contextKeyService: IContextKeyService,
@IInstantiationService instantiationService: IInstantiationService,
) {
super(labels, actionRunner, menuService, contextKeyService, instantiationService);
}
/**
* @inheritdoc
*/
@ -1120,6 +1111,7 @@ class WorkspaceFolderRenderer extends ActionableItemTemplateData<TestTreeWorkspa
const getActionableElementActions = (
contextKeyService: IContextKeyService,
menuService: IMenuService,
testService: ITestService,
element: IActionableTestTreeElement,
) => {
const test = element instanceof TestItemTreeElement ? element.test : undefined;
@ -1127,6 +1119,7 @@ const getActionableElementActions = (
['view', Testing.ExplorerViewId],
[TestingContextKeys.testItemExtId.key, test?.item.extId],
[TestingContextKeys.testItemHasUri.key, !!test?.item.uri],
[TestingContextKeys.testItemIsHidden.key, !!test && testService.excludeTests.value.has(test.item.extId)],
[TestingContextKeys.hasDebuggableTests.key, !Iterable.isEmpty(element.debuggable)],
[TestingContextKeys.hasRunnableTests.key, !Iterable.isEmpty(element.runnable)],
]);