From 4702a0af9d5cd5ad1d15fc6ad55fe2ea08e1f00f Mon Sep 17 00:00:00 2001
From: Labhansh Agrawal <labhansh.agrawal@gmail.com>
Date: Mon, 27 Apr 2020 11:25:27 +0530
Subject: [PATCH] lint

---
 .../xterm-addon-ligatures/src/index.test.ts   | 19 +++++++++++--------
 addons/xterm-addon-ligatures/src/index.ts     |  3 ++-
 addons/xterm-addon-ligatures/src/parse.ts     |  3 ++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/xterm-addon-ligatures/src/index.test.ts b/addons/xterm-addon-ligatures/src/index.test.ts
index fba564ce..2763ddb9 100644
--- a/addons/xterm-addon-ligatures/src/index.test.ts
+++ b/addons/xterm-addon-ligatures/src/index.test.ts
@@ -16,18 +16,21 @@ describe('xterm-addon-ligatures', () => {
 
   before(() => {
     sinon.stub(fontFinder, 'list').returns(Promise.resolve({
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       'Fira Code': [{
         path: path.join(__dirname, '../fonts/firaCode.otf'),
         style: fontFinder.Style.Regular,
         type: fontFinder.Type.Monospace,
         weight: 400
       }],
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       'Iosevka': [{
         path: path.join(__dirname, '../fonts/iosevka.ttf'),
         style: fontFinder.Style.Regular,
         type: fontFinder.Type.Monospace,
         weight: 400
       }],
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       'Nonexistant Font': [{
         path: path.join(__dirname, '../fonts/nonexistant.ttf'),
         style: fontFinder.Style.Regular,
@@ -185,32 +188,32 @@ describe('xterm-addon-ligatures', () => {
 });
 
 class MockTerminal {
-  static applyAddon(addon: any): void {
+  public static applyAddon(addon: any): void {
     addon.apply(MockTerminal);
   }
 
-  private _options: { [name: string]: string | number; } = {
+  private _options: { [name: string]: string | number } = {
     fontFamily: 'Fira Code, monospace',
     rows: 50
   };
-  joiner?: (text: string) => [number, number][];
-  refresh: (start: number, end: number) => void;
+  public joiner?: (text: string) => [number, number][];
+  public refresh: (start: number, end: number) => void;
 
   constructor(onRefresh: (start: number, end: number) => void) {
     this.refresh = onRefresh;
   }
 
-  registerCharacterJoiner(handler: (text: string) => [number, number][]): number {
+  public registerCharacterJoiner(handler: (text: string) => [number, number][]): number {
     this.joiner = handler;
     return 1;
   }
-  deregisterCharacterJoiner(id: number): void {
+  public deregisterCharacterJoiner(id: number): void {
     this.joiner = undefined;
   }
-  setOption(name: string, value: string | number): void {
+  public setOption(name: string, value: string | number): void {
     this._options[name] = value;
   }
-  getOption(name: string): string | number {
+  public getOption(name: string): string | number {
     return this._options[name];
   }
 }
diff --git a/addons/xterm-addon-ligatures/src/index.ts b/addons/xterm-addon-ligatures/src/index.ts
index c828abcb..88b71d99 100644
--- a/addons/xterm-addon-ligatures/src/index.ts
+++ b/addons/xterm-addon-ligatures/src/index.ts
@@ -70,7 +70,8 @@ export function enableLigatures(term: Terminal): void {
       return font.findLigatureRanges(text).map<[number, number]>(
         range => [range[0], range[1]]
       );
-    } else if (loadingState === LoadingState.FAILED) {
+    }
+    if (loadingState === LoadingState.FAILED) {
       throw loadError || new Error('Failure while loading font');
     }
 
diff --git a/addons/xterm-addon-ligatures/src/parse.ts b/addons/xterm-addon-ligatures/src/parse.ts
index c6ec0534..e26abfd9 100644
--- a/addons/xterm-addon-ligatures/src/parse.ts
+++ b/addons/xterm-addon-ligatures/src/parse.ts
@@ -150,7 +150,8 @@ function parseUnicode(context: IParseContext): string {
       // The first whitespace character after a unicode escape indicates the end
       // of the escape and is swallowed.
       return unicodeToString(str);
-    } else if (str.length >= 6 || !/[0-9a-fA-F]/.test(char)) {
+    }
+    if (str.length >= 6 || !/[0-9a-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--;