Merge pull request #1961 from nikonso:1773-take-drawBoldTextInBrightColors-into-account

Fix #1773 - drawBoldTextInBrightColors is not taken into account with DOM renderer

src/renderer/dom/DomRenderer.ts

@@ -75,7 +75,7 @@ export class DomRenderer extends EventEmitter implements IRenderer {
     this._updateDimensions();
 
     this._renderDebouncer = new RenderDebouncer(this._terminal, this._renderRows.bind(this));
-    this._rowFactory = new DomRendererRowFactory(document);
+    this._rowFactory = new DomRendererRowFactory(_terminal.options, document);
 
     this._terminal.element.classList.add(TERMINAL_CLASS_PREFIX + this._terminalClass);
     this._terminal.screenElement.appendChild(this._rowContainer);

src/renderer/dom/DomRendererRowFactory.test.ts

@@ -9,17 +9,22 @@ import { DomRendererRowFactory } from './DomRendererRowFactory';
 import { DEFAULT_ATTR, NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR } from '../../Buffer';
 import { FLAGS } from '../Types';
 import { BufferLine } from '../../BufferLine';
-import { IBufferLine } from '../../Types';
+import { IBufferLine, ITerminalOptions } from '../../Types';
 import { DEFAULT_COLOR } from '../atlas/Types';
 
 describe('DomRendererRowFactory', () => {
   let dom: jsdom.JSDOM;
+  const options: ITerminalOptions = {};
   let rowFactory: DomRendererRowFactory;
   let lineData: IBufferLine;
 
   beforeEach(() => {
     dom = new jsdom.JSDOM('');
-    rowFactory = new DomRendererRowFactory(dom.window.document);
+
+    options.enableBold = true;
+    options.drawBoldTextInBrightColors = true;
+
+    rowFactory = new DomRendererRowFactory(options, dom.window.document);
     lineData = createEmptyLineData(2);
   });
 

src/renderer/dom/DomRendererRowFactory.ts

@@ -5,7 +5,7 @@
 
 import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_ATTR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CODE_INDEX, NULL_CELL_CODE, WHITESPACE_CELL_CHAR } from '../../Buffer';
 import { FLAGS } from '../Types';
-import { IBufferLine } from '../../Types';
+import { IBufferLine, ITerminalOptions } from '../../Types';
 import { DEFAULT_COLOR, INVERTED_DEFAULT_COLOR } from '../atlas/Types';
 
 export const BOLD_CLASS = 'xterm-bold';
@@ -18,6 +18,7 @@ export const CURSOR_STYLE_UNDERLINE_CLASS = 'xterm-cursor-underline';
 
 export class DomRendererRowFactory {
   constructor(
+    private _terminalOptions: ITerminalOptions,
     private _document: Document
   ) {
   }
@@ -93,10 +94,10 @@ export class DomRendererRowFactory {
         }
       }
 
-      if (flags & FLAGS.BOLD) {
+      if (flags & FLAGS.BOLD && this._terminalOptions.enableBold) {
         // Convert the FG color to the bold variant. This should not happen when
         // the fg is the inverse default color as there is no bold variant.
-        if (fg < 8) {
+        if (fg < 8 && this._terminalOptions.drawBoldTextInBrightColors) {
           fg += 8;
         }
         charElement.classList.add(BOLD_CLASS);