Minor fixes of problems identified by lgtm. (#9732)

* Remove an unused argument.
* Remove unused assignments.
* Fix an incorrect type test.
* Remove repeated values from regex character class.
* Remove some unnecessary conditionals.
* Remove unused dependencies.

app/common/lib/formatUtil.js

@@ -47,7 +47,7 @@ const defaultOrderLookup = (value) => {
  * Accelerator reference: https://github.com/electron/electron/blob/master/docs/api/accelerator.md
  */
 module.exports.formatAccelerator = (accelerator) => {
- let result = accelerator
+ let result
  let splitResult = accelerator.split('+')
  // sort in proper order, based on OS
  // also, replace w/ name or symbol

app/common/state/navigationBarState.js

@@ -253,7 +253,7 @@ const api = {
  }
  if (selected) {
  // selection implies focus
- state = state = api.setFocused(state, tabId, true)
+ state = api.setFocused(state, tabId, true)
  }
  return state.setIn(path.push('selected'), selected)
  },

app/renderer/components/preferences/extensionsTab.js

@@ -113,7 +113,7 @@ class ExtensionsTab extends ImmutableComponent {
  headings={['icon', 'name', 'description', 'version', 'enabled'] /* 'exclude' */}
  columnClassNames={this.columnClassNames}
  rowClassNames={
- this.props.extensions.map(entry => (entry = css(styles.extensionsRow))).toJS()
+ this.props.extensions.map(entry => css(styles.extensionsRow)).toJS()
  }
  rows={this.props.extensions.map(entry => this.getRow(entry))} />
  </main>

js/contextMenus.js

@@ -1288,7 +1288,7 @@ function onUrlBarContextMenu (e) {
 
 function onFindBarContextMenu (e) {
  e.stopPropagation()
- const findBarMenu = Menu.buildFromTemplate(findBarTemplateInit(e))
+ const findBarMenu = Menu.buildFromTemplate(findBarTemplateInit())
  findBarMenu.popup(getCurrentWindow())
 }
 

js/lib/debounce.js

@@ -8,8 +8,8 @@ function debounce (fn, bufferInterval, ...args) {
  let timeout
  return (...args2) => {
  clearTimeout(timeout)
- let a = args || []
- if (args2 && args2.constructor === Array) {
+ let a = args
+ if (args2.constructor === Array) {
  a = a.concat(args2)
  }
  timeout = setTimeout(fn.apply.bind(fn, this, a), bufferInterval)

js/lib/urlutil.js

@@ -109,7 +109,7 @@ const UrlUtil = {
  // - starts with "?" or "."
  // - contains "? "
  // - ends with "." (and was not preceded by a domain or /)
- const case2Reg = /(^\?)|(\?.+\s)|(^\.)|(^[^.+..+]*[^/]*\.$)/
+ const case2Reg = /(^\?)|(\?.+\s)|(^\.)|(^[^.+]*[^/]*\.$)/
  // for cases, pure string
  const case3Reg = /[?./\s:]/
  // for cases, data:uri, view-source:uri and about

js/state/userPrefs.js

@@ -10,14 +10,15 @@ let registeredPrivateSessions = {}
 const setUserPrefType = (ses, path, value) => {
  switch (typeof value) {
  case 'object':
- ses.userPrefs.setDictionaryPref(path, value)
+ if (Array.isArray(value)) {
+ ses.userPrefs.setListPref(path, value)
+ } else {
+ ses.userPrefs.setDictionaryPref(path, value)
+ }
  break
  case 'string':
  ses.userPrefs.setStringPref(path, value)
  break
- case 'array':
- ses.userPrefs.setListPref(path, value)
- break
  case 'number':
  if ((/^(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i).test(value.to_s())) {
  ses.userPrefs.setDoublePref(path, value)

package.json

@@ -108,7 +108,6 @@
  "lru-cache": "^1.0.0",
  "moment": "^2.15.1",
  "niceware": "^1.0.4",
- "normalize-url": "^1.7.0",
  "parse-torrent": "^5.8.1",
  "prettier-bytes": "^1.0.3",
  "prop-types": "^15.5.6",
@@ -119,8 +118,6 @@
  "react-dnd": "^2.1.4",
  "react-dnd-html5-backend": "^2.1.2",
  "react-dom": "^15.5.4",
- "string.prototype.endswith": "^0.2.0",
- "string.prototype.startswith": "^0.2.0",
  "tablesort": "5.0.0",
  "tldjs": "1.6.2",
  "tracking-protection": "1.1.x",