Merge branch 'master' into feature/lint-with-putout

Tyriar · web-flow · commit 096655a3eb5b · 2021-06-04T12:39:25.000-07:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -47,6 +47,7 @@
         "readonly": "generic"
       }
     ],
+    "@typescript-eslint/consistent-type-assertions": "warn",
     "@typescript-eslint/consistent-type-definitions": "warn",
     "@typescript-eslint/explicit-function-return-type": [
       "warn",
diff --git a/src/browser/Linkifier.ts b/src/browser/Linkifier.ts
@@ -89,6 +89,8 @@ export class Linkifier implements ILinkifier {
     if (this._rowsTimeoutId) {
       clearTimeout(this._rowsTimeoutId);
     }
+
+    // Cannot use window.setTimeout since tests need to run in node
     this._rowsTimeoutId = setTimeout(() => this._linkifyRows(), Linkifier._timeBeforeLatency) as any as number;
   }
 
diff --git a/src/browser/Terminal.test.ts b/src/browser/Terminal.test.ts
@@ -403,7 +403,7 @@ describe('Terminal', () => {
         assert.equal(term.buffer.ydisp, startYDisp);
         term.scrollLines(-1);
         assert.equal(term.buffer.ydisp, startYDisp - 1);
-        term.keyPress({ keyCode: 0 } as KeyboardEvent);
+        term.keyPress({ keyCode: 0 });
         assert.equal(term.buffer.ydisp, startYDisp - 1);
       });
     });
