Merge branch 'master' of https://github.com/xtermjs/xterm.js into #2737_fix

.eslintrc.json

@@ -32,6 +32,7 @@
     "@typescript-eslint"
   ],
   "rules": {
+    "no-extra-semi": "error",
     "@typescript-eslint/array-type": [
       "warn",
       {

package.json

@@ -44,7 +44,7 @@
     "@types/mocha": "^7.0.2",
     "@types/node": "^10.17.17",
     "@types/utf8": "^2.1.6",
-    "@types/webpack": "^4.41.13",
+    "@types/webpack": "^4.41.17",
     "@types/ws": "^7.2.4",
     "@typescript-eslint/eslint-plugin": "^2.34.0",
     "@typescript-eslint/parser": "^2.34.0",
@@ -58,7 +58,7 @@
     "mocha": "^7.2.0",
     "mustache": "^4.0.1",
     "node-pty": "^0.9.0",
-    "nyc": "^15.0.1",
+    "nyc": "^15.1.0",
     "playwright-core": "^0.11.1",
     "source-map-loader": "^1.0.0",
     "ts-loader": "^7.0.5",

src/browser/Terminal2.test.ts

@@ -60,7 +60,7 @@ describe('Escape Sequence Files', function(): void {
     ptyTerm._master.destroy();
   });
 
-  FILES.forEach(filename => {
+  for (const filename of FILES) {
     (process.platform === 'win32' ? it.skip : it)(filename.split('/').slice(-1)[0], async () => {
       // reset terminal and handler
       if (customHandler) {
@@ -93,7 +93,7 @@ describe('Escape Sequence Files', function(): void {
         throw new Error(formatError(fs.readFileSync(filename, 'utf8'), content, expected));
       }
     });
-  });
+  }
 });
 
 /**

src/browser/public/Terminal.ts

@@ -204,11 +204,11 @@ export class Terminal implements ITerminalApi {
   }
 
   private _verifyIntegers(...values: number[]): void {
-    values.forEach(value => {
+    for (const value of values) {
       if (value === Infinity || isNaN(value) || value % 1 !== 0) {
         throw new Error('This API only accepts integers');
       }
-    });
+    }
   }
 }
 

src/browser/renderer/Renderer.ts

@@ -72,7 +72,9 @@ export class Renderer extends Disposable implements IRenderer {
   }
 
   public dispose(): void {
-    this._renderLayers.forEach(l => l.dispose());
+    for (const l of this._renderLayers) {
+      l.dispose();
+    }
     super.dispose();
     removeTerminalFromCache(this._id);
   }
@@ -89,10 +91,10 @@ export class Renderer 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._colors);
       l.reset();
-    });
+    }
   }
 
   public onResize(cols: number, rows: number): void {
@@ -100,7 +102,9 @@ export class Renderer extends Disposable implements IRenderer {
     this._updateDimensions();
 
     // Resize all render layers
-    this._renderLayers.forEach(l => l.resize(this.dimensions));
+    for (const l of this._renderLayers) {
+      l.resize(this.dimensions);
+    }
 
     // Resize the screen
     this._screenElement.style.width = `${this.dimensions.canvasWidth}px`;
@@ -136,7 +140,9 @@ export class Renderer extends Disposable implements IRenderer {
   }
 
   private _runOperation(operation: (layer: IRenderLayer) => void): void {
-    this._renderLayers.forEach(l => operation(l));
+    for (const l of this._renderLayers) {
+      operation(l);
+    }
   }
 
   /**
@@ -144,7 +150,9 @@ export class Renderer extends Disposable implements IRenderer {
    * necessary before queueing up the next one.
    */
   public renderRows(start: number, end: number): void {
-    this._renderLayers.forEach(l => l.onGridChanged(start, end));
+    for (const l of this._renderLayers) {
+      l.onGridChanged(start, end);
+    }
   }
 
   /**

src/browser/renderer/TextRenderLayer.ts

@@ -188,13 +188,13 @@ export class TextRenderLayer extends BaseRenderLayer {
 
       if (y !== startY) {
         // our row changed, draw the previous row
-        ctx.fillStyle = prevFillStyle ? prevFillStyle : '';
+        ctx.fillStyle = prevFillStyle || '';
         this._fillCells(startX, startY, cols - startX, 1);
         startX = x;
         startY = y;
       } else if (prevFillStyle !== nextFillStyle) {
         // our color changed, draw the previous characters in this row
-        ctx.fillStyle = prevFillStyle ? prevFillStyle : '';
+        ctx.fillStyle = prevFillStyle || '';
         this._fillCells(startX, startY, x - startX, 1);
         startX = x;
         startY = y;

src/browser/renderer/dom/DomRenderer.ts

@@ -116,13 +116,13 @@ export class DomRenderer extends Disposable implements IRenderer {
     this.dimensions.actualCellWidth = this.dimensions.canvasWidth / this._bufferService.cols;
     this.dimensions.actualCellHeight = this.dimensions.canvasHeight / this._bufferService.rows;
 
-    this._rowElements.forEach(element => {
+    for (const element of this._rowElements) {
       element.style.width = `${this.dimensions.canvasWidth}px`;
       element.style.height = `${this.dimensions.actualCellHeight}px`;
       element.style.lineHeight = `${this.dimensions.actualCellHeight}px`;
       // Make sure rows don't overflow onto following row
       element.style.overflow = 'hidden';
-    });
+    }
 
     if (!this._dimensionsStyleElement) {
       this._dimensionsStyleElement = document.createElement('style');
@@ -346,7 +346,9 @@ export class DomRenderer extends Disposable implements IRenderer {
   }
 
   public clear(): void {
-    this._rowElements.forEach(e => e.innerHTML = '');
+    for (const e of this._rowElements) {
+      e.innerHTML = '';
+    }
   }
 
   public renderRows(start: number, end: number): void {

src/common/CoreTerminal.ts

@@ -328,7 +328,9 @@ export abstract class CoreTerminal extends Disposable implements ICoreTerminal {
       }));
       this._windowsMode = {
         dispose: () => {
-          disposables.forEach(d => d.dispose());
+          for (const d of disposables) {
+            d.dispose();
+          }
         }
       };
     }

src/common/Lifecycle.ts

@@ -21,7 +21,9 @@ export abstract class Disposable implements IDisposable {
    */
   public dispose(): void {
     this._isDisposed = true;
-    this._disposables.forEach(d => d.dispose());
+    for (const d of this._disposables) {
+      d.dispose();
+    }
     this._disposables.length = 0;
   }
 
@@ -52,7 +54,9 @@ export abstract class Disposable implements IDisposable {
  * Dispose of all disposables in an array and set its length to 0.
  */
 export function disposeArray(disposables: IDisposable[]): void {
-  disposables.forEach(d => d.dispose());
+  for (const d of disposables) {
+    d.dispose();
+  }
   disposables.length = 0;
 }
 

src/common/TestUtils.test.ts

@@ -104,7 +104,9 @@ export class MockOptionsService implements IOptionsService {
   public onOptionChange: IEvent<string> = new EventEmitter<string>().event;
   constructor(testOptions?: IPartialTerminalOptions) {
     if (testOptions) {
-      Object.keys(testOptions).forEach(key => this.options[key] = (<any>testOptions)[key]);
+      for (const key of Object.keys(testOptions)) {
+        this.options[key] = (<any>testOptions)[key];
+      }
     }
   }
   public setOption<T>(key: string, value: T): void {

src/common/buffer/Buffer.ts

@@ -666,11 +666,11 @@ export class BufferStringIterator implements IBufferStringIterator {
     // limit to current buffer length
     range.first = Math.max(range.first, 0);
     range.last = Math.min(range.last, this._buffer.lines.length);
-    let result = '';
+    let content = '';
     for (let i = range.first; i <= range.last; ++i) {
-      result += this._buffer.translateBufferLineToString(i, this._trimRight);
+      content += this._buffer.translateBufferLineToString(i, this._trimRight);
     }
     this._current = range.last + 1;
-    return {range: range, content: result};
+    return {range, content};
   }
 }

src/common/input/Keyboard.test.ts

@@ -139,7 +139,7 @@ describe('Keyboard', () => {
         assert.equal(testEvaluateKeyboardEvent({ altKey: true, keyCode: 40 }, { isMac: true }).key, '\x1b[1;3B'); // CSI 5 C
       });
       it('should return undefined for alt+a', () => {
-        assert.strictEqual(testEvaluateKeyboardEvent({ altKey: true, keyCode: 65 }, { isMac: true }).key, undefined), { isMac: true };
+        assert.strictEqual(testEvaluateKeyboardEvent({ altKey: true, keyCode: 65 }, { isMac: true }).key, undefined);
       });
     });
 

src/common/parser/DcsParser.ts

@@ -136,7 +136,7 @@ export class DcsHandler implements IDcsHandler {
     if (this._hitLimit) {
       ret = false;
     } else if (success) {
-      ret = this._handler(this._data, this._params ? this._params : new Params());
+      ret = this._handler(this._data, this._params || new Params());
     }
     this._params = undefined;
     this._data = '';

src/common/parser/EscapeSequenceParser.test.ts

@@ -1589,9 +1589,9 @@ describe('EscapeSequenceParser', function (): void {
       });
       it('final ESC range 0x30 .. 0x7e, one byte', () => {
         for (let i = 0x30; i <= 0x7e; ++i) {
-          const c = String.fromCharCode(i);
+          const final = String.fromCharCode(i);
           let handler: IDisposable | undefined;
-          chai.assert.doesNotThrow(() => { handler = parser.addEscHandler({final: c}, () => {}); }, 'final must be in range 48 .. 126');
+          chai.assert.doesNotThrow(() => { handler = parser.addEscHandler({final}, () => {}); }, 'final must be in range 48 .. 126');
           if (handler) handler.dispose();
         }
         chai.assert.throws(() => { parser.addEscHandler({final: '\x2f'}, () => {}); }, 'final must be in range 48 .. 126');

src/common/services/CoreMouseService.test.ts

@@ -171,7 +171,7 @@ describe('CoreMouseService', () => {
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true);
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.DOWN, ctrl: false, alt: false, shift: false }), true);
       assert.deepEqual(reports, ['\x1b[M !!', '\x1b[M!!!', '\x1b[M"!!', '\x1b[Ma!!']);
-      while (reports.pop()) { }
+      reports = [];
 
       // all buttons + up + no modifier
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true);
@@ -179,7 +179,7 @@ describe('CoreMouseService', () => {
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true);
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.WHEEL, action: CoreMouseAction.UP, ctrl: false, alt: false, shift: false }), true);
       assert.deepEqual(reports, ['\x1b[M#!!', '\x1b[M#!!', '\x1b[M#!!', '\x1b[M`!!']);
-      while (reports.pop()) { }
+      reports = [];
 
       // all buttons + move + no modifier
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.LEFT, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true);
@@ -187,7 +187,7 @@ describe('CoreMouseService', () => {
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.RIGHT, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true);
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: false, shift: false }), true);
       assert.deepEqual(reports, ['\x1b[M@!!', '\x1b[MA!!', '\x1b[MB!!', '\x1b[MC!!']);
