From 96511b7f2a29e4c74e84855bd05e220ad8d94e94 Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Tue, 31 Oct 2023 16:04:24 -0700 Subject: [PATCH 1/2] testing: make ui more clear for discovery errors Fixes #196546 --- .vscode-test.js | 2 +- .../testing/browser/explorerProjections/index.ts | 8 +++++--- .../contrib/testing/browser/media/testing.css | 10 ++++++++++ .../contrib/testing/browser/testingExplorerView.ts | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.vscode-test.js b/.vscode-test.js index 6846ca522f634..b2663e6b4f7e0 100644 --- a/.vscode-test.js +++ b/.vscode-test.js @@ -84,4 +84,4 @@ module.exports = defineConfig(extensions.map(extension => { } return config; -})); +}) diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts index 7d14aa647301e..2f197e866b668 100644 --- a/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts +++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts @@ -164,9 +164,11 @@ export const getChildrenForParent = (serialized: ISerializedTestTreeCollapseStat : { element, collapsible: element.test.expand !== TestItemExpandState.NotExpandable, - collapsed: isCollapsedInSerializedTestTree(serialized, element.test.item.extId) ?? element.depth > 0 - ? ObjectTreeElementCollapseState.PreserveOrCollapsed - : ObjectTreeElementCollapseState.PreserveOrExpanded, + collapsed: element.test.item.error + ? ObjectTreeElementCollapseState.Expanded + : (isCollapsedInSerializedTestTree(serialized, element.test.item.extId) ?? element.depth > 0 + ? ObjectTreeElementCollapseState.PreserveOrCollapsed + : ObjectTreeElementCollapseState.PreserveOrExpanded), children: getChildrenForParent(serialized, rootsWithChildren, element), } )); diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css index 26f1ae8e33d65..e727fe2315079 100644 --- a/src/vs/workbench/contrib/testing/browser/media/testing.css +++ b/src/vs/workbench/contrib/testing/browser/media/testing.css @@ -111,6 +111,16 @@ display: none; } +.test-explorer .monaco-list-row .error { + outline: 1px solid var(--vscode-inputValidation-errorBorder); + background: var(--vscode-inputValidation-errorBackground); + padding: 2px 4px; + border-radius: 2px; + margin: 3px 12px 3px 3px; + line-height: 17px; + font-size: 12px; +} + .test-explorer .monaco-list-row .error p { margin: 0; } diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts index 2bd1970cbd093..c4992b5caaef9 100644 --- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts +++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts @@ -1280,8 +1280,8 @@ class TreeKeyboardNavigationLabelProvider implements IKeyboardNavigationLabelPro } class ListDelegate implements IListVirtualDelegate { - getHeight(_element: TestExplorerTreeElement) { - return 22; + getHeight(element: TestExplorerTreeElement) { + return element instanceof TestTreeErrorMessage ? 17 + 10 : 22; } getTemplateId(element: TestExplorerTreeElement) { From 0e6ae1aaacd3261aa9a665faad3179b6eba158fd Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Tue, 31 Oct 2023 16:32:12 -0700 Subject: [PATCH 2/2] undo --- .vscode-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode-test.js b/.vscode-test.js index b2663e6b4f7e0..6846ca522f634 100644 --- a/.vscode-test.js +++ b/.vscode-test.js @@ -84,4 +84,4 @@ module.exports = defineConfig(extensions.map(extension => { } return config; -}) +}));