Merge pull request #3905 from silamon/extendedcolors

Support setting extended ansi colors (16-255)

src/browser/ColorManager.test.ts

@@ -5,7 +5,7 @@
 
 import jsdom = require('jsdom');
 import { assert } from 'chai';
-import { ColorManager } from 'browser/ColorManager';
+import { ColorManager, DEFAULT_ANSI_COLORS } from 'browser/ColorManager';
 
 describe('ColorManager', () => {
   let cm: ColorManager;
@@ -309,5 +309,24 @@ describe('ColorManager', () => {
       // FG reverts back to default
       assert.equal(cm.colors.foreground.css, '#ffffff');
     });
+
+    it('should set all extended ansi colors in reverse order', () => {
+      cm.setTheme({
+        extendedAnsi: DEFAULT_ANSI_COLORS.map(a => a.css).slice().reverse()
+      });
+
+      for (let ansiColor = 16; ansiColor <= 255; ansiColor++){
+        assert.equal(cm.colors.ansi[ansiColor].css, DEFAULT_ANSI_COLORS[255 + 16 - ansiColor].css);
+      }
+    });
+
+    it('should set one extended ansi colors and keep the other default', () => {
+      cm.setTheme({
+        extendedAnsi: [ '#ffffff' ]
+      });
+
+      assert.equal(cm.colors.ansi[16].css, '#ffffff');
+      assert.equal(cm.colors.ansi[17].css, DEFAULT_ANSI_COLORS[17].css);
+    });
   });
 });

src/browser/ColorManager.ts

@@ -167,6 +167,12 @@ export class ColorManager implements IColorManager {
     this.colors.ansi[13] = this._parseColor(theme.brightMagenta, DEFAULT_ANSI_COLORS[13]);
     this.colors.ansi[14] = this._parseColor(theme.brightCyan, DEFAULT_ANSI_COLORS[14]);
     this.colors.ansi[15] = this._parseColor(theme.brightWhite, DEFAULT_ANSI_COLORS[15]);
+    if (theme.extendedAnsi) {
+      const colorCount = Math.max(theme.extendedAnsi.length + 16, 256);
+      for (let i = 16; i < colorCount; i++) {
+        this.colors.ansi[i] = this._parseColor(theme.extendedAnsi[i - 16], DEFAULT_ANSI_COLORS[i]);
+      }
+    }
     // Clear our the cache
     this._contrastCache.clear();
     this._updateRestoreColors();