From 9f6a191e0d23412d0c87a76502ac5e18f3bbdd3e Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sun, 7 Feb 2021 08:28:27 -0800 Subject: [PATCH 1/3] Avoid white status bar items to ensure contrast Fixes #4384 --- src/observers/OmnisharpStatusBarObserver.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/observers/OmnisharpStatusBarObserver.ts b/src/observers/OmnisharpStatusBarObserver.ts index db07fd98f..129c92017 100644 --- a/src/observers/OmnisharpStatusBarObserver.ts +++ b/src/observers/OmnisharpStatusBarObserver.ts @@ -10,8 +10,7 @@ import { EventType } from "../omnisharp/EventType"; export enum StatusBarColors { Red = 'rgb(218,0,0)', Green = 'rgb(0,218,0)', - Yellow = 'rgb(218,218,0)', - White = 'rgb(256,256,256)' + Yellow = 'rgb(218,218,0)' } export class OmnisharpStatusBarObserver extends BaseStatusBarItemObserver { @@ -34,7 +33,7 @@ export class OmnisharpStatusBarObserver extends BaseStatusBarItemObserver { this.ResetAndHideStatusBar(); break; case EventType.OmnisharpServerOnStart: - this.SetAndShowStatusBar('$(flame)', 'o.showOutput', StatusBarColors.White, 'OmniSharp server is running'); + this.SetAndShowStatusBar('$(flame)', 'o.showOutput', 'OmniSharp server is running'); break; case EventType.DownloadStart: this.SetAndShowStatusBar("$(cloud-download) Downloading packages", '', '', `Downloading package '${(event).packageDescription}...' `); From c7440343f97c266c1f6d2a8b076f83e7f17efb90 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sun, 7 Feb 2021 16:32:22 +0000 Subject: [PATCH 2/3] Remove white status bar ref from test --- test/unitTests/logging/OmnisharpStatusBarObserver.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unitTests/logging/OmnisharpStatusBarObserver.test.ts b/test/unitTests/logging/OmnisharpStatusBarObserver.test.ts index 8519245b0..703062a8d 100644 --- a/test/unitTests/logging/OmnisharpStatusBarObserver.test.ts +++ b/test/unitTests/logging/OmnisharpStatusBarObserver.test.ts @@ -78,7 +78,6 @@ suite('OmnisharpStatusBarObserver', () => { expect(statusBarItem.text).to.be.equal('$(flame)'); expect(statusBarItem.command).to.equal('o.showOutput'); expect(statusBarItem.tooltip).to.be.equal('OmniSharp server is running'); - expect(statusBarItem.color).to.be.equal(StatusBarColors.White); }); test('OnServerStop: Status bar is hidden and the attributes are set to undefined', () => { From 28f59d57adb2a9b1285bf67216fc0564a55127b3 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sun, 7 Feb 2021 16:40:00 +0000 Subject: [PATCH 3/3] Fix arg order --- src/observers/OmnisharpStatusBarObserver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/observers/OmnisharpStatusBarObserver.ts b/src/observers/OmnisharpStatusBarObserver.ts index 129c92017..4ff60301e 100644 --- a/src/observers/OmnisharpStatusBarObserver.ts +++ b/src/observers/OmnisharpStatusBarObserver.ts @@ -33,7 +33,7 @@ export class OmnisharpStatusBarObserver extends BaseStatusBarItemObserver { this.ResetAndHideStatusBar(); break; case EventType.OmnisharpServerOnStart: - this.SetAndShowStatusBar('$(flame)', 'o.showOutput', 'OmniSharp server is running'); + this.SetAndShowStatusBar('$(flame)', 'o.showOutput', undefined, 'OmniSharp server is running'); break; case EventType.DownloadStart: this.SetAndShowStatusBar("$(cloud-download) Downloading packages", '', '', `Downloading package '${(event).packageDescription}...' `);