From 00ce513ccca4e4c3a03f4c94ed38606f10e28cfd Mon Sep 17 00:00:00 2001 From: glacambre Date: Fri, 5 Apr 2019 13:38:14 +0200 Subject: [PATCH] TSLint: re-enable no-conditional-assignment rule --- src/completions/Help.ts | 4 ++-- src/completions/Settings.ts | 4 ++-- src/lib/native.ts | 11 +++++++---- src/lib/webext.ts | 13 ++++++------- tslint.json | 1 - 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/completions/Help.ts b/src/completions/Help.ts index 06df344d..1cc8bac0 100644 --- a/src/completions/Help.ts +++ b/src/completions/Help.ts @@ -107,9 +107,9 @@ export class HelpCompletionSource extends Completions.CompletionSourceFuse { Object.keys(settings) .filter(x => x.startsWith(query)) .map(setting => { - let member + let member = default_config.getMember(setting) let doc = "" - if ((member = default_config.getMember(setting))) { + if (member !== undefined) { doc = member.doc } return new HelpCompletionOption( diff --git a/src/completions/Settings.ts b/src/completions/Settings.ts index 6b1532c6..4058ed91 100644 --- a/src/completions/Settings.ts +++ b/src/completions/Settings.ts @@ -73,10 +73,10 @@ export class SettingsCompletionSource extends Completions.CompletionSourceFuse { .filter(x => x.startsWith(query)) .sort() .map(setting => { - let md + let md = default_config.getMember(setting) let doc = "" let type = "" - if ((md = default_config.getMember(setting))) { + if (md !== undefined) { doc = md.doc type = md.type.toString() } diff --git a/src/lib/native.ts b/src/lib/native.ts index 3fae6c40..5c182ffe 100644 --- a/src/lib/native.ts +++ b/src/lib/native.ts @@ -401,14 +401,17 @@ export async function ff_cmdline(): Promise { export function parseProfilesIni(content: string, basePath: string) { let lines = content.split("\n") let current = "General" - let match = null let result = {} for (let line of lines) { - if ((match = line.match(/^\[([^\]]+)\]$/))) { + let match = line.match(/^\[([^\]]+)\]$/) + if (match !== null) { current = match[1] result[current] = {} - } else if ((match = line.match(/^([^=]+)=([^=]+)$/))) { - result[current][match[1]] = match[2] + } else { + match = line.match(/^([^=]+)=([^=]+)$/) + if (match !== null) { + result[current][match[1]] = match[2] + } } } for (let profileName of Object.keys(result)) { diff --git a/src/lib/webext.ts b/src/lib/webext.ts index e6380fbe..761b4640 100644 --- a/src/lib/webext.ts +++ b/src/lib/webext.ts @@ -193,9 +193,9 @@ export async function openInTab(tab, opts = {}, strarr: string[]) { } const searchEngines = await browserBg.search.get() - let engine + let engine = searchEngines.find(engine => engine.alias == firstWord) // Maybe firstWord is the name of a firefox search engine? - if ((engine = searchEngines.find(engine => engine.alias == firstWord))) { + if (engine !== undefined) { return browserBg.search.search({ tabId: tab.id, engine: engine.name, @@ -224,9 +224,9 @@ export async function openInTab(tab, opts = {}, strarr: string[]) { queryString = rest } - let enginename + let enginename = config.get("searchengine") // firstWord is neither a searchurl nor a search engine, let's see if a search engine has been defined in Tridactyl - if ((enginename = config.get("searchengine"))) { + if (enginename) { if (searchurls[enginename]) { let url = UrlUtil.interpolateSearchItem( new URL(searchurls[enginename]), @@ -238,9 +238,8 @@ export async function openInTab(tab, opts = {}, strarr: string[]) { ) } - if ( - (engine = searchEngines.find(engine => engine.alias == enginename)) - ) { + engine = searchEngines.find(engine => engine.alias == enginename) + if (engine !== undefined) { return browserBg.search.search({ tabId: tab.id, engine: engine.name, diff --git a/tslint.json b/tslint.json index f5978ccf..2574b127 100644 --- a/tslint.json +++ b/tslint.json @@ -15,7 +15,6 @@ "no-array-delete": false, "no-big-function": false, "no-commented-code": false, - "no-conditional-assignment": false, "no-console": false, "no-duplicate-string": false, "no-empty": false,