From 4439a04689605f7244505915e3494a86954cf28c Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 20 May 2018 23:43:42 +0100 Subject: [PATCH] fix lint --- .eslintrc.js | 1 + src/ComposerHistoryManager.js | 16 +++++----------- src/autocomplete/CommandProvider.js | 3 +-- src/autocomplete/PlainWithPillsSerializer.js | 15 ++++++--------- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index bf423a1ad8..62d24ea707 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -95,6 +95,7 @@ module.exports = { "new-cap": ["warn"], "key-spacing": ["warn"], "prefer-const": ["warn"], + "arrow-parens": "off", // crashes currently: https://github.com/eslint/eslint/issues/6274 "generator-star-spacing": "off", diff --git a/src/ComposerHistoryManager.js b/src/ComposerHistoryManager.js index f997e1d1cd..e78fbcdc3b 100644 --- a/src/ComposerHistoryManager.js +++ b/src/ComposerHistoryManager.js @@ -16,11 +16,6 @@ limitations under the License. */ import { Value } from 'slate'; -import Html from 'slate-html-serializer'; -import Md from 'slate-md-serializer'; -import Plain from 'slate-plain-serializer'; -import * as RichText from './RichText'; -import Markdown from './Markdown'; import _clamp from 'lodash/clamp'; @@ -38,17 +33,17 @@ class HistoryItem { this.format = format; } - static fromJSON(obj): HistoryItem { + static fromJSON(obj: Object): HistoryItem { return new HistoryItem( Value.fromJSON(obj.value), - obj.format + obj.format, ); } toJSON(): Object { return { value: this.value.toJSON(), - format: this.format + format: this.format, }; } } @@ -67,10 +62,9 @@ export default class ComposerHistoryManager { for (; item = sessionStorage.getItem(`${this.prefix}[${this.currentIndex}]`); this.currentIndex++) { try { this.history.push( - HistoryItem.fromJSON(JSON.parse(item)) + HistoryItem.fromJSON(JSON.parse(item)), ); - } - catch (e) { + } catch (e) { console.warn("Throwing away unserialisable history", e); } } diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index 4f2aed3dc6..d56cefb021 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -132,8 +132,7 @@ export default class CommandProvider extends AutocompleteProvider { let results; if (command[0] == '/') { results = COMMANDS; - } - else { + } else { results = this.matcher.match(command[0]); } completions = results.map((result) => { diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js index 7428241b05..c1194ae2e1 100644 --- a/src/autocomplete/PlainWithPillsSerializer.js +++ b/src/autocomplete/PlainWithPillsSerializer.js @@ -31,7 +31,7 @@ class PlainWithPillsSerializer { * @param {String} options.pillFormat - either 'md', 'plain', 'id' */ constructor(options = {}) { - let { + const { pillFormat = 'plain', } = options; this.pillFormat = pillFormat; @@ -46,7 +46,7 @@ class PlainWithPillsSerializer { * @return {String} */ serialize = value => { - return this._serializeNode(value.document) + return this._serializeNode(value.document); } /** @@ -61,8 +61,7 @@ class PlainWithPillsSerializer { (node.object == 'block' && Block.isBlockList(node.nodes)) ) { return node.nodes.map(this._serializeNode).join('\n'); - } - else if (node.type == 'emoji') { + } else if (node.type == 'emoji') { return node.data.get('emojiUnicode'); } else if (node.type == 'pill') { switch (this.pillFormat) { @@ -73,11 +72,9 @@ class PlainWithPillsSerializer { case 'id': return node.data.get('completionId') || node.data.get('completion'); } - } - else if (node.nodes) { + } else if (node.nodes) { return node.nodes.map(this._serializeNode).join(''); - } - else { + } else { return node.text; } } @@ -89,4 +86,4 @@ class PlainWithPillsSerializer { * @type {PlainWithPillsSerializer} */ -export default PlainWithPillsSerializer \ No newline at end of file +export default PlainWithPillsSerializer;