diff options
author | James Maa <jmaa@berkeley.edu> | 2024-05-31 08:06:52 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-31 15:06:52 +0000 |
commit | 76ca08bd59f0e8bfa1bb20ac813f48e7ab241265 (patch) | |
tree | bdba43d9ba704885383c7f308c6fe3f574c647c5 /ext/js/language/en | |
parent | b3f54747eb2694bdc90bce72e5532e99d374ef08 (diff) |
Allow trailing commas in ESLint (#1013)
* Update comma-dangle rule
* Fix dangling commas
Diffstat (limited to 'ext/js/language/en')
-rw-r--r-- | ext/js/language/en/english-transforms.js | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/ext/js/language/en/english-transforms.js b/ext/js/language/en/english-transforms.js index 079eb42b..c8c9c0d9 100644 --- a/ext/js/language/en/english-transforms.js +++ b/ext/js/language/en/english-transforms.js @@ -41,7 +41,7 @@ const pastSuffixInflections = [ suffixInflection('laid', 'lay', ['v'], ['v']), suffixInflection('paid', 'pay', ['v'], ['v']), - suffixInflection('said', 'say', ['v'], ['v']) + suffixInflection('said', 'say', ['v'], ['v']), ]; const ingSuffixInflections = [ @@ -49,13 +49,13 @@ const ingSuffixInflections = [ suffixInflection('ing', 'e', ['v'], ['v']), // 'driving' suffixInflection('ying', 'ie', ['v'], ['v']), // 'lying' suffixInflection('cking', 'c', ['v'], ['v']), // 'panicking' - ...doubledConsonantInflection('bdgklmnprstz', 'ing', ['v'], ['v']) + ...doubledConsonantInflection('bdgklmnprstz', 'ing', ['v'], ['v']), ]; const thirdPersonSgPresentSuffixInflections = [ suffixInflection('s', '', ['v'], ['v']), // 'walks' suffixInflection('es', '', ['v'], ['v']), // 'teaches' - suffixInflection('ies', 'y', ['v'], ['v']) // 'tries' + suffixInflection('ies', 'y', ['v'], ['v']), // 'tries' ]; const phrasalVerbParticles = ['aboard', 'about', 'above', 'across', 'ahead', 'alongside', 'apart', 'around', 'aside', 'astray', 'away', 'back', 'before', 'behind', 'below', 'beneath', 'besides', 'between', 'beyond', 'by', 'close', 'down', 'east', 'west', 'north', 'south', 'eastward', 'westward', 'northward', 'southward', 'forward', 'backward', 'backwards', 'forwards', 'home', 'in', 'inside', 'instead', 'near', 'off', 'on', 'opposite', 'out', 'outside', 'over', 'overhead', 'past', 'round', 'since', 'through', 'throughout', 'together', 'under', 'underneath', 'up', 'within', 'without']; @@ -72,7 +72,7 @@ const phrasalVerbInterposedObjectRule = { return term.replace(new RegExp(`(?<=\\w) (?:(?!\\b(${phrasalVerbWordDisjunction})\\b).)+ (?=(?:${particlesDisjunction}))`), ' '); }, conditionsIn: [], - conditionsOut: ['v_phr'] + conditionsOut: ['v_phr'], }; /** @@ -88,7 +88,7 @@ function createPhrasalVerbInflection(inflected, deinflected) { return term.replace(new RegExp(`(?<=)${inflected}(?= (?:${phrasalVerbWordDisjunction}))`), deinflected); }, conditionsIn: ['v_phr'], - conditionsOut: ['v_phr'] + conditionsOut: ['v_phr'], }; } @@ -112,41 +112,41 @@ export const englishTransforms = { v_any: { name: 'Verb', isDictionaryForm: false, - subConditions: ['v', 'v_irr', 'v_phr'] + subConditions: ['v', 'v_irr', 'v_phr'], }, v: { name: 'Regular verb', - isDictionaryForm: true + isDictionaryForm: true, }, v_irr: { name: 'Irregular verb', - isDictionaryForm: true + isDictionaryForm: true, }, v_phr: { name: 'Phrasal verb', - isDictionaryForm: true + isDictionaryForm: true, }, n: { name: 'Noun', isDictionaryForm: true, - subConditions: ['np', 'ns'] + subConditions: ['np', 'ns'], }, np: { name: 'Noun plural', - isDictionaryForm: true + isDictionaryForm: true, }, ns: { name: 'Noun singular', - isDictionaryForm: true + isDictionaryForm: true, }, adj: { name: 'Adjective', - isDictionaryForm: true + isDictionaryForm: true, }, adv: { name: 'Adverb', - isDictionaryForm: true - } + isDictionaryForm: true, + }, }, transforms: [ { @@ -157,54 +157,54 @@ export const englishTransforms = { suffixInflection('es', '', ['np'], ['ns']), suffixInflection('ies', 'y', ['np'], ['ns']), suffixInflection('ves', 'fe', ['np'], ['ns']), - suffixInflection('ves', 'f', ['np'], ['ns']) - ] + suffixInflection('ves', 'f', ['np'], ['ns']), + ], }, { name: 'possessive', description: 'Possessive form of a noun', rules: [ suffixInflection('\'s', '', ['n'], ['n']), - suffixInflection('s\'', 's', ['n'], ['n']) - ] + suffixInflection('s\'', 's', ['n'], ['n']), + ], }, { name: 'past', description: 'Simple past tense of a verb', rules: [ ...pastSuffixInflections, - ...createPhrasalVerbInflectionsFromSuffixInflections(pastSuffixInflections) - ] + ...createPhrasalVerbInflectionsFromSuffixInflections(pastSuffixInflections), + ], }, { name: 'ing', description: 'Present participle of a verb', rules: [ ...ingSuffixInflections, - ...createPhrasalVerbInflectionsFromSuffixInflections(ingSuffixInflections) - ] + ...createPhrasalVerbInflectionsFromSuffixInflections(ingSuffixInflections), + ], }, { name: '3rd pers. sing. pres', description: 'Third person singular present tense of a verb', rules: [ ...thirdPersonSgPresentSuffixInflections, - ...createPhrasalVerbInflectionsFromSuffixInflections(thirdPersonSgPresentSuffixInflections) - ] + ...createPhrasalVerbInflectionsFromSuffixInflections(thirdPersonSgPresentSuffixInflections), + ], }, { name: 'interposed object', description: 'Phrasal verb with interposed object', rules: [ - phrasalVerbInterposedObjectRule - ] + phrasalVerbInterposedObjectRule, + ], }, { name: 'archaic', description: 'Archaic form of a word', rules: [ - suffixInflection('\'d', 'ed', ['v'], ['v']) - ] + suffixInflection('\'d', 'ed', ['v'], ['v']), + ], }, { name: 'adverb', @@ -212,8 +212,8 @@ export const englishTransforms = { rules: [ suffixInflection('ly', '', ['adv'], ['adj']), // 'quickly' suffixInflection('ily', 'y', ['adv'], ['adj']), // 'happily' - suffixInflection('ly', 'le', ['adv'], ['adj']) // 'humbly' - ] + suffixInflection('ly', 'le', ['adv'], ['adj']), // 'humbly' + ], }, { name: 'comparative', @@ -222,8 +222,8 @@ export const englishTransforms = { suffixInflection('er', '', ['adj'], ['adj']), // 'faster' suffixInflection('er', 'e', ['adj'], ['adj']), // 'nicer' suffixInflection('ier', 'y', ['adj'], ['adj']), // 'happier' - ...doubledConsonantInflection('bdgmnt', 'er', ['adj'], ['adj']) - ] + ...doubledConsonantInflection('bdgmnt', 'er', ['adj'], ['adj']), + ], }, { name: 'superlative', @@ -232,15 +232,15 @@ export const englishTransforms = { suffixInflection('est', '', ['adj'], ['adj']), // 'fastest' suffixInflection('est', 'e', ['adj'], ['adj']), // 'nicest' suffixInflection('iest', 'y', ['adj'], ['adj']), // 'happiest' - ...doubledConsonantInflection('bdgmnt', 'est', ['adj'], ['adj']) - ] + ...doubledConsonantInflection('bdgmnt', 'est', ['adj'], ['adj']), + ], }, { name: 'dropped g', description: 'Dropped g in -ing form of a verb', rules: [ - suffixInflection('in\'', 'ing', ['v'], ['v']) - ] + suffixInflection('in\'', 'ing', ['v'], ['v']), + ], }, { name: '-y', @@ -248,37 +248,37 @@ export const englishTransforms = { rules: [ suffixInflection('y', '', ['adj'], ['n', 'v']), // 'dirty', 'pushy' suffixInflection('y', 'e', ['adj'], ['n', 'v']), // 'hazy' - ...doubledConsonantInflection('glmnprst', 'y', [], ['n', 'v']) // 'baggy', 'saggy' - ] + ...doubledConsonantInflection('glmnprst', 'y', [], ['n', 'v']), // 'baggy', 'saggy' + ], }, { name: 'un-', description: 'Negative form of an adjective, adverb, or verb', rules: [ - prefixInflection('un', '', ['adj', 'adv', 'v'], ['adj', 'adv', 'v']) - ] + prefixInflection('un', '', ['adj', 'adv', 'v'], ['adj', 'adv', 'v']), + ], }, { name: 'going-to future', description: 'Going-to future tense of a verb', rules: [ - prefixInflection('going to ', '', ['v'], ['v']) - ] + prefixInflection('going to ', '', ['v'], ['v']), + ], }, { name: 'will future', description: 'Will-future tense of a verb', rules: [ - prefixInflection('will ', '', ['v'], ['v']) - ] + prefixInflection('will ', '', ['v'], ['v']), + ], }, { name: 'imperative negative', description: 'Negative imperative form of a verb', rules: [ prefixInflection('don\'t ', '', ['v'], ['v']), - prefixInflection('do not ', '', ['v'], ['v']) - ] - } - ] + prefixInflection('do not ', '', ['v'], ['v']), + ], + }, + ], }; |