Merge branch 'master' into fix-caps-lock-ime

src/browser/Decorations/OverviewRulerRenderer.ts

@@ -74,6 +74,7 @@ export class OverviewRulerRenderer extends Disposable {
    */
   private _registerDecorationListeners(): void {
     this.register(this._decorationService.onDecorationRegistered(() => this._queueRefresh(undefined, true)));
+    this.register(this._decorationService.onDecorationRemoved(() => this._queueRefresh(undefined, true)));
   }
 
   /**

src/browser/renderer/BaseRenderLayer.ts

@@ -428,6 +428,11 @@ export abstract class BaseRenderLayer implements IRenderLayer {
   }
 
   private _getContrastColor(cell: CellData): IColor | undefined {
+    const codepoint = cell.getCode();
+    if (57344 <= codepoint && codepoint <=  63743) {
+      // powerline chars #3739
+      return undefined;
+    }
     if (this._optionsService.rawOptions.minimumContrastRatio === 1) {
       return undefined;
     }

src/browser/renderer/dom/DomRendererRowFactory.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IBufferLine } from 'common/Types';
+import { IBufferLine, ICellData } from 'common/Types';
 import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
 import { NULL_CELL_CODE, WHITESPACE_CELL_CHAR, Attributes } from 'common/buffer/Constants';
 import { CellData } from 'common/buffer/CellData';
@@ -178,7 +178,7 @@ export class DomRendererRowFactory {
           if (cell.isBold() && fg < 8 && this._optionsService.rawOptions.drawBoldTextInBrightColors) {
             fg += 8;
           }
-          if (!this._applyMinimumContrast(charElement, this._colors.background, this._colors.ansi[fg])) {
+          if (!this._applyMinimumContrast(charElement, this._colors.background, this._colors.ansi[fg], cell)) {
             charElement.classList.add(`xterm-fg-${fg}`);
           }
           break;
@@ -188,13 +188,13 @@ export class DomRendererRowFactory {
             (fg >>  8) & 0xFF,
             (fg      ) & 0xFF
           );
-          if (!this._applyMinimumContrast(charElement, this._colors.background, color)) {
+          if (!this._applyMinimumContrast(charElement, this._colors.background, color, cell)) {
             this._addStyle(charElement, `color:#${padStart(fg.toString(16), '0', 6)}`);
           }
           break;
         case Attributes.CM_DEFAULT:
         default:
-          if (!this._applyMinimumContrast(charElement, this._colors.background, this._colors.foreground)) {
+          if (!this._applyMinimumContrast(charElement, this._colors.background, this._colors.foreground, cell)) {
             if (isInverse) {
               charElement.classList.add(`xterm-fg-${INVERTED_DEFAULT_COLOR}`);
             }
@@ -224,8 +224,9 @@ export class DomRendererRowFactory {
     return fragment;
   }
 
-  private _applyMinimumContrast(element: HTMLElement, bg: IColor, fg: IColor): boolean {
-    if (this._optionsService.rawOptions.minimumContrastRatio === 1) {
+  private _applyMinimumContrast(element: HTMLElement, bg: IColor, fg: IColor, cell: ICellData): boolean {
+    const codepoint = cell.getCode();
+    if (this._optionsService.rawOptions.minimumContrastRatio === 1 || 57344 <= codepoint && codepoint <=  63743) {
       return false;
     }
 

src/common/services/DecorationService.ts

@@ -35,6 +35,7 @@ export class DecorationService extends Disposable implements IDecorationService
           const index = this._decorations.indexOf(decoration);
           if (index >= 0) {
             this._decorations.splice(this._decorations.indexOf(decoration), 1);
+            this._onDecorationRemoved.fire(decoration);
           }
         }
       });