-      while (reports.pop()) { }
+      reports = [];
 
       // button none + move + modifiers
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: true, alt: false, shift: false }), true);
@@ -197,7 +197,7 @@ describe('CoreMouseService', () => {
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: false, alt: true, shift: true }), true);
       assert.equal(cms.triggerMouseEvent({ col: 0, row: 0, button: CoreMouseButton.NONE, action: CoreMouseAction.MOVE, ctrl: true, alt: true, shift: true }), true);
       assert.deepEqual(reports, ['\x1b[MS!!', '\x1b[MK!!', '\x1b[MG!!', '\x1b[M[!!', '\x1b[MO!!', '\x1b[M_!!']);
-      while (reports.pop()) { }
+      reports = [];
     });
   });
 });

src/common/services/CoreMouseService.ts

@@ -174,8 +174,8 @@ export class CoreMouseService implements ICoreMouseService {
     @ICoreService private readonly _coreService: ICoreService
   ) {
     // register default protocols and encodings
-    Object.keys(DEFAULT_PROTOCOLS).forEach(name => this.addProtocol(name, DEFAULT_PROTOCOLS[name]));
-    Object.keys(DEFAULT_ENCODINGS).forEach(name => this.addEncoding(name, DEFAULT_ENCODINGS[name]));
+    for (const name of Object.keys(DEFAULT_PROTOCOLS)) this.addProtocol(name, DEFAULT_PROTOCOLS[name]);
+    for (const name of Object.keys(DEFAULT_ENCODINGS)) this.addEncoding(name, DEFAULT_ENCODINGS[name]);
     // call reset to set defaults
     this.reset();
   }

