From 9b0a57db138cbc7ed04b34b040f3a691fbb5974f Mon Sep 17 00:00:00 2001
From: Labhansh Agrawal <labhansh.agrawal@gmail.com>
Date: Sun, 28 Mar 2021 23:18:36 +0530
Subject: [PATCH] Fix @typescript-eslint/restrict-plus-operands errors

---
 .eslintrc.json           | 1 -
 app/config/windows.ts    | 4 ++--
 app/extend-electron.d.ts | 5 ++++-
 app/index.ts             | 5 ++++-
 lib/actions/ui.ts        | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 7da833a8..5ca0c309 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -108,7 +108,6 @@
         "@typescript-eslint/no-unsafe-call": "off",
         "@typescript-eslint/no-unsafe-member-access": "off",
         "@typescript-eslint/no-unsafe-return": "off",
-        "@typescript-eslint/restrict-plus-operands": "off",
         "@typescript-eslint/restrict-template-expressions": "off"
       }
     }
diff --git a/app/config/windows.ts b/app/config/windows.ts
index 5f3b7fc8..c18518a7 100644
--- a/app/config/windows.ts
+++ b/app/config/windows.ts
@@ -2,8 +2,8 @@ import Config from 'electron-store';
 import {BrowserWindow} from 'electron';
 
 export const defaults = {
-  windowPosition: [50, 50],
-  windowSize: [540, 380]
+  windowPosition: [50, 50] as [number, number],
+  windowSize: [540, 380] as [number, number]
 };
 
 // local storage
diff --git a/app/extend-electron.d.ts b/app/extend-electron.d.ts
index 6bbb135f..0a9a2ef9 100644
--- a/app/extend-electron.d.ts
+++ b/app/extend-electron.d.ts
@@ -7,7 +7,10 @@ declare module 'electron' {
     getWindows: () => Set<BrowserWindow>;
     getLastFocusedWindow: () => BrowserWindow | null;
     windowCallback?: (win: BrowserWindow) => void;
-    createWindow: (fn?: (win: BrowserWindow) => void, options?: Record<string, any>) => BrowserWindow;
+    createWindow: (
+      fn?: (win: BrowserWindow) => void,
+      options?: {size?: [number, number]; position?: [number, number]}
+    ) => BrowserWindow;
     setVersion: (version: string) => void;
   }
 
diff --git a/app/index.ts b/app/index.ts
index 548457dd..e60f20f7 100644
--- a/app/index.ts
+++ b/app/index.ts
@@ -81,7 +81,10 @@ function installDevExtensions(isDev_: boolean) {
 app.on('ready', () =>
   installDevExtensions(isDev)
     .then(() => {
-      function createWindow(fn?: (win: BrowserWindow) => void, options: Record<string, any> = {}) {
+      function createWindow(
+        fn?: (win: BrowserWindow) => void,
+        options: {size?: [number, number]; position?: [number, number]} = {}
+      ) {
         const cfg = plugins.getDecoratedConfig();
 
         const winSet = config.getWin();
diff --git a/lib/actions/ui.ts b/lib/actions/ui.ts
index fb83e676..b6853746 100644
--- a/lib/actions/ui.ts
+++ b/lib/actions/ui.ts
@@ -299,9 +299,9 @@ export function openSSH(url: string) {
       type: UI_OPEN_SSH_URL,
       effect() {
         const parsedUrl = parseUrl(url, true);
-        let command = parsedUrl.protocol + ' ' + (parsedUrl.user ? `${parsedUrl.user}@` : '') + parsedUrl.resource;
+        let command = `${parsedUrl.protocol} ${parsedUrl.user ? `${parsedUrl.user}@` : ''}${parsedUrl.resource}`;
 
-        if (parsedUrl.port) command += ' -p ' + parsedUrl.port;
+        if (parsedUrl.port) command += ` -p ${parsedUrl.port}`;
 
         command += '\n';