From 3c73022cdb0c0ffadf5633f620fa3b39379f20a1 Mon Sep 17 00:00:00 2001 From: Kai Cataldo Date: Wed, 6 Nov 2019 21:04:39 -0500 Subject: [PATCH] Extract helper function --- lib/source-code/source-code.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/source-code/source-code.js b/lib/source-code/source-code.js index 3ebff96d236d..df2496979f4b 100644 --- a/lib/source-code/source-code.js +++ b/lib/source-code/source-code.js @@ -78,6 +78,17 @@ function sortedMerge(tokens, comments) { return result; } +/** + * Determines if two nodes or tokens overlap. + * @param {ASTNode|Token} first The first node or token to check. + * @param {ASTNode|Token} second The second node or token to check. + * @returns {boolean} True if the two nodes or tokens overlap. + * @private + */ +function nodesOrTokensOverlap(first, second) { + return first.range[0] <= second.range[0] && first.range[1] >= second.range[0]; +} + //------------------------------------------------------------------------------ // Public Interface //------------------------------------------------------------------------------ @@ -421,10 +432,7 @@ class SourceCode extends TokenStore { * @public */ isSpaceBetweenTokens(first, second) { - - // Arguments are overlapping. - if (first.range[0] <= second.range[0] && first.range[1] >= second.range[0] || - second.range[0] <= first.range[0] && second.range[1] >= first.range[0]) { + if (nodesOrTokensOverlap(first, second) || nodesOrTokensOverlap(second, first)) { return false; }