From f00b9ff0270d24e9a3b8bf1c5d34bf4e110f2aae Mon Sep 17 00:00:00 2001 From: Dimitri Mitropoulos Date: Tue, 28 May 2019 20:04:54 -0400 Subject: [PATCH 1/2] Chore: removes unnecessary assignment in loop also reduces cyclomatic complexity with a slight reconfiguring of some conditions --- lib/linter/node-event-generator.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/linter/node-event-generator.js b/lib/linter/node-event-generator.js index cea89262e5c..f4afca5b6a6 100644 --- a/lib/linter/node-event-generator.js +++ b/lib/linter/node-event-generator.js @@ -221,17 +221,23 @@ class NodeEventGenerator { const selector = parseSelector(rawSelector); if (selector.listenerTypes) { - selector.listenerTypes.forEach(nodeType => { - const typeMap = selector.isExit ? this.exitSelectorsByNodeType : this.enterSelectorsByNodeType; + const typeMap = selector.isExit ? this.exitSelectorsByNodeType : this.enterSelectorsByNodeType; + selector.listenerTypes.forEach(nodeType => { if (!typeMap.has(nodeType)) { typeMap.set(nodeType, []); } typeMap.get(nodeType).push(selector); }); - } else { - (selector.isExit ? this.anyTypeExitSelectors : this.anyTypeEnterSelectors).push(selector); + return; } + + if (selector.isExit) { + this.anyTypeExitSelectors.push(selector); + return; + } + + this.anyTypeEnterSelectors.push(selector); }); this.anyTypeEnterSelectors.sort(compareSpecificity); From 34734da4c410c17ae98899925cf48de74cc70d0c Mon Sep 17 00:00:00 2001 From: Dimitri Mitropoulos Date: Wed, 29 May 2019 14:42:11 -0400 Subject: [PATCH 2/2] uses ternary based on review notes --- lib/linter/node-event-generator.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/linter/node-event-generator.js b/lib/linter/node-event-generator.js index f4afca5b6a6..1267081d95b 100644 --- a/lib/linter/node-event-generator.js +++ b/lib/linter/node-event-generator.js @@ -231,13 +231,9 @@ class NodeEventGenerator { }); return; } + const selectors = selector.isExit ? this.anyTypeExitSelectors : this.anyTypeEnterSelectors; - if (selector.isExit) { - this.anyTypeExitSelectors.push(selector); - return; - } - - this.anyTypeEnterSelectors.push(selector); + selectors.push(selector); }); this.anyTypeEnterSelectors.sort(compareSpecificity);