Merge branch 'master' into local_fonts

addons/xterm-addon-attach/src/AttachAddon.ts

@@ -41,7 +41,9 @@ export class AttachAddon implements ITerminalAddon {
   }
 
   public dispose(): void {
-    this._disposables.forEach(d => d.dispose());
+    for (const d of this._disposables) {
+      d.dispose();
+    }
   }
 
   private _sendData(data: string): void {

addons/xterm-addon-attach/test/AttachAddon.api.ts

@@ -18,7 +18,7 @@ describe('AttachAddon', () => {
   before(async function(): Promise<any> {
     const browserType = getBrowserType();
     browser = await browserType.launch({
-      headless: process.argv.indexOf('--headless') !== -1
+      headless: process.argv.includes('--headless')
     });
     page = await (await browser.newContext()).newPage();
     await page.setViewportSize({ width, height });

addons/xterm-addon-fit/test/FitAddon.api.ts

@@ -18,7 +18,7 @@ describe('FitAddon', () => {
   before(async function(): Promise<any> {
     const browserType = getBrowserType();
     browser = await browserType.launch({
-      headless: process.argv.indexOf('--headless') !== -1
+      headless: process.argv.includes('--headless')
     });
     page = await (await browser.newContext()).newPage();
     await page.setViewportSize({ width, height });
@@ -45,7 +45,7 @@ describe('FitAddon', () => {
 
   describe('proposeDimensions', () => {
     afterEach(async () => {
-      return unloadFit();
+      return await unloadFit();
     });
 
     it('default', async function(): Promise<any> {
@@ -84,7 +84,7 @@ describe('FitAddon', () => {
 
   describe('fit', () => {
     afterEach(async () => {
-      return unloadFit();
+      return await unloadFit();
     });
 
     it('default', async function(): Promise<any> {

addons/xterm-addon-ligatures/src/parse.ts

@@ -68,7 +68,7 @@ function parseString(context: IParseContext, quoteChar: '\'' | '"'): string {
   while (context.offset < context.input.length) {
     const char = context.input[context.offset++];
     if (escaped) {
-      if (/[0-9a-fA-F]/.test(char)) {
+      if (/[\dA-Fa-f]/.test(char)) {
         // Unicode escape
         context.offset--;
         str += parseUnicode(context);
@@ -107,7 +107,7 @@ function parseIdentifier(context: IParseContext): string {
   while (context.offset < context.input.length) {
     const char = context.input[context.offset++];
     if (escaped) {
-      if (/[0-9a-fA-F]/.test(char)) {
+      if (/[\dA-Fa-f]/.test(char)) {
         // Unicode escape
         context.offset--;
         str += parseUnicode(context);
@@ -156,7 +156,7 @@ function parseUnicode(context: IParseContext): string {
       // of the escape and is swallowed.
       return unicodeToString(str);
     }
-    if (str.length >= 6 || !/[0-9a-fA-F]/.test(char)) {
+    if (str.length >= 6 || !/[\dA-Fa-f]/.test(char)) {
       // If the next character is not a valid hex digit or we have reached the
       // maximum of 6 digits in the escape, terminate the escape.
       context.offset--;

addons/xterm-addon-search/src/SearchAddon.ts

@@ -240,8 +240,8 @@ export class SearchAddon implements ITerminalAddon {
    * @param term the substring that starts at searchIndex
    */
   private _isWholeWord(searchIndex: number, line: string, term: string): boolean {
-    return (((searchIndex === 0) || (NON_WORD_CHARACTERS.indexOf(line[searchIndex - 1]) !== -1)) &&
-      (((searchIndex + term.length) === line.length) || (NON_WORD_CHARACTERS.indexOf(line[searchIndex + term.length]) !== -1)));
+    return ((searchIndex === 0) || (NON_WORD_CHARACTERS.includes(line[searchIndex - 1]))) &&
+      (((searchIndex + term.length) === line.length) || (NON_WORD_CHARACTERS.includes(line[searchIndex + term.length])));
   }
 
   /**
@@ -262,7 +262,7 @@ export class SearchAddon implements ITerminalAddon {
 
     // Ignore wrapped lines, only consider on unwrapped line (first row of command string).
     const firstLine = terminal.buffer.active.getLine(row);
-    if (firstLine && firstLine.isWrapped) {
+    if (firstLine?.isWrapped) {
       if (isReverseSearch) {
         searchPosition.startCol += terminal.cols;
         return;

addons/xterm-addon-search/test/SearchAddon.api.ts

@@ -20,7 +20,7 @@ describe('Search Tests', function(): void {
   before(async function(): Promise<any> {
     const browserType = getBrowserType();
     browser = await browserType.launch({
-      headless: process.argv.indexOf('--headless') !== -1
+      headless: process.argv.includes('--headless')
     });
     page = await (await browser.newContext()).newPage();
     await page.setViewportSize({ width, height });

addons/xterm-addon-serialize/test/SerializeAddon.api.ts

@@ -34,7 +34,7 @@ describe('SerializeAddon', () => {
   before(async function(): Promise<any> {
     const browserType = getBrowserType();
     browser = await browserType.launch({
-      headless: process.argv.indexOf('--headless') !== -1
+      headless: process.argv.includes('--headless')
     });
     page = await (await browser.newContext()).newPage();
     await page.setViewportSize({ width, height });

addons/xterm-addon-unicode11/test/Unicode11Addon.api.ts

@@ -18,7 +18,7 @@ describe('Unicode11Addon', () => {
   before(async function(): Promise<any> {
     const browserType = getBrowserType();
     browser = await browserType.launch({
-      headless: process.argv.indexOf('--headless') !== -1
+      headless: process.argv.includes('--headless')
     });
     page = await (await browser.newContext()).newPage();
     await page.setViewportSize({ width, height });

addons/xterm-addon-web-links/src/WebLinkProvider.ts

@@ -41,7 +41,7 @@ export class WebLinkProvider implements ILinkProvider {
 }
 
 export class LinkComputer {
-  public static computeLink(y: number, regex: RegExp, terminal: Terminal, handler: (event: MouseEvent, uri: string) => void): ILink[] {
+  public static computeLink(y: number, regex: RegExp, terminal: Terminal, activate: (event: MouseEvent, uri: string) => void): ILink[] {
     const rex = new RegExp(regex.source, (regex.flags || '') + 'g');
 
     const [line, startLineIndex] = LinkComputer._translateBufferLineToStringWithWrap(y - 1, false, terminal);
@@ -89,7 +89,7 @@ export class LinkComputer {
         }
       };
 
-      result.push({ range, text, activate: handler });
+      result.push({ range, text, activate });
     }
 
     return result;

addons/xterm-addon-web-links/test/WebLinksAddon.api.ts

@@ -18,7 +18,7 @@ describe('WebLinksAddon', () => {
   before(async function(): Promise<any> {
     const browserType = getBrowserType();
     browser = await browserType.launch({
-      headless: process.argv.indexOf('--headless') !== -1
+      headless: process.argv.includes('--headless')
     });
     page = await (await browser.newContext()).newPage();
     await page.setViewportSize({ width, height });

addons/xterm-addon-webgl/README.md

@@ -1,8 +1,6 @@
 ## xterm-addon-webgl
 
-An addon for [xterm.js](https://github.com/xtermjs/xterm.js) that enables a WebGL-based renderer. This addon requires xterm.js v4+.
-
-⚠️ This is an experimental addon that is [missing some features and may be unstable](https://github.com/xtermjs/xterm.js/issues?q=is%3Aopen+is%3Aissue+label%3Aarea%2Faddon%2Fwebgl) ⚠️
+An addon for [xterm.js](https://github.com/xtermjs/xterm.js) that enables a WebGL2-based renderer. This addon requires xterm.js v4+.
 
 ### Install
 
@@ -21,3 +19,18 @@ terminal.loadAddon(new WebglAddon());
 ```
 
 See the full [API](https://github.com/xtermjs/xterm.js/blob/master/addons/xterm-addon-webgl/typings/xterm-addon-webgl.d.ts) for more advanced usage.
+
+### Handling Context Loss
+
+The browser may drop WebGL contexts for various reasons like OOM or after the system has been suspended. There is an API exposed that fires the `webglcontextlost` event fired on the canvas so embedders can handle it however they wish. An easy, but suboptimal way, to handle this is by disposing of WebglAddon when the event fires:
+
+```ts
+const terminal = new Terminal();
+const addon = new WebglAddon();
+addon.onContextLoss(e => {
+  addon.dispose();
+});
+terminal.loadAddon(addon);
+```
+
+Read more about handling WebGL context losses on the [Khronos wiki](https://www.khronos.org/webgl/wiki/HandlingContextLost).

addons/xterm-addon-webgl/src/WebglAddon.ts

@@ -3,14 +3,17 @@
  * @license MIT
  */
 
-import { Terminal, ITerminalAddon } from 'xterm';
+import { Terminal, ITerminalAddon, IEvent } from 'xterm';
 import { WebglRenderer } from './WebglRenderer';
 import { IRenderService } from 'browser/services/Services';
 import { IColorSet } from 'browser/Types';
+import { EventEmitter } from 'common/EventEmitter';
 
 export class WebglAddon implements ITerminalAddon {
   private _terminal?: Terminal;
   private _renderer?: WebglRenderer;
+  private _onContextLoss = new EventEmitter<void>();
+  public get onContextLoss(): IEvent<void> { return this._onContextLoss.event; }
 
   constructor(
     private _preserveDrawingBuffer?: boolean
@@ -24,6 +27,7 @@ export class WebglAddon implements ITerminalAddon {
     const renderService: IRenderService = (<any>terminal)._core._renderService;
     const colors: IColorSet = (<any>terminal)._core._colorManager.colors;
     this._renderer = new WebglRenderer(terminal, colors, this._preserveDrawingBuffer);
+    this._renderer.onContextLoss(() => this._onContextLoss.fire());
     renderService.setRenderer(this._renderer);
   }
 

addons/xterm-addon-webgl/src/WebglRenderer.ts

@@ -19,6 +19,7 @@ import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'browser/rende
 import { ITerminal, IColorSet } from 'browser/Types';
 import { EventEmitter } from 'common/EventEmitter';
 import { CellData } from 'common/buffer/CellData';
+import { addDisposableDomListener } from 'browser/Lifecycle';
 
 export class WebglRenderer extends Disposable implements IRenderer {
   private _renderLayers: IRenderLayer[];
@@ -41,6 +42,9 @@ export class WebglRenderer extends Disposable implements IRenderer {
   private _onRequestRedraw = new EventEmitter<IRequestRedrawEvent>();
   public get onRequestRedraw(): IEvent<IRequestRedrawEvent> { return this._onRequestRedraw.event; }
 
+  private _onContextLoss = new EventEmitter<void>();
+  public get onContextLoss(): IEvent<void> { return this._onContextLoss.event; }
+
   constructor(
     private _terminal: Terminal,
     private _colors: IColorSet,
@@ -82,6 +86,9 @@ export class WebglRenderer extends Disposable implements IRenderer {
     if (!this._gl) {
       throw new Error('WebGL2 not supported ' + this._gl);
     }
+
+    this.register(addDisposableDomListener(this._canvas, 'webglcontextlost', (e) => { this._onContextLoss.fire(e); }));
+
     this._core.screenElement!.appendChild(this._canvas);
 
     this._rectangleRenderer = new RectangleRenderer(this._terminal, this._colors, this._gl, this.dimensions);
@@ -94,7 +101,9 @@ export class WebglRenderer extends Disposable implements IRenderer {
   }
 
   public dispose(): void {
-    this._renderLayers.forEach(l => l.dispose());
+    for (const l of this._renderLayers) {
+      l.dispose();
+    }
     this._core.screenElement!.removeChild(this._canvas);
     super.dispose();
   }
@@ -106,10 +115,10 @@ export class WebglRenderer extends Disposable implements IRenderer {
   public setColors(colors: IColorSet): void {
     this._colors = colors;
     // Clear layers and force a full render
-    this._renderLayers.forEach(l => {
+    for (const l of this._renderLayers) {
       l.setColors(this._terminal, this._colors);
       l.reset(this._terminal);
-    });
+    }
 
     this._rectangleRenderer.setColors();
     this._glyphRenderer.setColors();
@@ -136,7 +145,9 @@ export class WebglRenderer extends Disposable implements IRenderer {
     this._model.resize(this._terminal.cols, this._terminal.rows);
 
     // Resize all render layers
-    this._renderLayers.forEach(l => l.resize(this._terminal, this.dimensions));
+    for (const l of this._renderLayers) {
+      l.resize(this._terminal, this.dimensions);
+    }
 
     // Resize the canvas
     this._canvas.width = this.dimensions.scaledCanvasWidth;
@@ -168,15 +179,21 @@ export class WebglRenderer extends Disposable implements IRenderer {
   }
 
   public onBlur(): void {
-    this._renderLayers.forEach(l => l.onBlur(this._terminal));
+    for (const l of this._renderLayers) {
+      l.onBlur(this._terminal);
+    }
   }
 
   public onFocus(): void {
-    this._renderLayers.forEach(l => l.onFocus(this._terminal));
+    for (const l of this._renderLayers) {
+      l.onFocus(this._terminal);
+    }
   }
 
   public onSelectionChanged(start: [number, number] | undefined, end: [number, number] | undefined, columnSelectMode: boolean): void {
-    this._renderLayers.forEach(l => l.onSelectionChanged(this._terminal, start, end, columnSelectMode));
+    for (const l of this._renderLayers) {
+      l.onSelectionChanged(this._terminal, start, end, columnSelectMode);
+    }
 
     this._updateSelectionModel(start, end, columnSelectMode);
 
@@ -184,11 +201,15 @@ export class WebglRenderer extends Disposable implements IRenderer {
   }
 
   public onCursorMove(): void {
-    this._renderLayers.forEach(l => l.onCursorMove(this._terminal));
+    for (const l of this._renderLayers) {
+      l.onCursorMove(this._terminal);
+    }
   }
 
   public onOptionsChanged(): void {
-    this._renderLayers.forEach(l => l.onOptionsChanged(this._terminal));
+    for (const l of this._renderLayers) {
+      l.onOptionsChanged(this._terminal);
+    }
     this._updateDimensions();
     this._refreshCharAtlas();
   }
@@ -222,7 +243,9 @@ export class WebglRenderer extends Disposable implements IRenderer {
   }
 
   public clear(): void {
-    this._renderLayers.forEach(l => l.reset(this._terminal));
+    for (const l of this._renderLayers) {
+      l.reset(this._terminal);
+    }
   }
 
   public registerCharacterJoiner(handler: (text: string) => [number, number][]): number {
@@ -245,7 +268,9 @@ export class WebglRenderer extends Disposable implements IRenderer {
     }
 
     // Update render layers
-    this._renderLayers.forEach(l => l.onGridChanged(this._terminal, start, end));
+    for (const l of this._renderLayers) {
+      l.onGridChanged(this._terminal, start, end);
+    }
 
     // Tell renderer the frame is beginning
     if (this._glyphRenderer.beginFrame()) {

addons/xterm-addon-webgl/src/atlas/WebglCharAtlas.ts

@@ -358,7 +358,7 @@ export class WebglCharAtlas implements IDisposable {
     const fontStyle = italic ? 'italic' : '';
     this._tmpCtx.font =
       `${fontStyle} ${fontWeight} ${this._config.fontSize * this._config.devicePixelRatio}px ${this._config.fontFamily}`;
-    this._tmpCtx.textBaseline = 'middle';
+    this._tmpCtx.textBaseline = 'ideographic';
 
     this._tmpCtx.fillStyle = this._getForegroundCss(bg, bgColorMode, bgColor, fg, fgColorMode, fgColor, inverse, bold);
 
@@ -367,8 +367,22 @@ export class WebglCharAtlas implements IDisposable {
       this._tmpCtx.globalAlpha = DIM_OPACITY;
     }
 
+    // Check if the char is a powerline glyph, these will be restricted to a single cell glyph, no
+    // padding on either side that are allowed for other glyphs since they are designed to be pixel
+    // perfect but may render with "bad" anti-aliasing
+    let isPowerlineGlyph = false;
+    if (chars.length === 1) {
+      const code = chars.charCodeAt(0);
+      if (code >= 0xE0A0 && code <= 0xE0D6) {
+        isPowerlineGlyph = true;
+      }
+    }
+
+    // For powerline glyphs left/top padding is excluded (https://github.com/microsoft/vscode/issues/120129)
+    const padding = isPowerlineGlyph ? 0 : TMP_CANVAS_GLYPH_PADDING;
+
     // Draw the character
-    this._tmpCtx.fillText(chars, TMP_CANVAS_GLYPH_PADDING, TMP_CANVAS_GLYPH_PADDING + this._config.scaledCharHeight / 2);
+    this._tmpCtx.fillText(chars, padding, padding + this._config.scaledCharHeight);
     this._tmpCtx.restore();
 
     // clear the background from the character to avoid issues with drawing over the previous
@@ -391,7 +405,7 @@ export class WebglCharAtlas implements IDisposable {
       return NULL_RASTERIZED_GLYPH;
     }
 
-    const rasterizedGlyph = this._findGlyphBoundingBox(imageData, this._workBoundingBox);
+    const rasterizedGlyph = this._findGlyphBoundingBox(imageData, this._workBoundingBox, isPowerlineGlyph);
     const clippedImageData = this._clipImageData(imageData, this._workBoundingBox);
 
     // Check if there is enough room in the current row and go to next if needed
@@ -424,12 +438,14 @@ export class WebglCharAtlas implements IDisposable {
    * @param imageData The image data to read.
    * @param boundingBox An IBoundingBox to put the clipped bounding box values.
    */
-  private _findGlyphBoundingBox(imageData: ImageData, boundingBox: IBoundingBox): IRasterizedGlyph {
+  private _findGlyphBoundingBox(imageData: ImageData, boundingBox: IBoundingBox, restrictedGlyph: boolean): IRasterizedGlyph {
     boundingBox.top = 0;
+    const height = restrictedGlyph ? this._config.scaledCharHeight : this._tmpCanvas.height;
+    const width = restrictedGlyph ? this._config.scaledCharWidth : this._tmpCanvas.width;
     let found = false;
-    for (let y = 0; y < this._tmpCanvas.height; y++) {
-      for (let x = 0; x < this._tmpCanvas.width; x++) {
-        const alphaOffset = y * this._tmpCanvas.width * 4 + x * 4 + 3;
+    for (let y = 0; y < height; y++) {
+      for (let x = 0; x < width; x++) {
+        const alphaOffset = y * width * 4 + x * 4 + 3;
         if (imageData.data[alphaOffset] !== 0) {
           boundingBox.top = y;
           found = true;
@@ -442,9 +458,9 @@ export class WebglCharAtlas implements IDisposable {
     }
     boundingBox.left = 0;
     found = false;
-    for (let x = 0; x < this._tmpCanvas.width; x++) {
-      for (let y = 0; y < this._tmpCanvas.height; y++) {
-        const alphaOffset = y * this._tmpCanvas.width * 4 + x * 4 + 3;
+    for (let x = 0; x < width; x++) {
+      for (let y = 0; y < height; y++) {
+        const alphaOffset = y * width * 4 + x * 4 + 3;
         if (imageData.data[alphaOffset] !== 0) {
           boundingBox.left = x;
           found = true;
@@ -455,11 +471,11 @@ export class WebglCharAtlas implements IDisposable {
         break;
       }
     }
-    boundingBox.right = this._tmpCanvas.width;
+    boundingBox.right = width;
     found = false;
-    for (let x = this._tmpCanvas.width - 1; x >= 0; x--) {
-      for (let y = 0; y < this._tmpCanvas.height; y++) {
-        const alphaOffset = y * this._tmpCanvas.width * 4 + x * 4 + 3;
+    for (let x = width - 1; x >= 0; x--) {
+      for (let y = 0; y < height; y++) {
+        const alphaOffset = y * width * 4 + x * 4 + 3;
         if (imageData.data[alphaOffset] !== 0) {
           boundingBox.right = x;
           found = true;
@@ -470,11 +486,11 @@ export class WebglCharAtlas implements IDisposable {
         break;
       }
     }
-    boundingBox.bottom = this._tmpCanvas.height;
+    boundingBox.bottom = height;
     found = false;
-    for (let y = this._tmpCanvas.height - 1; y >= 0; y--) {
-      for (let x = 0; x < this._tmpCanvas.width; x++) {
-        const alphaOffset = y * this._tmpCanvas.width * 4 + x * 4 + 3;
+    for (let y = height - 1; y >= 0; y--) {
+      for (let x = 0; x < width; x++) {
+        const alphaOffset = y * width * 4 + x * 4 + 3;
         if (imageData.data[alphaOffset] !== 0) {
           boundingBox.bottom = y;
           found = true;
@@ -497,8 +513,8 @@ export class WebglCharAtlas implements IDisposable {
         y: (boundingBox.bottom - boundingBox.top + 1) / TEXTURE_HEIGHT
       },
       offset: {
-        x: -boundingBox.left + TMP_CANVAS_GLYPH_PADDING,
-        y: -boundingBox.top + TMP_CANVAS_GLYPH_PADDING
+        x: -boundingBox.left + (restrictedGlyph ? 0 : TMP_CANVAS_GLYPH_PADDING),
+        y: -boundingBox.top + (restrictedGlyph ? 0 : TMP_CANVAS_GLYPH_PADDING)
       }
     };
   }

addons/xterm-addon-webgl/src/renderLayer/BaseRenderLayer.ts

@@ -224,12 +224,12 @@ export abstract class BaseRenderLayer implements IRenderLayer {
    */
   protected _fillCharTrueColor(terminal: Terminal, cell: CellData, x: number, y: number): void {
     this._ctx.font = this._getFont(terminal, false, false);
-    this._ctx.textBaseline = 'middle';
+    this._ctx.textBaseline = 'ideographic';
     this._clipRow(terminal, y);
     this._ctx.fillText(
       cell.getChars(),
       x * this._scaledCellWidth + this._scaledCharLeft,
-      y * this._scaledCellHeight + this._scaledCharTop + this._scaledCharHeight / 2);
+      y * this._scaledCellHeight + this._scaledCharTop + this._scaledCharHeight);
   }
 
   /**

addons/xterm-addon-webgl/test/WebglRenderer.api.ts

@@ -18,7 +18,7 @@ const height = 600;
 
 describe('WebGL Renderer Integration Tests', async () => {
   const browserType = getBrowserType();
-  const isHeadless = process.argv.indexOf('--headless') !== -1;
+  const isHeadless = process.argv.includes('--headless');
   // Firefox works only in non-headless mode https://github.com/microsoft/playwright/issues/1032
   const areTestsEnabled = browserType.name() === 'chromium' || (browserType.name() === 'firefox' && !isHeadless);
   const itWebgl = areTestsEnabled ? it : it.skip;
@@ -893,7 +893,7 @@ async function getCellColor(col: number, row: number): Promise<number[]> {
 async function setupBrowser(options: ITerminalOptions = { rendererType: 'dom' }): Promise<void> {
   const browserType = getBrowserType();
   browser = await browserType.launch({
-    headless: process.argv.indexOf('--headless') !== -1
+    headless: process.argv.includes('--headless')
   });
   page = await (await browser.newContext()).newPage();
   await page.setViewportSize({ width, height });

addons/xterm-addon-webgl/typings/xterm-addon-webgl.d.ts

@@ -3,6 +3,7 @@
  * @license MIT
  */
 
+import { IEvent } from 'node-pty';
 import { Terminal, ITerminalAddon } from 'xterm';
 
 declare module 'xterm-addon-webgl' {
@@ -29,5 +30,10 @@ declare module 'xterm-addon-webgl' {
      * Clears the terminal's texture atlas and triggers a redraw.
      */
     public clearTextureAtlas(): void;
+
+    /**
+     * Fired when the WebglRenderer loses context
+     */
+    public get onContextLoss(): IEvent<void>;
   }
 }

src/browser/Linkifier2.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { ILinkifier2, ILinkProvider, IBufferCellPosition, ILink, ILinkifierEvent, ILinkDecorations } from 'browser/Types';
+import { ILinkifier2, ILinkProvider, IBufferCellPosition, ILink, ILinkifierEvent, ILinkDecorations, ILinkWithState } from 'browser/Types';
 import { IDisposable } from 'common/Types';
 import { IMouseService, IRenderService } from './services/Services';
 import { IBufferService } from 'common/services/Services';
@@ -11,21 +11,12 @@ import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { Disposable, getDisposeArrayDisposable, disposeArray } from 'common/Lifecycle';
 import { addDisposableDomListener } from 'browser/Lifecycle';
 
-interface ILinkState {
-  decorations: ILinkDecorations;
-  isHovered: boolean;
-}
-
-interface ILinkWithState {
-  link: ILink;
-  state?: ILinkState;
-}
-
 export class Linkifier2 extends Disposable implements ILinkifier2 {
   private _element: HTMLElement | undefined;
   private _mouseService: IMouseService | undefined;
   private _renderService: IRenderService | undefined;
   private _linkProviders: ILinkProvider[] = [];
+  public get currentLink(): ILinkWithState | undefined { return this._currentLink; }
   protected _currentLink: ILinkWithState | undefined;
   private _lastMouseEvent: MouseEvent | undefined;
   private _linkCacheDisposables: IDisposable[] = [];

src/browser/MouseZoneManager.ts

@@ -156,9 +156,7 @@ export class MouseZoneManager extends Disposable implements IMouseZoneManager {
   private _onTooltip(e: MouseEvent): void {
     this._tooltipTimeout = undefined;
     const zone = this._findZoneEventAt(e);
-    if (zone && zone.tooltipCallback) {
-      zone.tooltipCallback(e);
-    }
+    zone?.tooltipCallback(e);
   }
 
   private _onMouseDown(e: MouseEvent): void {

src/browser/Terminal.test.ts

@@ -56,25 +56,25 @@ describe('Terminal', () => {
     //   term.handler('fake');
     // });
     it('should fire the onCursorMove event', () => {
-      return new Promise(async r => {
+      return new Promise<void>(async r => {
         term.onCursorMove(() => r());
         await term.writeP('foo');
       });
     });
     it('should fire the onLineFeed event', () => {
-      return new Promise(async r => {
+      return new Promise<void>(async r => {
         term.onLineFeed(() => r());
         await term.writeP('\n');
       });
     });
     it('should fire a scroll event when scrollback is created', () => {
-      return new Promise(async r => {
+      return new Promise<void>(async r => {
         term.onScroll(() => r());
         await term.writeP('\n'.repeat(INIT_ROWS));
       });
     });
     it('should fire a scroll event when scrollback is cleared', () => {
-      return new Promise(async r => {
+      return new Promise<void>(async r => {
         await term.writeP('\n'.repeat(INIT_ROWS));
         term.onScroll(() => r());
         term.clear();
@@ -233,7 +233,7 @@ describe('Terminal', () => {
       term.paste('\r\nfoo\nbar\r');
     });
     it('should respect bracketed paste mode', () => {
-      return new Promise(async r => {
+      return new Promise<void>(async r => {
         term.onData(e => {
           assert.equal(e, '\x1b[200~foo\x1b[201~');
           r();
@@ -1054,10 +1054,10 @@ describe('Terminal', () => {
       linkifier.attachToDom({} as any, mouseZoneManager);
     });
 
-    function assertLinkifiesInTerminal(rowText: string, linkMatcherRegex: RegExp, links: {x1: number, y1: number, x2: number, y2: number}[]): Promise<void> {
+    function assertLinkifiesInTerminal(rowText: string, linkMatcherRegex: RegExp, links: { x1: number, y1: number, x2: number, y2: number }[]): Promise<void> {
       return new Promise(async r => {
         await terminal.writeP(rowText);
-        linkifier.registerLinkMatcher(linkMatcherRegex, () => {});
+        linkifier.registerLinkMatcher(linkMatcherRegex, () => { });
         linkifier.linkifyRows();
         // Allow linkify to happen
         setTimeout(() => {
@@ -1075,66 +1075,66 @@ describe('Terminal', () => {
 
     describe('unicode before the match', () => {
       it('combining - match within one line', () => {
-        return assertLinkifiesInTerminal('e\u0301e\u0301e\u0301 foo', /foo/, [{x1: 4, x2: 7, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('e\u0301e\u0301e\u0301 foo', /foo/, [{ x1: 4, x2: 7, y1: 0, y2: 0 }]);
       });
       it('combining - match over two lines', () => {
-        return assertLinkifiesInTerminal('e\u0301e\u0301e\u0301     foo', /foo/, [{x1: 8, x2: 1, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('e\u0301e\u0301e\u0301     foo', /foo/, [{ x1: 8, x2: 1, y1: 0, y2: 1 }]);
       });
       it('surrogate - match within one line', () => {
-        return assertLinkifiesInTerminal('𝄞𝄞𝄞 foo', /foo/, [{x1: 4, x2: 7, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('𝄞𝄞𝄞 foo', /foo/, [{ x1: 4, x2: 7, y1: 0, y2: 0 }]);
       });
       it('surrogate - match over two lines', () => {
-        return assertLinkifiesInTerminal('𝄞𝄞𝄞     foo', /foo/, [{x1: 8, x2: 1, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('𝄞𝄞𝄞     foo', /foo/, [{ x1: 8, x2: 1, y1: 0, y2: 1 }]);
       });
       it('combining surrogate - match within one line', () => {
-        return assertLinkifiesInTerminal('𓂀\u0301𓂀\u0301𓂀\u0301 foo', /foo/, [{x1: 4, x2: 7, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('𓂀\u0301𓂀\u0301𓂀\u0301 foo', /foo/, [{ x1: 4, x2: 7, y1: 0, y2: 0 }]);
       });
       it('combining surrogate - match over two lines', () => {
-        return assertLinkifiesInTerminal('𓂀\u0301𓂀\u0301𓂀\u0301     foo', /foo/, [{x1: 8, x2: 1, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('𓂀\u0301𓂀\u0301𓂀\u0301     foo', /foo/, [{ x1: 8, x2: 1, y1: 0, y2: 1 }]);
       });
       it('fullwidth - match within one line', () => {
-        return assertLinkifiesInTerminal('１２ foo', /foo/, [{x1: 5, x2: 8, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('１２ foo', /foo/, [{ x1: 5, x2: 8, y1: 0, y2: 0 }]);
       });
       it('fullwidth - match over two lines', () => {
-        return assertLinkifiesInTerminal('１２    foo', /foo/, [{x1: 8, x2: 1, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('１２    foo', /foo/, [{ x1: 8, x2: 1, y1: 0, y2: 1 }]);
       });
       it('combining fullwidth - match within one line', () => {
-        return assertLinkifiesInTerminal('￥\u0301￥\u0301 foo', /foo/, [{x1: 5, x2: 8, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('￥\u0301￥\u0301 foo', /foo/, [{ x1: 5, x2: 8, y1: 0, y2: 0 }]);
       });
       it('combining fullwidth - match over two lines', () => {
-        return assertLinkifiesInTerminal('￥\u0301￥\u0301    foo', /foo/, [{x1: 8, x2: 1, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('￥\u0301￥\u0301    foo', /foo/, [{ x1: 8, x2: 1, y1: 0, y2: 1 }]);
       });
     });
     describe('unicode within the match', () => {
       it('combining - match within one line', () => {
-        return assertLinkifiesInTerminal('test cafe\u0301', /cafe\u0301/, [{x1: 5, x2: 9, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('test cafe\u0301', /cafe\u0301/, [{ x1: 5, x2: 9, y1: 0, y2: 0 }]);
       });
       it('combining - match over two lines', () => {
-        return assertLinkifiesInTerminal('testtest cafe\u0301', /cafe\u0301/, [{x1: 9, x2: 3, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('testtest cafe\u0301', /cafe\u0301/, [{ x1: 9, x2: 3, y1: 0, y2: 1 }]);
       });
       it('surrogate - match within one line', () => {
-        return assertLinkifiesInTerminal('test a𝄞b', /a𝄞b/, [{x1: 5, x2: 8, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('test a𝄞b', /a𝄞b/, [{ x1: 5, x2: 8, y1: 0, y2: 0 }]);
       });
       it('surrogate - match over two lines', () => {
-        return assertLinkifiesInTerminal('testtest a𝄞b', /a𝄞b/, [{x1: 9, x2: 2, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('testtest a𝄞b', /a𝄞b/, [{ x1: 9, x2: 2, y1: 0, y2: 1 }]);
       });
       it('combining surrogate - match within one line', () => {
-        return assertLinkifiesInTerminal('test a𓂀\u0301b', /a𓂀\u0301b/, [{x1: 5, x2: 8, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('test a𓂀\u0301b', /a𓂀\u0301b/, [{ x1: 5, x2: 8, y1: 0, y2: 0 }]);
       });
       it('combining surrogate - match over two lines', () => {
-        return assertLinkifiesInTerminal('testtest a𓂀\u0301b', /a𓂀\u0301b/, [{x1: 9, x2: 2, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('testtest a𓂀\u0301b', /a𓂀\u0301b/, [{ x1: 9, x2: 2, y1: 0, y2: 1 }]);
       });
       it('fullwidth - match within one line', () => {
-        return assertLinkifiesInTerminal('test a１b', /a１b/, [{x1: 5, x2: 9, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('test a１b', /a１b/, [{ x1: 5, x2: 9, y1: 0, y2: 0 }]);
       });
       it('fullwidth - match over two lines', () => {
-        return assertLinkifiesInTerminal('testtest a１b', /a１b/, [{x1: 9, x2: 3, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('testtest a１b', /a１b/, [{ x1: 9, x2: 3, y1: 0, y2: 1 }]);
       });
       it('combining fullwidth - match within one line', () => {
-        return assertLinkifiesInTerminal('test a￥\u0301b', /a￥\u0301b/, [{x1: 5, x2: 9, y1: 0, y2: 0}]);
+        return assertLinkifiesInTerminal('test a￥\u0301b', /a￥\u0301b/, [{ x1: 5, x2: 9, y1: 0, y2: 0 }]);
       });
       it('combining fullwidth - match over two lines', () => {
-        return assertLinkifiesInTerminal('testtest a￥\u0301b', /a￥\u0301b/, [{x1: 9, x2: 3, y1: 0, y2: 1}]);
+        return assertLinkifiesInTerminal('testtest a￥\u0301b', /a￥\u0301b/, [{ x1: 9, x2: 3, y1: 0, y2: 1 }]);
       });
     });
   });
@@ -1143,7 +1143,7 @@ describe('Terminal', () => {
     let terminal: TestTerminal;
 
     beforeEach(() => {
-      terminal = new TestTerminal({rows: 5, cols: 10, scrollback: 5});
+      terminal = new TestTerminal({ rows: 5, cols: 10, scrollback: 5 });
     });
 
     it('multiline ascii', async () => {
@@ -1318,7 +1318,7 @@ describe('Terminal', () => {
 
     it('test fully wrapped buffer up to last char with full width odd', async () => {
       const input = 'a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301'
-                    + 'a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301';
+        + 'a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301a￥\u0301';
       await terminal.writeP(input);
       const s = terminal.buffer.iterator(true).next().content;
       assert.equal(input, s);
@@ -1342,9 +1342,9 @@ describe('Terminal', () => {
     });
   });
 
-  describe('BufferStringIterator', function(): void {
+  describe('BufferStringIterator', function (): void {
     it('iterator does not overflow buffer limits', async () => {
-      const terminal = new TestTerminal({rows: 5, cols: 10, scrollback: 5});
+      const terminal = new TestTerminal({ rows: 5, cols: 10, scrollback: 5 });
       const data = [
         'aaaaaaaaaa',
         'aaaaaaaaa\n',
@@ -1382,13 +1382,13 @@ describe('Terminal', () => {
         'aaaaaaaaa'       // not wrapped
       ];
 
-      const normalTerminal = new TestTerminal({rows: 5, cols: 10, windowsMode: false});
+      const normalTerminal = new TestTerminal({ rows: 5, cols: 10, windowsMode: false });
       await normalTerminal.writeP(data.join(''));
       assert.equal(normalTerminal.buffer.lines.get(0)!.isWrapped, false);
       assert.equal(normalTerminal.buffer.lines.get(1)!.isWrapped, false);
       assert.equal(normalTerminal.buffer.lines.get(2)!.isWrapped, false);
 
-      const windowsModeTerminal = new TestTerminal({rows: 5, cols: 10, windowsMode: true});
+      const windowsModeTerminal = new TestTerminal({ rows: 5, cols: 10, windowsMode: true });
       await windowsModeTerminal.writeP(data.join(''));
       assert.equal(windowsModeTerminal.buffer.lines.get(0)!.isWrapped, false);
       assert.equal(windowsModeTerminal.buffer.lines.get(1)!.isWrapped, true, 'This line should wrap in Windows mode as the previous line ends in a non-null character');
@@ -1402,13 +1402,13 @@ describe('Terminal', () => {
         'aaaaaaaaa'             // not wrapped
       ];
 
-      const normalTerminal = new TestTerminal({rows: 5, cols: 10, windowsMode: false});
+      const normalTerminal = new TestTerminal({ rows: 5, cols: 10, windowsMode: false });
       await normalTerminal.writeP(data.join(''));
       assert.equal(normalTerminal.buffer.lines.get(0)!.isWrapped, false);
       assert.equal(normalTerminal.buffer.lines.get(1)!.isWrapped, false);
       assert.equal(normalTerminal.buffer.lines.get(2)!.isWrapped, false);
 
-      const windowsModeTerminal = new TestTerminal({rows: 5, cols: 10, windowsMode: true});
+      const windowsModeTerminal = new TestTerminal({ rows: 5, cols: 10, windowsMode: true });
       await windowsModeTerminal.writeP(data.join(''));
       assert.equal(windowsModeTerminal.buffer.lines.get(0)!.isWrapped, false);
       assert.equal(windowsModeTerminal.buffer.lines.get(1)!.isWrapped, true, 'This line should wrap in Windows mode as the previous line ends in a non-null character');
@@ -1417,7 +1417,7 @@ describe('Terminal', () => {
   });
   it('convertEol setting', async () => {
     // not converting
-    const termNotConverting = new TestTerminal({cols: 15, rows: 10});
+    const termNotConverting = new TestTerminal({ cols: 15, rows: 10 });
     await termNotConverting.writeP('Hello\nWorld');
     assert.equal(termNotConverting.buffer.lines.get(0)!.translateToString(false), 'Hello          ');
     assert.equal(termNotConverting.buffer.lines.get(1)!.translateToString(false), '     World     ');
@@ -1425,128 +1425,13 @@ describe('Terminal', () => {
     assert.equal(termNotConverting.buffer.lines.get(1)!.translateToString(true), '     World');
 
     // converting
-    const termConverting = new TestTerminal({cols: 15, rows: 10, convertEol: true});
+    const termConverting = new TestTerminal({ cols: 15, rows: 10, convertEol: true });
     await termConverting.writeP('Hello\nWorld');
     assert.equal(termConverting.buffer.lines.get(0)!.translateToString(false), 'Hello          ');
     assert.equal(termConverting.buffer.lines.get(1)!.translateToString(false), 'World          ');
     assert.equal(termConverting.buffer.lines.get(0)!.translateToString(true), 'Hello');
     assert.equal(termConverting.buffer.lines.get(1)!.translateToString(true), 'World');
   });
-  describe('Terminal InputHandler integration', () => {
-    function getLines(term: TestTerminal, limit: number = term.rows): string[] {
-      const res: string[] = [];
-      for (let i = 0; i < limit; ++i) {
-        res.push(term.buffer.lines.get(i)!.translateToString(true));
-      }
-      return res;
-    }
-
-    // This suite cannot live in InputHandler unless Terminal.scroll moved into IBufferService
-    describe('SL/SR/DECIC/DECDC', () => {
-      let term: TestTerminal;
-      beforeEach(() => {
-        term = new TestTerminal({cols: 5, rows: 5, scrollback: 1});
-      });
-      it('SL (scrollLeft)', async () => {
-        await term.writeP('12345'.repeat(6));
-        await term.writeP('\x1b[ @');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '2345', '2345', '2345', '2345', '2345']);
-        await term.writeP('\x1b[0 @');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '345', '345', '345', '345', '345']);
-        await term.writeP('\x1b[2 @');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '5', '5', '5', '5', '5']);
-      });
-      it('SR (scrollRight)', async () => {
-        await term.writeP('12345'.repeat(6));
-        await term.writeP('\x1b[ A');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', ' 1234', ' 1234', ' 1234', ' 1234', ' 1234']);
-        await term.writeP('\x1b[0 A');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '  123', '  123', '  123', '  123', '  123']);
-        await term.writeP('\x1b[2 A');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '    1', '    1', '    1', '    1', '    1']);
-      });
-      it('insertColumns (DECIC)', async () => {
-        await term.writeP('12345'.repeat(6));
-        await term.writeP('\x1b[3;3H');
-        await term.writeP('\x1b[\'}');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '12 34', '12 34', '12 34', '12 34', '12 34']);
-        term.reset();
-        await term.writeP('12345'.repeat(6));
-        await term.writeP('\x1b[3;3H');
-        await term.writeP('\x1b[1\'}');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '12 34', '12 34', '12 34', '12 34', '12 34']);
-        term.reset();
-        await term.writeP('12345'.repeat(6));
-        await term.writeP('\x1b[3;3H');
-        await term.writeP('\x1b[2\'}');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '12  3', '12  3', '12  3', '12  3', '12  3']);
-      });
-      it('deleteColumns (DECDC)', async () => {
-        await term.writeP('12345'.repeat(6));
-        await term.writeP('\x1b[3;3H');
-        await term.writeP('\x1b[\'~');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '1245', '1245', '1245', '1245', '1245']);
-        term.reset();
-        await term.writeP('12345'.repeat(6));
-        await term.writeP('\x1b[3;3H');
-        await term.writeP('\x1b[1\'~');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '1245', '1245', '1245', '1245', '1245']);
-        term.reset();
-        await term.writeP('12345'.repeat(6));
-        await term.writeP('\x1b[3;3H');
-        await term.writeP('\x1b[2\'~');
-        assert.deepEqual(getLines(term, term.rows + 1), ['12345', '125', '125', '125', '125', '125']);
-      });
-    });
-
-    describe('BS with reverseWraparound set/unset', () => {
-      const ttyBS = '\x08 \x08';  // tty ICANON sends <BS SP BS> on pressing BS
-
-      beforeEach(() => {
-        term = new TestTerminal({cols: 5, rows: 5, scrollback: 1});
-      });
-
-      describe('reverseWraparound set', () => {
-        it('should not reverse outside of scroll margins', async () => {
-          // prepare buffer content
-          await term.writeP('#####abcdefghijklmnopqrstuvwxy');
-          assert.deepEqual(getLines(term, 6), ['#####', 'abcde', 'fghij', 'klmno', 'pqrst', 'uvwxy']);
-          assert.equal(term.buffer.ydisp, 1);
-          assert.equal(term.buffer.x, 5);
-          assert.equal(term.buffer.y, 4);
-          await term.writeP(ttyBS.repeat(100));
-          assert.deepEqual(getLines(term, 6), ['#####', 'abcde', 'fghij', 'klmno', 'pqrst', '    y']);
-
-          await term.writeP('\x1b[?45h');
-          await term.writeP('uvwxy');
-
-          // set top/bottom to 1/3 (0-based)
-          await term.writeP('\x1b[2;4r');
-          // place cursor below scroll bottom
-          term.buffer.x = 5;
-          term.buffer.y = 4;
-          await term.writeP(ttyBS.repeat(100));
-          assert.deepEqual(getLines(term, 6), ['#####', 'abcde', 'fghij', 'klmno', 'pqrst', '     ']);
-
-          await term.writeP('uvwxy');
-          // place cursor within scroll margins
-          term.buffer.x = 5;
-          term.buffer.y = 3;
-          await term.writeP(ttyBS.repeat(100));
-          assert.deepEqual(getLines(term, 6), ['#####', 'abcde', '     ', '     ', '     ', 'uvwxy']);
-          assert.equal(term.buffer.x, 0);
-          assert.equal(term.buffer.y, term.buffer.scrollTop);  // stops at 0, scrollTop
-
-          await term.writeP('fghijklmnopqrst');
-          // place cursor above scroll top
-          term.buffer.x = 5;
-          term.buffer.y = 0;
-          await term.writeP(ttyBS.repeat(100));
-          assert.deepEqual(getLines(term, 6), ['#####', '     ', 'fghij', 'klmno', 'pqrst', 'uvwxy']);
-        });
-      });
-    });
-  });
 
   // FIXME: move to common/CoreTerminal.test once the trimming is moved over
   describe('marker lifecycle', () => {