From 8d3b57cb760979bb1fdbfd6f9e92bc8ecb5d0861 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Thu, 9 Sep 2021 16:23:18 -0700 Subject: [PATCH] Add no-cond-assign rule (#17039) --- .eslintrc.sql.ts.json | 1 + extensions/.eslintrc.json | 5 +++++ extensions/git/.eslintrc.json | 5 +++++ .../notebook/browser/notebookExplorer/notebookSearch.ts | 6 +++--- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 extensions/.eslintrc.json create mode 100644 extensions/git/.eslintrc.json diff --git a/.eslintrc.sql.ts.json b/.eslintrc.sql.ts.json index fad61cb7ec..ca24e3fb00 100644 --- a/.eslintrc.sql.ts.json +++ b/.eslintrc.sql.ts.json @@ -10,6 +10,7 @@ "jsdoc" ], "rules": { + "no-cond-assign": 2, "@typescript-eslint/no-floating-promises": [ "error", { diff --git a/extensions/.eslintrc.json b/extensions/.eslintrc.json new file mode 100644 index 0000000000..e36ef9ccb0 --- /dev/null +++ b/extensions/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "rules": { + "no-cond-assign": 2 + } +} diff --git a/extensions/git/.eslintrc.json b/extensions/git/.eslintrc.json new file mode 100644 index 0000000000..7fe7992b97 --- /dev/null +++ b/extensions/git/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "rules": { + "no-cond-assign": 0 + } +} diff --git a/src/sql/workbench/contrib/notebook/browser/notebookExplorer/notebookSearch.ts b/src/sql/workbench/contrib/notebook/browser/notebookExplorer/notebookSearch.ts index ad81ac4b2b..8b2ec7ee2e 100644 --- a/src/sql/workbench/contrib/notebook/browser/notebookExplorer/notebookSearch.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebookExplorer/notebookSearch.ts @@ -532,7 +532,7 @@ class ToggleCollapseAndExpandAction extends Action { if (!viewer.isCollapsed(node)) { return true; } - } while (node = navigator.next()); + } while (node = navigator.next()); // eslint-disable-line no-cond-assign } return false; } @@ -629,7 +629,7 @@ class CollapseDeepestExpandedLevelAction extends Action { let node = navigator.first(); let collapseFileMatchLevel = false; if (node instanceof FolderMatch) { - while (node = navigator.next()) { + while (node = navigator.next()) { // eslint-disable-line no-cond-assign if (node instanceof Match) { collapseFileMatchLevel = true; break; @@ -643,7 +643,7 @@ class CollapseDeepestExpandedLevelAction extends Action { if (node instanceof FileMatch) { viewer.collapse(node); } - } while (node = navigator.next()); + } while (node = navigator.next()); // eslint-disable-line no-cond-assign } else { viewer.collapseAll(); }