diff --git a/src/browser/input/CompositionHelper.test.ts b/src/browser/input/CompositionHelper.test.ts
@@ -49,15 +49,15 @@ describe('CompositionHelper', () => {
     it('Should insert simple characters', (done) => {
       // First character 'ㅇ'
       compositionHelper.compositionstart();
-      compositionHelper.compositionupdate(<CompositionEvent><CompositionEvent>{ data: 'ㅇ' });
+      compositionHelper.compositionupdate({ data: 'ㅇ' });
       textarea.value = 'ㅇ';
       setTimeout(() => { // wait for any textarea updates
         compositionHelper.compositionend();
         setTimeout(() => { // wait for any textarea updates
           assert.equal(handledText, 'ㅇ');
           // Second character 'ㅇ'
           compositionHelper.compositionstart();
-          compositionHelper.compositionupdate(<CompositionEvent><CompositionEvent>{ data: 'ㅇ' });
+          compositionHelper.compositionupdate({ data: 'ㅇ' });
           textarea.value = 'ㅇㅇ';
           setTimeout(() => { // wait for any textarea updates
             compositionHelper.compositionend();
@@ -73,27 +73,27 @@ describe('CompositionHelper', () => {
     it('Should insert complex characters', (done) => {
       // First character '앙'
       compositionHelper.compositionstart();
-      compositionHelper.compositionupdate(<CompositionEvent>{ data: 'ㅇ' });
+      compositionHelper.compositionupdate({ data: 'ㅇ' });
       textarea.value = 'ㅇ';
       setTimeout(() => { // wait for any textarea updates
-        compositionHelper.compositionupdate(<CompositionEvent>{ data: '아' });
+        compositionHelper.compositionupdate({ data: '아' });
         textarea.value = '아';
         setTimeout(() => { // wait for any textarea updates
-          compositionHelper.compositionupdate(<CompositionEvent>{ data: '앙' });
+          compositionHelper.compositionupdate({ data: '앙' });
           textarea.value = '앙';
           setTimeout(() => { // wait for any textarea updates
             compositionHelper.compositionend();
             setTimeout(() => { // wait for any textarea updates
               assert.equal(handledText, '앙');
               // Second character '앙'
               compositionHelper.compositionstart();
-              compositionHelper.compositionupdate(<CompositionEvent>{ data: 'ㅇ' });
+              compositionHelper.compositionupdate({ data: 'ㅇ' });
               textarea.value = '앙ㅇ';
               setTimeout(() => { // wait for any textarea updates
-                compositionHelper.compositionupdate(<CompositionEvent>{ data: '아' });
+                compositionHelper.compositionupdate({ data: '아' });
                 textarea.value = '앙아';
                 setTimeout(() => { // wait for any textarea updates
-                  compositionHelper.compositionupdate(<CompositionEvent>{ data: '앙' });
+                  compositionHelper.compositionupdate({ data: '앙' });
                   textarea.value = '앙앙';
                   setTimeout(() => { // wait for any textarea updates
                     compositionHelper.compositionend();
@@ -113,19 +113,19 @@ describe('CompositionHelper', () => {
     it('Should insert complex characters that change with following character', (done) => {
       // First character '아'
       compositionHelper.compositionstart();
-      compositionHelper.compositionupdate(<CompositionEvent>{ data: 'ㅇ' });
+      compositionHelper.compositionupdate({ data: 'ㅇ' });
       textarea.value = 'ㅇ';
       setTimeout(() => { // wait for any textarea updates
-        compositionHelper.compositionupdate(<CompositionEvent>{ data: '아' });
+        compositionHelper.compositionupdate({ data: '아' });
         textarea.value = '아';
         setTimeout(() => { // wait for any textarea updates
           // Start second character '아' in first character
-          compositionHelper.compositionupdate(<CompositionEvent>{ data: '앙' });
+          compositionHelper.compositionupdate({ data: '앙' });
           textarea.value = '앙';
           setTimeout(() => { // wait for any textarea updates
             compositionHelper.compositionend();
             compositionHelper.compositionstart();
-            compositionHelper.compositionupdate(<CompositionEvent>{ data: '아' });
+            compositionHelper.compositionupdate({ data: '아' });
             textarea.value = '아아';
             setTimeout(() => { // wait for any textarea updates
               compositionHelper.compositionend();
@@ -142,14 +142,14 @@ describe('CompositionHelper', () => {
     it('Should insert multi-characters compositions', (done) => {
       // First character 'だ'
       compositionHelper.compositionstart();
-      compositionHelper.compositionupdate(<CompositionEvent>{ data: 'd' });
+      compositionHelper.compositionupdate({ data: 'd' });
       textarea.value = 'd';
       setTimeout(() => { // wait for any textarea updates
-        compositionHelper.compositionupdate(<CompositionEvent>{ data: 'だ' });
+        compositionHelper.compositionupdate({ data: 'だ' });
         textarea.value = 'だ';
         setTimeout(() => { // wait for any textarea updates
           // Second character 'あ'
-          compositionHelper.compositionupdate(<CompositionEvent>{ data: 'だあ' });
+          compositionHelper.compositionupdate({ data: 'だあ' });
           textarea.value = 'だあ';
           setTimeout(() => { // wait for any textarea updates
             compositionHelper.compositionend();
@@ -165,18 +165,18 @@ describe('CompositionHelper', () => {
     it('Should insert multi-character compositions that are converted to other characters with the same length', (done) => {
       // First character 'だ'
       compositionHelper.compositionstart();
-      compositionHelper.compositionupdate(<CompositionEvent>{ data: 'd' });
+      compositionHelper.compositionupdate({ data: 'd' });
       textarea.value = 'd';
       setTimeout(() => { // wait for any textarea updates
-        compositionHelper.compositionupdate(<CompositionEvent>{ data: 'だ' });
+        compositionHelper.compositionupdate({ data: 'だ' });
         textarea.value = 'だ';
         setTimeout(() => { // wait for any textarea updates
           // Second character 'ー'
-          compositionHelper.compositionupdate(<CompositionEvent>{ data: 'だー' });
+          compositionHelper.compositionupdate({ data: 'だー' });
           textarea.value = 'だー';
           setTimeout(() => { // wait for any textarea updates
             // Convert to katakana 'ダー'
-            compositionHelper.compositionupdate(<CompositionEvent>{ data: 'ダー' });
+            compositionHelper.compositionupdate({ data: 'ダー' });
             textarea.value = 'ダー';
             setTimeout(() => { // wait for any textarea updates
               compositionHelper.compositionend();
@@ -193,18 +193,18 @@ describe('CompositionHelper', () => {
     it('Should insert multi-character compositions that are converted to other characters with different lengths', (done) => {
       // First character 'い'
       compositionHelper.compositionstart();
-      compositionHelper.compositionupdate(<CompositionEvent>{ data: 'い' });
+      compositionHelper.compositionupdate({ data: 'い' });
       textarea.value = 'い';
       setTimeout(() => { // wait for any textarea updates
         // Second character 'ま'
-        compositionHelper.compositionupdate(<CompositionEvent>{ data: 'いm' });
+        compositionHelper.compositionupdate({ data: 'いm' });
         textarea.value = 'いm';
         setTimeout(() => { // wait for any textarea updates
-          compositionHelper.compositionupdate(<CompositionEvent>{ data: 'いま' });
+          compositionHelper.compositionupdate({ data: 'いま' });
           textarea.value = 'いま';
           setTimeout(() => { // wait for any textarea updates
             // Convert to kanji '今'
-            compositionHelper.compositionupdate(<CompositionEvent>{ data: '今' });
+            compositionHelper.compositionupdate({ data: '今' });
             textarea.value = '今';
             setTimeout(() => { // wait for any textarea updates
               compositionHelper.compositionend();
@@ -221,7 +221,7 @@ describe('CompositionHelper', () => {
     it('Should insert non-composition characters input immediately after composition characters', (done) => {
       // First character 'ㅇ'
       compositionHelper.compositionstart();
-      compositionHelper.compositionupdate(<CompositionEvent>{ data: 'ㅇ' });
+      compositionHelper.compositionupdate({ data: 'ㅇ' });
       textarea.value = 'ㅇ';
       setTimeout(() => { // wait for any textarea updates
         compositionHelper.compositionend();
diff --git a/src/browser/input/CompositionHelper.ts b/src/browser/input/CompositionHelper.ts
@@ -69,7 +69,7 @@ export class CompositionHelper {
    * Handles the compositionupdate event, updating the composition view.
    * @param ev The event.
    */
-  public compositionupdate(ev: CompositionEvent): void {
+  public compositionupdate(ev: Pick<CompositionEvent, 'data'>): void {
     this._compositionView.textContent = ev.data;
     this.updateCompositionElements();
     setTimeout(() => {
diff --git a/src/browser/public/AddonManager.ts b/src/browser/public/AddonManager.ts
@@ -31,7 +31,7 @@ export class AddonManager implements IDisposable {
     };
     this._addons.push(loadedAddon);
     instance.dispose = () => this._wrappedAddonDispose(loadedAddon);
-    instance.activate(<any>terminal);
+    instance.activate(terminal as any);
   }
 
   private _wrappedAddonDispose(loadedAddon: ILoadedAddon): void {
diff --git a/src/browser/public/Terminal.ts b/src/browser/public/Terminal.ts
@@ -280,7 +280,7 @@ class BufferLineApiView implements IBufferLineApi {
     }
 
     if (cell) {
-      this._line.loadCell(x, <ICellData>cell);
+      this._line.loadCell(x, cell as ICellData);
       return cell;
     }
     return this._line.loadCell(x, new CellData());
diff --git a/src/browser/renderer/atlas/CharAtlasUtils.ts b/src/browser/renderer/atlas/CharAtlasUtils.ts
@@ -10,7 +10,7 @@ import { ITerminalOptions } from 'common/services/Services';
 
 export function generateConfig(scaledCharWidth: number, scaledCharHeight: number, options: ITerminalOptions, colors: IColorSet): ICharAtlasConfig {
   // null out some fields that don't matter
-  const clonedColors = <IPartialColorSet>{
+  const clonedColors: IPartialColorSet = {
     foreground: colors.foreground,
     background: colors.background,
     cursor: undefined,
diff --git a/src/browser/renderer/dom/DomRenderer.ts b/src/browser/renderer/dom/DomRenderer.ts
@@ -387,7 +387,7 @@ export class DomRenderer extends Disposable implements IRenderer {
       if (!row) {
         return;
       }
-      const span = <HTMLElement>row.children[x];
+      const span = row.children[x] as HTMLElement;
       if (span) {
         span.style.textDecoration = enabled ? 'underline' : 'none';
       }
diff --git a/src/browser/services/CharacterJoinerService.test.ts b/src/browser/services/CharacterJoinerService.test.ts
@@ -270,7 +270,7 @@ function lineData(data: IPartialLineData[]): IBufferLine {
   const tline = new BufferLine(0);
   for (let i = 0; i < data.length; ++i) {
     const line = data[i][0];
-    const attr = <number>(data[i][1] || 0);
+    const attr = (data[i][1] || 0) as number;
     const offset = tline.length;
     tline.resize(tline.length + line.split('').length, CellData.fromCharData([0, '', 0, 0]));
     line.split('').map((char, idx) => tline.setCell(idx + offset, CellData.fromCharData([attr, char, 1, char.charCodeAt(0)])));
diff --git a/src/browser/services/SelectionService.ts b/src/browser/services/SelectionService.ts
@@ -133,8 +133,8 @@ export class SelectionService extends Disposable implements ISelectionService {
     super();
 
     // Init listeners
-    this._mouseMoveListener = event => this._onMouseMove(<MouseEvent>event);
-    this._mouseUpListener = event => this._onMouseUp(<MouseEvent>event);
+    this._mouseMoveListener = event => this._onMouseMove(event as MouseEvent);
+    this._mouseUpListener = event => this._onMouseUp(event as MouseEvent);
     this._coreService.onUserInput(() => {
       if (this.hasSelection) {
         this.clearSelection();
diff --git a/src/browser/services/SoundService.ts b/src/browser/services/SoundService.ts
@@ -13,7 +13,7 @@ export class SoundService implements ISoundService {
 
   public static get audioContext(): AudioContext | null {
     if (!SoundService._audioContext) {
-      const audioContextCtor: typeof AudioContext = (<any>window).AudioContext || (<any>window).webkitAudioContext;
+      const audioContextCtor: typeof AudioContext = (window as any).AudioContext || (window as any).webkitAudioContext;
       if (!audioContextCtor) {
         console.warn('Web Audio API is not supported by this browser. Consider upgrading to the latest version');
         return null;

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@`
`47`	`47`	`"readonly": "generic"`
`48`	`48`	`}`
`49`	`49`	`],`
	`50`	`+ "@typescript-eslint/consistent-type-assertions": "warn",`
`50`	`51`	`"@typescript-eslint/consistent-type-definitions": "warn",`
`51`	`52`	`"@typescript-eslint/explicit-function-return-type": [`
`52`	`53`	`"warn",`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,8 @@ export class Linkifier implements ILinkifier {`
`89`	`89`	`if (this._rowsTimeoutId) {`
`90`	`90`	`clearTimeout(this._rowsTimeoutId);`
`91`	`91`	`}`
	`92`	`+`
	`93`	`+ // Cannot use window.setTimeout since tests need to run in node`
`92`	`94`	`this._rowsTimeoutId = setTimeout(() => this._linkifyRows(), Linkifier._timeBeforeLatency) as any as number;`
`93`	`95`	`}`
`94`	`96`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export class AddonManager implements IDisposable {`
`31`	`31`	`};`
`32`	`32`	`this._addons.push(loadedAddon);`
`33`	`33`	`instance.dispose = () => this._wrappedAddonDispose(loadedAddon);`
`34`		`- instance.activate(<any>terminal);`
	`34`	`+ instance.activate(terminal as any);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private _wrappedAddonDispose(loadedAddon: ILoadedAddon): void {`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ class BufferLineApiView implements IBufferLineApi {`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`if (cell) {`
`283`		`- this._line.loadCell(x, <ICellData>cell);`
	`283`	`+ this._line.loadCell(x, cell as ICellData);`
`284`	`284`	`return cell;`
`285`	`285`	`}`
`286`	`286`	`return this._line.loadCell(x, new CellData());`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ export class DomRenderer extends Disposable implements IRenderer {`
`387`	`387`	`if (!row) {`
`388`	`388`	`return;`
`389`	`389`	`}`
`390`		`- const span = <HTMLElement>row.children[x];`
	`390`	`+ const span = row.children[x] as HTMLElement;`
`391`	`391`	`if (span) {`
`392`	`392`	`span.style.textDecoration = enabled ? 'underline' : 'none';`
`393`	`393`	`}`