Use Octicons in Code Lenses (#8486)

AidanGG · karthiknadig · commit 664d8a931e24 · 2019-11-19T21:24:30.000-08:00
* Use Octicons in Code Lenses

* Add news
diff --git a/news/1 Enhancements/7192.md b/news/1 Enhancements/7192.md
@@ -0,0 +1 @@
+Use Octicons in Code Lenses. (thanks [Aidan Dang](https://github.com/AidanGG))
diff --git a/src/client/testing/codeLenses/testFiles.ts b/src/client/testing/codeLenses/testFiles.ts
@@ -144,14 +144,16 @@ export class TestFileCodeLensProvider implements CodeLensProvider {
 function getTestStatusIcon(status?: TestStatus): string {
     switch (status) {
         case TestStatus.Pass: {
-            return '✔ ';
+            return `${constants.Octicons.Test_Pass} `;
+        }
+        case TestStatus.Error: {
+            return `${constants.Octicons.Test_Error} `;
         }
-        case TestStatus.Error:
         case TestStatus.Fail: {
-            return '✘ ';
+            return `${constants.Octicons.Test_Fail} `;
         }
         case TestStatus.Skipped: {
-            return '⊘ ';
+            return `${constants.Octicons.Test_Skip} `;
         }
         default: {
             return '';
@@ -163,15 +165,19 @@ function getTestStatusIcons(fns: TestFunction[]): string {
     const statuses: string[] = [];
     let count = fns.filter(fn => fn.status === TestStatus.Pass).length;
     if (count > 0) {
-        statuses.push(`✔ ${count}`);
+        statuses.push(`${constants.Octicons.Test_Pass} ${count}`);
     }
-    count = fns.filter(fn => fn.status === TestStatus.Error || fn.status === TestStatus.Fail).length;
+    count = fns.filter(fn => fn.status === TestStatus.Skipped).length;
     if (count > 0) {
-        statuses.push(`✘ ${count}`);
+        statuses.push(`${constants.Octicons.Test_Skip} ${count}`);
     }
-    count = fns.filter(fn => fn.status === TestStatus.Skipped).length;
+    count = fns.filter(fn => fn.status === TestStatus.Fail).length;
+    if (count > 0) {
+        statuses.push(`${constants.Octicons.Test_Fail} ${count}`);
+    }
+    count = fns.filter(fn => fn.status === TestStatus.Error).length;
     if (count > 0) {
-        statuses.push(`⊘ ${count}`);
+        statuses.push(`${constants.Octicons.Test_Error} ${count}`);
     }
 
     return statuses.join(' ');
@@ -219,12 +225,12 @@ function getFunctionCodeLens(file: Uri, functionsAndSuites: FunctionsAndSuites,
     // Find all flattened functions.
     return [
         new CodeLens(range, {
-            title: `${getTestStatusIcons(functions)}${constants.Text.CodeLensRunUnitTest} (Multiple)`,
+            title: `${getTestStatusIcons(functions)} ${constants.Text.CodeLensRunUnitTest} (Multiple)`,
             command: constants.Commands.Tests_Picker_UI,
             arguments: [undefined, CommandSource.codelens, file, functions]
         }),
         new CodeLens(range, {
-            title: `${getTestStatusIcons(functions)}${constants.Text.CodeLensDebugUnitTest} (Multiple)`,
+            title: `${getTestStatusIcons(functions)} ${constants.Text.CodeLensDebugUnitTest} (Multiple)`,
             command: constants.Commands.Tests_Picker_UI_Debug,
             arguments: [undefined, CommandSource.codelens, file, functions]
         })

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Use Octicons in Code Lenses. (thanks [Aidan Dang](https://github.com/AidanGG))`