src/common/services/OptionsService.ts

@@ -71,12 +71,12 @@ export class OptionsService implements IOptionsService {
 
   constructor(options: IPartialTerminalOptions) {
     this.options = clone(DEFAULT_OPTIONS);
-    Object.keys(options).forEach(k => {
+    for (const k of Object.keys(options)) {
       if (k in this.options) {
         const newValue = options[k as keyof IPartialTerminalOptions] as any;
         this.options[k] = newValue;
       }
-    });
+    }
   }
 
   public setOption(key: string, value: any): void {

src/common/services/Services.ts

@@ -136,7 +136,7 @@ export interface IServiceIdentifier<T> {
 
 export interface IBrandedService {
   serviceBrand: undefined;
-};
+}
 
 type GetLeadingNonServiceArgs<Args> =
   Args extends [...IBrandedService[]] ? []

yarn.lock

@@ -352,10 +352,10 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/webpack@^4.41.13":
-  version "4.41.13"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.13.tgz#988d114c8913d039b8a0e0502a7fe4f1f84f3d5e"
-  integrity sha512-RYmIHOWSxnTTa765N6jJBVE45pd2SYNblEYshVDduLw6RhocazNmRzE5/ytvBD8IkDMH6DI+bcrqxh8NILimBA==
+"@types/webpack@^4.41.17":
+  version "4.41.17"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.17.tgz#0a69005e644d657c85b7d6ec1c826a71bebd1c93"
+  integrity sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==
   dependencies:
     "@types/anymatch" "*"
     "@types/node" "*"
@@ -2543,6 +2543,11 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -4000,10 +4005,10 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-nyc@^15.0.1:
-  version "15.0.1"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.0.1.tgz#bd4d5c2b17f2ec04370365a5ca1fc0ed26f9f93d"
-  integrity sha512-n0MBXYBYRqa67IVt62qW1r/d9UH/Qtr7SF1w/nQLJ9KxvWF6b2xCHImRAixHN9tnMMYHC2P14uo6KddNGwMgGg==
+nyc@^15.1.0:
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.1.0.tgz#1335dae12ddc87b6e249d5a1994ca4bdaea75f02"
+  integrity sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==
   dependencies:
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
@@ -4013,6 +4018,7 @@ nyc@^15.0.1:
     find-cache-dir "^3.2.0"
     find-up "^4.1.0"
     foreground-child "^2.0.0"
+    get-package-type "^0.1.0"
     glob "^7.1.6"
     istanbul-lib-coverage "^3.0.0"
     istanbul-lib-hook "^3.0.0"