From 7c2867db6713a7b97b45cf113ffee74d9c0dbc80 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Wed, 10 Nov 2021 18:03:53 +0800 Subject: [PATCH] `prevent-abbreviations`: Show file basename instead of full path (#1593) --- rules/prevent-abbreviations.js | 8 ++++---- test/prevent-abbreviations.mjs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rules/prevent-abbreviations.js b/rules/prevent-abbreviations.js index c9c1651566..9a496dd392 100644 --- a/rules/prevent-abbreviations.js +++ b/rules/prevent-abbreviations.js @@ -502,9 +502,9 @@ const create = context => { return; } - const extension = path.extname(filenameWithExtension); - const filename = path.basename(filenameWithExtension, extension); - const filenameReplacements = getNameReplacements(filename, options); + const filename = path.basename(filenameWithExtension); + const extension = path.extname(filename); + const filenameReplacements = getNameReplacements(path.basename(filename, extension), options); if (filenameReplacements.total === 0) { return; @@ -513,7 +513,7 @@ const create = context => { filenameReplacements.samples = filenameReplacements.samples.map(replacement => `${replacement}${extension}`); context.report({ - ...getMessage(filenameWithExtension, filenameReplacements, 'filename'), + ...getMessage(filename, filenameReplacements, 'filename'), node, }); }, diff --git a/test/prevent-abbreviations.mjs b/test/prevent-abbreviations.mjs index 913625f268..f1ffec0129 100644 --- a/test/prevent-abbreviations.mjs +++ b/test/prevent-abbreviations.mjs @@ -1907,7 +1907,7 @@ test({ { code: 'foo();', filename: '/path/to/doc/__prev-Attr$1Err__.conf.js', - errors: createErrors('The filename `/path/to/doc/__prev-Attr$1Err__.conf.js` should be named `__previous-Attribute$1Error__.config.js`. A more descriptive name will do too.'), + errors: createErrors('The filename `__prev-Attr$1Err__.conf.js` should be named `__previous-Attribute$1Error__.config.js`. A more descriptive name will do too.'), }, { code: 'foo();',