From 184f7e1bf38e142f6bd81f11aec4ce28daee26e5 Mon Sep 17 00:00:00 2001 From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com> Date: Tue, 27 Oct 2020 20:00:28 -0500 Subject: [PATCH] Remove ESLint no-continue rule --- .eslintrc.js | 2 ++ js/modules/backup.js | 2 -- ts/ConversationController.ts | 1 - ts/components/conversation/Timeline.tsx | 2 -- ts/groups.ts | 2 -- ts/sql/Client.ts | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index db193a4c1..1f58f03f8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -43,6 +43,8 @@ const rules = { { avoidEscape: true, allowTemplateLiterals: false }, ], + 'no-continue': 'off', + // Prettier overrides: 'arrow-parens': 'off', 'function-paren-newline': 'off', diff --git a/js/modules/backup.js b/js/modules/backup.js index 3230439e0..92c54f4b9 100644 --- a/js/modules/backup.js +++ b/js/modules/backup.js @@ -184,7 +184,6 @@ async function importConversationsFromJSON(conversations, options) { if (haveConversationAlready) { skipCount += 1; count += 1; - // eslint-disable-next-line no-continue continue; } @@ -694,7 +693,6 @@ async function exportConversation(conversation, options = {}) { // skip message if it is disappearing, no matter the amount of time left if (message.expireTimer || message.messageTimer || message.isViewOnce) { - // eslint-disable-next-line no-continue continue; } diff --git a/ts/ConversationController.ts b/ts/ConversationController.ts index 9df6f5195..52de67e7d 100644 --- a/ts/ConversationController.ts +++ b/ts/ConversationController.ts @@ -480,7 +480,6 @@ export class ConversationController { byE164[e164] = conversation; - // eslint-disable-next-line no-continue continue; } diff --git a/ts/components/conversation/Timeline.tsx b/ts/components/conversation/Timeline.tsx index 23306f086..84405e646 100644 --- a/ts/components/conversation/Timeline.tsx +++ b/ts/components/conversation/Timeline.tsx @@ -405,7 +405,6 @@ export class Timeline extends React.PureComponent { const { id, offsetTop, offsetHeight } = child; if (!id) { - // eslint-disable-next-line no-continue continue; } @@ -425,7 +424,6 @@ export class Timeline extends React.PureComponent { const { offsetTop, id } = child; if (!id) { - // eslint-disable-next-line no-continue continue; } diff --git a/ts/groups.ts b/ts/groups.ts index 6a029bbac..8cbe21adf 100644 --- a/ts/groups.ts +++ b/ts/groups.ts @@ -827,7 +827,6 @@ async function integrateGroupChanges({ const { groupChanges } = changes[i]; if (!groupChanges) { - // eslint-disable-next-line no-continue continue; } @@ -841,7 +840,6 @@ async function integrateGroupChanges({ window.log.warn( 'integrateGroupChanges: item had neither groupState nor groupChange. Skipping.' ); - // eslint-disable-next-line no-continue continue; } diff --git a/ts/sql/Client.ts b/ts/sql/Client.ts index 52b36b759..59c0e97b7 100644 --- a/ts/sql/Client.ts +++ b/ts/sql/Client.ts @@ -1,7 +1,6 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable camelcase */ /* eslint-disable no-param-reassign */ -/* eslint-disable no-continue */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/ban-types */