From e8ab1766f367311b906d198021353c2bbf8df301 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Thu, 10 Feb 2022 15:59:24 +0800 Subject: [PATCH] Simplify `englishishJoinWords` (#1726) --- rules/filename-case.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/rules/filename-case.js b/rules/filename-case.js index 22c22680a1..cb921d36a0 100644 --- a/rules/filename-case.js +++ b/rules/filename-case.js @@ -130,17 +130,7 @@ Turns `[a, b, c]` into `a, b, or c`. @param {string[]} words @returns {string} */ -function englishishJoinWords(words) { - if (words.length === 1) { - return words[0]; - } - - if (words.length === 2) { - return `${words[0]} or ${words[1]}`; - } - - return `${words.slice(0, -1).join(', ')}, or ${words[words.length - 1]}`; -} +const englishishJoinWords = words => new Intl.ListFormat('en-US', {type: 'disjunction'}).format(words); /** @param {import('eslint').Rule.RuleContext} context */ const create = context => {