prevent-abbreviations: Show file basename instead of full path (#1593)

sindresorhus · Nov 10, 2021 · 7c2867d · 7c2867d
1 parent 5584983
commit 7c2867d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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();',