Merge remote-tracking branch 'upstream/master' into pr/silamon/4004

addons/xterm-addon-canvas/src/BaseRenderLayer.ts

@@ -344,7 +344,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     // Draw custom characters if applicable
     let drawSuccess = false;
     if (this._optionsService.rawOptions.customGlyphs !== false) {
-      drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight);
+      drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight, this._optionsService.rawOptions.fontSize);
     }
 
     // Draw the character
@@ -404,12 +404,11 @@ export abstract class BaseRenderLayer implements IRenderLayer {
 
     // Don't try cache the glyph if it uses any decoration foreground/background override.
     let hasOverrides = false;
-    for (const d of this._decorationService.getDecorationsAtCell(x, y)) {
+    this._decorationService.forEachDecorationAtCell(x, y, undefined, d => {
       if (d.backgroundColorRGB || d.foregroundColorRGB) {
         hasOverrides = true;
-        break;
       }
-    }
+    });
 
     const atlasDidDraw = hasOverrides ? false : this._charAtlas?.draw(this._ctx, this._currentGlyphIdentifier, x * this._scaledCellWidth + this._scaledCharLeft, y * this._scaledCellHeight + this._scaledCharTop);
 
@@ -473,7 +472,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     // Draw custom characters if applicable
     let drawSuccess = false;
     if (this._optionsService.rawOptions.customGlyphs !== false) {
-      drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight);
+      drawSuccess = tryDrawCustomChar(this._ctx, cell.getChars(), x * this._scaledCellWidth, y * this._scaledCellHeight, this._scaledCellWidth, this._scaledCellHeight, this._optionsService.rawOptions.fontSize);
     }
 
     // Draw the character
@@ -519,9 +518,9 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     let bgOverride: number | undefined;
     let fgOverride: number | undefined;
     let isTop = false;
-    for (const d of this._decorationService.getDecorationsAtCell(x, y)) {
+    this._decorationService.forEachDecorationAtCell(x, y, undefined, d => {
       if (d.options.layer !== 'top' && isTop) {
-        continue;
+        return;
       }
       if (d.backgroundColorRGB) {
         bgOverride = d.backgroundColorRGB.rgba;
@@ -530,7 +529,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
         fgOverride = d.foregroundColorRGB.rgba;
       }
       isTop = d.options.layer === 'top';
-    }
+    });
 
     // Apply selection foreground if applicable
     if (!isTop) {

addons/xterm-addon-canvas/src/SelectionRenderLayer.ts

@@ -3,12 +3,11 @@
  * @license MIT
  */
 
-import { IRenderDimensions, IRequestRedrawEvent } from 'browser/renderer/Types';
+import { IRenderDimensions } from 'browser/renderer/Types';
 import { BaseRenderLayer } from './BaseRenderLayer';
 import { IColorSet } from 'browser/Types';
 import { IBufferService, IDecorationService, IOptionsService } from 'common/services/Services';
 import { ICoreBrowserService } from 'browser/services/Services';
-import { IEventEmitter } from 'common/EventEmitter';
 
 interface ISelectionState {
   start?: [number, number];

addons/xterm-addon-canvas/src/TextRenderLayer.ts

@@ -187,15 +187,15 @@ export class TextRenderLayer extends BaseRenderLayer {
       // Get any decoration foreground/background overrides, this must be fetched before the early
       // exist but applied after inverse
       let isTop = false;
-      for (const d of this._decorationService.getDecorationsAtCell(x, this._bufferService.buffer.ydisp + y)) {
+      this._decorationService.forEachDecorationAtCell(x, this._bufferService.buffer.ydisp + y, undefined, d => {
         if (d.options.layer !== 'top' && isTop) {
-          continue;
+          return;
         }
         if (d.backgroundColorRGB) {
           nextFillStyle = d.backgroundColorRGB.css;
         }
         isTop = d.options.layer === 'top';
-      }
+      });
 
       if (prevFillStyle === null) {
         // This is either the first iteration, or the default background was set. Either way, we

addons/xterm-addon-canvas/src/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2015",
     "lib": [
       "dom",
       "es6"