More polish

Author: alexr00

webviews/components/pullRequestStack.tsx

@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as React from 'react';
-import { checkIcon, chevronDownIcon, circleFilledIcon, gitPullRequestDraftIcon, layersIcon, passIcon, skipIcon } from './icon';
+import { chevronDownIcon, circleFilledIcon, gitMergeIcon, gitPullRequestDraftIcon, layersIcon, passIcon, skipIcon } from './icon';
 import { GithubItemStateEnum, PullRequestMergeability, PullRequestStack as Stack } from '../../src/github/interface';
 import { PullRequest } from '../../src/github/views';
 import PullRequestContext from '../common/context';
 
 function getReadiness(entry: Stack['pullRequests'][number], currentPosition: number): { icon: JSX.Element; label: string; kind: string } {
 	if (entry.state === GithubItemStateEnum.Merged) {
-		return { icon: checkIcon, label: 'Already merged', kind: 'ready' };
+		return { icon: gitMergeIcon, label: 'Already merged', kind: 'merged' };
 	}
 	if (entry.state === GithubItemStateEnum.Closed) {
 		return { icon: skipIcon, label: 'Closed pull request cannot be merged', kind: 'blocked' };
 	}
 	if (entry.isDraft) {
-		return { icon: gitPullRequestDraftIcon, label: 'Draft pull request cannot be merged', kind: 'waiting' };
+		return { icon: gitPullRequestDraftIcon, label: 'Draft pull request cannot be merged', kind: 'draft' };
 	}
 	switch (entry.mergeable) {
 		case PullRequestMergeability.Mergeable:

webviews/editorWebview/index.css

@@ -798,6 +798,36 @@ body button .icon {
 	fill: var(--vscode-issues-open);
 }
 
+.stack-entry-readiness.merged {
+	color: var(--vscode-pullRequests-merged);
+}
+
+.stack-entry-readiness.merged svg path {
+	fill: var(--vscode-pullRequests-merged);
+}
+
+.stack-entry-readiness.draft {
+	color: var(--vscode-pullRequests-draft);
+}
+
+.stack-entry-readiness.draft svg path {
+	fill: var(--vscode-pullRequests-draft);
+}
+
+.vscode-high-contrast .stack-entry-readiness.merged,
+.vscode-high-contrast-light .stack-entry-readiness.merged,
+.vscode-high-contrast .stack-entry-readiness.draft,
+.vscode-high-contrast-light .stack-entry-readiness.draft {
+	color: var(--vscode-foreground);
+}
+
+.vscode-high-contrast .stack-entry-readiness.merged svg path,
+.vscode-high-contrast-light .stack-entry-readiness.merged svg path,
+.vscode-high-contrast .stack-entry-readiness.draft svg path,
+.vscode-high-contrast-light .stack-entry-readiness.draft svg path {
+	fill: var(--vscode-foreground);
+}
+
 .stack-entry-readiness.blocked {
 	color: var(--vscode-pullRequests-closed);
 }
@@ -810,6 +840,10 @@ body button .icon {
 	color: var(--vscode-list-warningForeground);
 }
 
+.stack-entry-readiness.waiting svg path {
+	fill: var(--vscode-list-warningForeground);
+}
+
 .stack-entry-details {
 	min-width: 0;
 	overflow-wrap: anywhere;

webviews/editorWebview/test/overview.test.tsx

@@ -95,7 +95,7 @@ describe('Overview', function () {
 			'First Change#793 - D1',
 		]);
 		assert.deepStrictEqual([...section.querySelectorAll('.stack-entry-readiness')].map(entry => [entry.classList[1], entry.getAttribute('aria-label')]), [
-			['waiting', 'Draft pull request cannot be merged'],
+			['draft', 'Draft pull request cannot be merged'],
 			['ready', 'Ready to merge'],
 			['ready', 'Ready to merge'],
 		]);
@@ -165,12 +165,12 @@ describe('Overview', function () {
 			['Branch is behind its base', 'waiting', dot],
 			['Merge requirements not met', 'waiting', dot],
 			['Merge conflicts', 'waiting', dot],
-			['Draft pull request cannot be merged', 'waiting', iconPath(require('../../../resources/icons/codicons/git-pull-request-draft.svg'))],
+			['Draft pull request cannot be merged', 'draft', iconPath(require('../../../resources/icons/codicons/git-pull-request-draft.svg'))],
 			['Ready to merge', 'ready', dot],
 			['Ready to merge', 'ready', pass],
 			['Ready to merge', 'ready', pass],
 			['Closed pull request cannot be merged', 'blocked', iconPath(require('../../../resources/icons/codicons/skip.svg'))],
-			['Already merged', 'ready', iconPath(require('../../../resources/icons/codicons/check.svg'))],
+			['Already merged', 'merged', iconPath(require('../../../resources/icons/codicons/git-merge.svg'))],
 		]);
 	});