Merge pull request #472 from steelbrain/greenkeeper/eslint-config-ste…

…elbrain-4.0.1 chore(package): update eslint-config-steelbrain to version 4.0.1
steelbrain · Feb 2, 2018 · 513258e · 513258e
2 parents 6f8c1d3 + 5cafb38
commit 513258e
Show file tree

Hide file tree

Showing 12 changed files with 731 additions and 715 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,6 +6,17 @@
     "no-underscore-dangle": "off",
     "react/no-danger": "off",
     "react/no-danger-with-children": "off",
-    "global-require": "off"
+    "global-require": "off",
+    "import/extensions": "off",
+    "import/no-extraneous-dependencies": "off",
+    "import/no-unresolved": [
+      "error",
+      {
+        "ignore": [
+          "atom",
+          "electron"
+        ]
+      }
+    ]
   }
 }
diff --git a/.flowconfig b/.flowconfig
@@ -1,5 +1,6 @@
 [ignore]
 <PROJECT_ROOT>/node_modules/fbjs
+<PROJECT_ROOT>/node_modules/eslint-plugin-jsx-a11y
 
 [include]
 

diff --git a/lib/editors.js b/lib/editors.js
@@ -9,7 +9,7 @@ import type { LinterMessage, MessagesPatch } from './types'
 class Editors {
   editors: Set<Editor>;
   messages: Array<LinterMessage>;
-  firstRender: bool;
+  firstRender: boolean;
   subscriptions: CompositeDisposable;
 
   constructor() {

diff --git a/lib/panel/component.js b/lib/panel/component.js
@@ -7,18 +7,37 @@ import type Delegate from './delegate'
 import type { LinterMessage } from '../types'
 
 class PanelComponent extends React.Component {
-  props: {
-    delegate: Delegate,
-  };
-  state: {
-    messages: Array<LinterMessage>,
-  };
+  static renderRowColumn(row: LinterMessage, column: string): string | Object {
+    const range = $range(row)
+
+    switch (column) {
+      case 'file':
+        return getPathOfMessage(row)
+      case 'line':
+        return range ? `${range.start.row + 1}:${range.start.column + 1}` : ''
+      case 'excerpt':
+        if (row.version === 1) {
+          if (row.html) {
+            return <span dangerouslySetInnerHTML={{ __html: row.html }} />
+          }
+          return row.text || ''
+        }
+        return row.excerpt
+      case 'severity':
+        return severityNames[row.severity]
+      default:
+        return row[column]
+    }
+  }
   constructor(props: Object, context: ?Object) {
     super(props, context)
     this.state = {
       messages: this.props.delegate.filteredMessages,
     }
   }
+  state: {
+    messages: Array<LinterMessage>,
+  };
   componentDidMount() {
     this.props.delegate.onDidChangeMessages((messages) => {
       this.setState({ messages })
@@ -38,6 +57,9 @@ class PanelComponent extends React.Component {
       visitMessage(row)
     }
   }
+  props: {
+    delegate: Delegate,
+  };
   render() {
     const { delegate } = this.props
     const columns = [
@@ -71,28 +93,6 @@ class PanelComponent extends React.Component {
       </div>
     )
   }
-  static renderRowColumn(row: LinterMessage, column: string): string | Object {
-    const range = $range(row)
-
-    switch (column) {
-      case 'file':
-        return getPathOfMessage(row)
-      case 'line':
-        return range ? `${range.start.row + 1}:${range.start.column + 1}` : ''
-      case 'excerpt':
-        if (row.version === 1) {
-          if (row.html) {
-            return <span dangerouslySetInnerHTML={{ __html: row.html }} />
-          }
-          return row.text || ''
-        }
-        return row.excerpt
-      case 'severity':
-        return severityNames[row.severity]
-      default:
-        return row[column]
-    }
-  }
 }
 
 module.exports = PanelComponent
diff --git a/lib/panel/delegate.js b/lib/panel/delegate.js
@@ -1,7 +1,6 @@
 /* @flow */
 
 import { CompositeDisposable, Disposable, Emitter, Range } from 'atom'
-
 import { getActiveTextEditor, filterMessages, filterMessagesByRangeOrPoint } from '../helpers'
 import type { LinterMessage } from '../types'
 

diff --git a/lib/status-bar/index.js b/lib/status-bar/index.js
@@ -1,7 +1,6 @@
 /* @flow */
 
 import { CompositeDisposable, Disposable } from 'atom'
-
 import Element from './element'
 import { $file, getActiveTextEditor } from '../helpers'
 import type { LinterMessage } from '../types'

diff --git a/lib/tooltip/message-legacy.js b/lib/tooltip/message-legacy.js
@@ -8,10 +8,6 @@ const NEWLINE = /\r\n|\n/
 let MESSAGE_NUMBER = 0
 
 class MessageElement extends React.Component {
-  props: {
-    message: MessageLegacy,
-    delegate: TooltipDelegate,
-  };
   state: {
     multiLineShow: boolean,
   } = {
@@ -28,9 +24,10 @@ class MessageElement extends React.Component {
       this.setState({ multiLineShow: false })
     })
   }
-  render() {
-    return NEWLINE.test(this.props.message.text || '') ? this.renderMultiLine() : this.renderSingleLine()
-  }
+  props: {
+    message: MessageLegacy,
+    delegate: TooltipDelegate,
+  };
   renderSingleLine() {
     const { message, delegate } = this.props
 
@@ -74,6 +71,10 @@ class MessageElement extends React.Component {
       { this.state.multiLineShow && chunks.slice(1) }
     </linter-message>)
   }
+
+  render() {
+    return NEWLINE.test(this.props.message.text || '') ? this.renderMultiLine() : this.renderSingleLine()
+  }
 }
 
 module.exports = MessageElement
diff --git a/lib/tooltip/message.js b/lib/tooltip/message.js
@@ -20,18 +20,13 @@ function findHref(el: ?Element): ?string {
 }
 
 class MessageElement extends React.Component {
-  props: {
-    message: Message,
-    delegate: TooltipDelegate,
-  };
   state: {
     description: string,
     descriptionShow: boolean,
   } = {
     description: '',
     descriptionShow: false,
   };
-  descriptionLoading: boolean = false;
 
   componentDidMount() {
     this.props.delegate.onShouldUpdate(() => {
@@ -48,6 +43,44 @@ class MessageElement extends React.Component {
       }
     })
   }
+
+  // NOTE: Only handling messages v2 because v1 would be handled by message-legacy component
+  onFixClick(): void {
+    const message = this.props.message
+    const textEditor = getActiveTextEditor()
+    if (message.version === 2 && message.solutions && message.solutions.length) {
+      applySolution(textEditor, message.version, sortSolutions(message.solutions)[0])
+    }
+  }
+
+  openFile = (ev: Event) => {
+    if (!(ev.target instanceof HTMLElement)) {
+      return
+    }
+    const href = findHref(ev.target)
+    if (!href) {
+      return
+    }
+    // parse the link. e.g. atom://linter?file=<path>&row=<number>&column=<number>
+    const { protocol, hostname, query } = url.parse(href, true)
+    const file = query && query.file
+    if (protocol !== 'atom:' || hostname !== 'linter' || !file) {
+      return
+    }
+    const row = query && query.row ? parseInt(query.row, 10) : 0
+    const column = query && query.column ? parseInt(query.column, 10) : 0
+    openFile(file, { row, column })
+  }
+
+  canBeFixed(message: LinterMessage): boolean {
+    if (message.version === 1 && message.fix) {
+      return true
+    } else if (message.version === 2 && message.solutions && message.solutions.length) {
+      return true
+    }
+    return false
+  }
+
   toggleDescription(result: ?string = null) {
     const newStatus = !this.state.descriptionShow
     const description = this.state.description || this.props.message.description
@@ -83,40 +116,13 @@ class MessageElement extends React.Component {
       console.error('[Linter] Invalid description detected, expected string or function but got:', typeof description)
     }
   }
-  openFile = (ev: Event) => {
-    if (!(ev.target instanceof HTMLElement)) {
-      return
-    }
-    const href = findHref(ev.target)
-    if (!href) {
-      return
-    }
-    // parse the link. e.g. atom://linter?file=<path>&row=<number>&column=<number>
-    const { protocol, hostname, query } = url.parse(href, true)
-    const file = query && query.file
-    if (protocol !== 'atom:' || hostname !== 'linter' || !file) {
-      return
-    }
-    const row = query && query.row ? parseInt(query.row, 10) : 0
-    const column = query && query.column ? parseInt(query.column, 10) : 0
-    openFile(file, { row, column })
-  }
-  canBeFixed(message: LinterMessage): boolean {
-    if (message.version === 1 && message.fix) {
-      return true
-    } else if (message.version === 2 && message.solutions && message.solutions.length) {
-      return true
-    }
-    return false
-  }
-  // NOTE: Only handling messages v2 because v1 would be handled by message-legacy component
-  onFixClick(): void {
-    const message = this.props.message
-    const textEditor = getActiveTextEditor()
-    if (message.version === 2 && message.solutions && message.solutions.length) {
-      applySolution(textEditor, message.version, sortSolutions(message.solutions)[0])
-    }
-  }
+
+  props: {
+    message: Message,
+    delegate: TooltipDelegate,
+  };
+  descriptionLoading: boolean = false;
+
   render() {
     const { message, delegate } = this.props
 

diff --git a/lib/tree-view/index.js b/lib/tree-view/index.js
@@ -67,9 +67,9 @@ class TreeView {
     const elementCache = {}
     const appliedDecorations = {}
 
-    for (const filePath in this.decorations) {
+    Object.keys(this.decorations).forEach((filePath) => {
       if (!{}.hasOwnProperty.call(this.decorations, filePath)) {
-        continue
+        return
       }
       if (!decorations[filePath]) {
         // Removed
@@ -78,20 +78,22 @@ class TreeView {
           this.removeDecoration(element)
         }
       }
-    }
+    })
 
-    for (const filePath in decorations) {
+    Object.keys(decorations).forEach((filePath) => {
       if (!{}.hasOwnProperty.call(decorations, filePath)) {
-        continue
+        return
       }
       const element = elementCache[filePath] || (elementCache[filePath] = TreeView.getElementByPath(treeViewElement, filePath))
       if (element) {
         this.handleDecoration(element, !!this.decorations[filePath], decorations[filePath])
         appliedDecorations[filePath] = decorations[filePath]
       }
-    }
+    })
+
     this.decorations = appliedDecorations
   }
+
   handleDecoration(element: HTMLElement, update: boolean = false, highlights: TreeViewHighlight) {
     let decoration
     if (update) {