eslint-plugin-unicorn 22.0.0 → 23.0.0

package/index.js

@@ -49,6 +49,8 @@ module.exports = {
 				'unicorn/no-useless-undefined': 'error',
 				'unicorn/no-zero-fractions': 'error',
 				'unicorn/number-literal-case': 'error',
+				// TODO: Enable this by default when it's shipping in a Node.js LTS version.
+				'unicorn/numeric-separators-style': 'off',
 				'unicorn/prefer-add-event-listener': 'error',
 				'unicorn/prefer-array-find': 'error',
 				'unicorn/prefer-dataset': 'error',
@@ -56,6 +58,7 @@ module.exports = {
 				// TODO: Enable this by default when targeting Node.js 12.
 				'unicorn/prefer-flat-map': 'off',
 				'unicorn/prefer-includes': 'error',
+				'unicorn/prefer-math-trunc': 'error',
 				'unicorn/prefer-modern-dom-apis': 'error',
 				'unicorn/prefer-negative-index': 'error',
 				'unicorn/prefer-node-append': 'error',
@@ -70,6 +73,7 @@ module.exports = {
 				'unicorn/prefer-spread': 'error',
 				'unicorn/prefer-starts-ends-with': 'error',
 				'unicorn/prefer-string-slice': 'error',
+				'unicorn/prefer-ternary': 'error',
 				'unicorn/prefer-text-content': 'error',
 				'unicorn/prefer-trim-start-end': 'error',
 				'unicorn/prefer-type-error': 'error',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "eslint-plugin-unicorn",
-	"version": "22.0.0",
+	"version": "23.0.0",
 	"description": "Various awesome ESLint rules",
 	"license": "MIT",
 	"repository": "sindresorhus/eslint-plugin-unicorn",
@@ -51,25 +51,25 @@
 		"@ava/babel": "^1.0.1",
 		"@babel/code-frame": "7.10.4",
 		"@lubien/fixture-beta-package": "^1.0.0-beta.1",
-		"@typescript-eslint/parser": "^4.1.0",
-		"ava": "^3.12.1",
+		"@typescript-eslint/parser": "^4.4.1",
+		"ava": "^3.13.0",
 		"babel-eslint": "^10.1.0",
 		"chalk": "^4.1.0",
-		"eslint": "^7.8.0",
+		"eslint": "^7.11.0",
 		"eslint-ava-rule-tester": "^4.0.0",
 		"eslint-plugin-eslint-plugin": "^2.3.0",
 		"execa": "^4.0.3",
 		"listr": "^0.14.3",
-		"mem": "6.1.1",
+		"mem": "8.0.0",
 		"nyc": "^15.1.0",
 		"outdent": "^0.7.1",
 		"pify": "^5.0.0",
-		"typescript": "^4.0.2",
-		"vue-eslint-parser": "^7.1.0",
+		"typescript": "^4.0.3",
+		"vue-eslint-parser": "^7.1.1",
 		"xo": "^0.33.1"
 	},
 	"peerDependencies": {
-		"eslint": ">=7.8.0"
+		"eslint": ">=7.11.0"
 	},
 	"ava": {
 		"babel": true,
@@ -93,6 +93,9 @@
 		"extends": [
 			"plugin:eslint-plugin/all"
 		],
+		"ignores": [
+			"test/integration/{fixtures,unicorn}/**"
+		],
 		"overrides": [
 			{
 				"files": "rules/utils/*.js",
@@ -110,7 +113,15 @@
 		],
 		"rules": {
 			"strict": "error",
-			"unicorn/no-null": "error"
+			"unicorn/no-null": "error",
+			"unicorn/prevent-abbreviations": [
+				"error",
+				{
+					"replacements": {
+						"fn": false
+					}
+				}
+			]
 		}
 	}
 }

package/readme.md

@@ -65,12 +65,14 @@ Configure it in `package.json`.
 			"unicorn/no-useless-undefined": "error",
 			"unicorn/no-zero-fractions": "error",
 			"unicorn/number-literal-case": "error",
+			"unicorn/numeric-separators-style": "off",
 			"unicorn/prefer-add-event-listener": "error",
 			"unicorn/prefer-array-find": "error",
 			"unicorn/prefer-dataset": "error",
 			"unicorn/prefer-event-key": "error",
 			"unicorn/prefer-flat-map": "error",
 			"unicorn/prefer-includes": "error",
+			"unicorn/prefer-math-trunc": "error",
 			"unicorn/prefer-modern-dom-apis": "error",
 			"unicorn/prefer-negative-index": "error",
 			"unicorn/prefer-node-append": "error",
@@ -84,6 +86,7 @@ Configure it in `package.json`.
 			"unicorn/prefer-spread": "error",
 			"unicorn/prefer-starts-ends-with": "error",
 			"unicorn/prefer-string-slice": "error",
+			"unicorn/prefer-ternary": "off",
 			"unicorn/prefer-text-content": "error",
 			"unicorn/prefer-trim-start-end": "error",
 			"unicorn/prefer-type-error": "error",
@@ -128,12 +131,14 @@ Configure it in `package.json`.
 - [no-useless-undefined](docs/rules/no-useless-undefined.md) - Disallow useless `undefined`. *(fixable)*
 - [no-zero-fractions](docs/rules/no-zero-fractions.md) - Disallow number literals with zero fractions or dangling dots. *(fixable)*
 - [number-literal-case](docs/rules/number-literal-case.md) - Enforce proper case for numeric literals. *(fixable)*
+- [numeric-separators-style](docs/rules/numeric-separators-style.md) - Enforce the style of numeric separators by correctly grouping digits. *(fixable)*
 - [prefer-add-event-listener](docs/rules/prefer-add-event-listener.md) - Prefer `.addEventListener()` and `.removeEventListener()` over `on`-functions. *(partly fixable)*
 - [prefer-array-find](docs/rules/prefer-array-find.md) - Prefer `.find(…)` over the first element from `.filter(…)`. *(partly fixable)*
 - [prefer-dataset](docs/rules/prefer-dataset.md) - Prefer using `.dataset` on DOM elements over `.setAttribute(…)`. *(fixable)*
 - [prefer-event-key](docs/rules/prefer-event-key.md) - Prefer `KeyboardEvent#key` over `KeyboardEvent#keyCode`. *(partly fixable)*
 - [prefer-flat-map](docs/rules/prefer-flat-map.md) - Prefer `.flatMap(…)` over `.map(…).flat()`. *(fixable)*
 - [prefer-includes](docs/rules/prefer-includes.md) - Prefer `.includes()` over `.indexOf()` when checking for existence or non-existence. *(fixable)*
+- [prefer-math-trunc](docs/rules/prefer-math-trunc.md) - Enforce the use of `Math.trunc` instead of bitwise operators. *(partly fixable)*
 - [prefer-modern-dom-apis](docs/rules/prefer-modern-dom-apis.md) - Prefer `.before()` over `.insertBefore()`, `.replaceWith()` over `.replaceChild()`, prefer one of `.before()`, `.after()`, `.append()` or `.prepend()` over `insertAdjacentText()` and `insertAdjacentElement()`. *(fixable)*
 - [prefer-negative-index](docs/rules/prefer-negative-index.md) - Prefer negative index over `.length - index` for `{String,Array,TypedArray}#slice()` and `Array#splice()`. *(fixable)*
 - [prefer-node-append](docs/rules/prefer-node-append.md) - Prefer `Node#append()` over `Node#appendChild()`. *(fixable)*
@@ -147,6 +152,7 @@ Configure it in `package.json`.
 - [prefer-spread](docs/rules/prefer-spread.md) - Prefer the spread operator over `Array.from()`. *(fixable)*
 - [prefer-starts-ends-with](docs/rules/prefer-starts-ends-with.md) - Prefer `String#startsWith()` & `String#endsWith()` over more complex alternatives. *(partly fixable)*
 - [prefer-string-slice](docs/rules/prefer-string-slice.md) - Prefer `String#slice()` over `String#substr()` and `String#substring()`. *(partly fixable)*
+- [prefer-ternary](docs/rules/prefer-ternary.md) - Prefer ternary expressions over simple `if-else` statements. *(fixable)*
 - [prefer-text-content](docs/rules/prefer-text-content.md) - Prefer `.textContent` over `.innerText`. *(fixable)*
 - [prefer-trim-start-end](docs/rules/prefer-trim-start-end.md) - Prefer `String#trimStart()` / `String#trimEnd()` over `String#trimLeft()` / `String#trimRight()`. *(fixable)*
 - [prefer-type-error](docs/rules/prefer-type-error.md) - Enforce throwing `TypeError` in type checking conditions. *(fixable)*

package/rules/better-regex.js

@@ -4,7 +4,10 @@ const {optimize} = require('regexp-tree');
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const quoteString = require('./utils/quote-string');
 
-const message = '{{original}} can be optimized to {{optimized}}';
+const MESSAGE_ID = 'better-regex';
+const messages = {
+	[MESSAGE_ID]: '{{original}} can be optimized to {{optimized}}.'
+};
 
 const create = context => {
 	const {sortCharacterClasses} = context.options[0] || {};
@@ -37,7 +40,7 @@ const create = context => {
 
 			context.report({
 				node,
-				message,
+				messageId: MESSAGE_ID,
 				data: {
 					original,
 					optimized
@@ -64,7 +67,7 @@ const create = context => {
 			if (oldPattern !== newPattern) {
 				context.report({
 					node,
-					message,
+					messageId: MESSAGE_ID,
 					data: {
 						original: oldPattern,
 						optimized: newPattern
@@ -99,6 +102,7 @@ module.exports = {
 			url: getDocumentationUrl(__filename)
 		},
 		fixable: 'code',
-		schema
+		schema,
+		messages
 	}
 };

package/rules/catch-error-name.js

@@ -5,7 +5,10 @@ const getDocumentationUrl = require('./utils/get-documentation-url');
 const renameVariable = require('./utils/rename-variable');
 const methodSelector = require('./utils/method-selector');
 
-const ERROR_MESSAGE_ID = 'error';
+const MESSAGE_ID = 'catch-error-name';
+const messages = {
+	[MESSAGE_ID]: 'The catch parameter `{{originalName}}` should be named `{{fixedName}}`.'
+};
 
 const promiseMethodSelector = (method, argumentsLength, argumentIndex) => [
 	methodSelector({
@@ -78,7 +81,7 @@ const create = context => {
 
 		context.report({
 			node,
-			messageId: ERROR_MESSAGE_ID,
+			messageId: MESSAGE_ID,
 			data: {
 				originalName,
 				fixedName
@@ -124,8 +127,6 @@ module.exports = {
 		},
 		fixable: 'code',
 		schema,
-		messages: {
-			[ERROR_MESSAGE_ID]: 'The catch parameter `{{originalName}}` should be named `{{fixedName}}`.'
-		}
+		messages
 	}
 };

package/rules/consistent-function-scoping.js

@@ -4,6 +4,9 @@ const getDocumentationUrl = require('./utils/get-documentation-url');
 const getReferences = require('./utils/get-references');
 
 const MESSAGE_ID = 'consistent-function-scoping';
+const messages = {
+	[MESSAGE_ID]: 'Move {{functionNameWithKind}} to the outer scope.'
+};
 
 const isSameScope = (scope1, scope2) =>
 	scope1 && scope2 && (scope1 === scope2 || scope1.block === scope2.block);
@@ -153,17 +156,21 @@ const create = context => {
 	const {scopeManager} = sourceCode;
 
 	const functions = [];
-	let hasJsx = false;
 
 	return {
-		'ArrowFunctionExpression, FunctionDeclaration': node => functions.push(node),
+		':function': () => {
+			functions.push(false);
+		},
 		JSXElement: () => {
 			// Turn off this rule if we see a JSX element because scope
 			// references does not include JSXElement nodes.
-			hasJsx = true;
+			if (functions.length > 0) {
+				functions[functions.length - 1] = true;
+			}
 		},
-		':matches(ArrowFunctionExpression, FunctionDeclaration):exit': node => {
-			if (!hasJsx && !checkNode(node, scopeManager)) {
+		':function:exit': node => {
+			const currentFunctionHasJsx = functions.pop();
+			if (!currentFunctionHasJsx && !checkNode(node, scopeManager)) {
 				context.report({
 					node,
 					loc: getFunctionHeadLocation(node, sourceCode),
@@ -173,11 +180,6 @@ const create = context => {
 					}
 				});
 			}
-
-			functions.pop();
-			if (functions.length === 0) {
-				hasJsx = false;
-			}
 		}
 	};
 };
@@ -189,8 +191,6 @@ module.exports = {
 		docs: {
 			url: getDocumentationUrl(__filename)
 		},
-		messages: {
-			[MESSAGE_ID]: 'Move {{functionNameWithKind}} to the outer scope.'
-		}
+		messages
 	}
 };

package/rules/custom-error-definition.js

@@ -3,6 +3,9 @@ const {upperFirst} = require('lodash');
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
 const MESSAGE_ID_INVALID_EXPORT = 'invalidExport';
+const messages = {
+	[MESSAGE_ID_INVALID_EXPORT]: 'Exported error name should match error class'
+};
 
 const nameRegexp = /^(?:[A-Z][\da-z]*)*Error$/;
 
@@ -212,8 +215,6 @@ module.exports = {
 			url: getDocumentationUrl(__filename)
 		},
 		fixable: 'code',
-		messages: {
-			[MESSAGE_ID_INVALID_EXPORT]: 'Exported error name should match error class'
-		}
+		messages
 	}
 };

package/rules/error-message.js

@@ -1,6 +1,13 @@
 'use strict';
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
+const MESSAGE_ID_MISSING_MESSAGE = 'constructorMissingMessage';
+const MESSAGE_ID_EMPTY_MESSAGE = 'emptyMessage';
+const messages = {
+	[MESSAGE_ID_MISSING_MESSAGE]: 'Pass a message to the error constructor.',
+	[MESSAGE_ID_EMPTY_MESSAGE]: 'Error message should not be an empty string.'
+};
+
 const errorConstructors = new Set([
 	'Error',
 	'EvalError',
@@ -55,14 +62,14 @@ const reportError = (expressionNode, context) => {
 		if (expressionNode.arguments.length === 0) {
 			context.report({
 				node: expressionNode.parent,
-				message: 'Pass a message to the error constructor.'
+				messageId: MESSAGE_ID_MISSING_MESSAGE
 			});
 		}
 
 		if (isEmptyMessageString(expressionNode)) {
 			context.report({
 				node: expressionNode.parent,
-				message: 'Error message should not be an empty string.'
+				messageId: MESSAGE_ID_EMPTY_MESSAGE
 			});
 		}
 	}
@@ -99,6 +106,7 @@ module.exports = {
 		type: 'problem',
 		docs: {
 			url: getDocumentationUrl(__filename)
-		}
+		},
+		messages
 	}
 };

package/rules/escape-case.js

@@ -2,9 +2,13 @@
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const replaceTemplateElement = require('./utils/replace-template-element');
 
+const MESSAGE_ID = 'escape-case';
+const messages = {
+	[MESSAGE_ID]: 'Use uppercase characters for the value of the escape sequence.'
+};
+
 const escapeWithLowercase = /(?<=(?:^|[^\\])(?:\\\\)*\\)(?<data>x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|u{[\dA-Fa-f]+})/g;
 const escapePatternWithLowercase = /(?<=(?:^|[^\\])(?:\\\\)*\\)(?<data>x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|u{[\dA-Fa-f]+}|c[a-z])/g;
-const message = 'Use uppercase characters for the value of the escape sequence.';
 
 const create = context => {
 	const check = ({node, original, regex = escapeWithLowercase, fix}) => {
@@ -13,7 +17,7 @@ const create = context => {
 		if (fixed !== original) {
 			context.report({
 				node,
-				message,
+				messageId: MESSAGE_ID,
 				fix: fixer => fix ? fix(fixer, fixed) : fixer.replaceText(node, fixed)
 			});
 		}
@@ -54,6 +58,7 @@ module.exports = {
 		docs: {
 			url: getDocumentationUrl(__filename)
 		},
-		fixable: 'code'
+		fixable: 'code',
+		messages
 	}
 };

package/rules/expiring-todo-comments.js

@@ -18,6 +18,29 @@ const MESSAGE_ID_VERSION_MATCHES = 'unicorn/versionMatches';
 const MESSAGE_ID_ENGINE_MATCHES = 'unicorn/engineMatches';
 const MESSAGE_ID_REMOVE_WHITESPACE = 'unicorn/removeWhitespaces';
 const MESSAGE_ID_MISSING_AT_SYMBOL = 'unicorn/missingAtSymbol';
+const messages = {
+	[MESSAGE_ID_AVOID_MULTIPLE_DATES]:
+		'Avoid using multiple expiration dates in TODO: {{expirationDates}}. {{message}}',
+	[MESSAGE_ID_EXPIRED_TODO]:
+		'There is a TODO that is past due date: {{expirationDate}}. {{message}}',
+	[MESSAGE_ID_REACHED_PACKAGE_VERSION]:
+		'There is a TODO that is past due package version: {{comparison}}. {{message}}',
+	[MESSAGE_ID_AVOID_MULTIPLE_PACKAGE_VERSIONS]:
+		'Avoid using multiple package versions in TODO: {{versions}}. {{message}}',
+	[MESSAGE_ID_HAVE_PACKAGE]:
+		'There is a TODO that is deprecated since you installed: {{package}}. {{message}}',
+	[MESSAGE_ID_DONT_HAVE_PACKAGE]:
+		'There is a TODO that is deprecated since you uninstalled: {{package}}. {{message}}',
+	[MESSAGE_ID_VERSION_MATCHES]:
+		'There is a TODO match for package version: {{comparison}}. {{message}}',
+	[MESSAGE_ID_ENGINE_MATCHES]:
+		'There is a TODO match for Node.js version: {{comparison}}. {{message}}',
+	[MESSAGE_ID_REMOVE_WHITESPACE]:
+		'Avoid using whitespace on TODO argument. On \'{{original}}\' use \'{{fix}}\'. {{message}}',
+	[MESSAGE_ID_MISSING_AT_SYMBOL]:
+		'Missing \'@\' on TODO argument. On \'{{original}}\' use \'{{fix}}\'. {{message}}',
+	...baseRule.meta.messages
+};
 
 const packageResult = readPkgUp.sync();
 const hasPackage = Boolean(packageResult);
@@ -509,29 +532,7 @@ module.exports = {
 		docs: {
 			url: getDocumentationUrl(__filename)
 		},
-		messages: {
-			[MESSAGE_ID_AVOID_MULTIPLE_DATES]:
-				'Avoid using multiple expiration dates in TODO: {{expirationDates}}. {{message}}',
-			[MESSAGE_ID_EXPIRED_TODO]:
-				'There is a TODO that is past due date: {{expirationDate}}. {{message}}',
-			[MESSAGE_ID_REACHED_PACKAGE_VERSION]:
-				'There is a TODO that is past due package version: {{comparison}}. {{message}}',
-			[MESSAGE_ID_AVOID_MULTIPLE_PACKAGE_VERSIONS]:
-				'Avoid using multiple package versions in TODO: {{versions}}. {{message}}',
-			[MESSAGE_ID_HAVE_PACKAGE]:
-				'There is a TODO that is deprecated since you installed: {{package}}. {{message}}',
-			[MESSAGE_ID_DONT_HAVE_PACKAGE]:
-				'There is a TODO that is deprecated since you uninstalled: {{package}}. {{message}}',
-			[MESSAGE_ID_VERSION_MATCHES]:
-				'There is a TODO match for package version: {{comparison}}. {{message}}',
-			[MESSAGE_ID_ENGINE_MATCHES]:
-				'There is a TODO match for Node.js version: {{comparison}}. {{message}}',
-			[MESSAGE_ID_REMOVE_WHITESPACE]:
-				'Avoid using whitespace on TODO argument. On \'{{original}}\' use \'{{fix}}\'. {{message}}',
-			[MESSAGE_ID_MISSING_AT_SYMBOL]:
-				'Missing \'@\' on TODO argument. On \'{{original}}\' use \'{{fix}}\'. {{message}}',
-			...baseRule.meta.messages
-		},
+		messages,
 		schema
 	}
 };

package/rules/explicit-length-check.js

@@ -1,16 +1,24 @@
 'use strict';
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
+const messages = {
+	compareToValue: '`length` property should be compared to a value.',
+	zeroEqual: 'Zero `.length` should be compared with `=== 0`.',
+	nonZeroEqual: 'Non-zero `.length` should be compared with `!== 0`.',
+	nonZeroGreater: 'Non-zero `.length` should be compared with `> 0`.',
+	nonZeroGreaterEqual: 'Non-zero `.length` should be compared with `>= 1`.'
+};
+
 const operatorTypes = {
 	gt: ['>'],
 	gte: ['>='],
 	ne: ['!==', '!=']
 };
 
-function reportError(context, node, message, fixDetails) {
+function reportError(context, node, messageId, fixDetails) {
 	context.report({
 		node,
-		message,
+		messageId,
 		fix: fixDetails && (fixer => {
 			return fixer.replaceText(
 				node,
@@ -25,7 +33,7 @@ function checkZeroType(context, node) {
 		reportError(
 			context,
 			node,
-			'Zero `.length` should be compared with `=== 0`.',
+			'zeroEqual',
 			{
 				node: node.left,
 				operator: '===',
@@ -35,7 +43,7 @@ function checkZeroType(context, node) {
 	}
 }
 
-function checkNonZeroType(context, node, type) {
+function checkNonZeroType(context, node, type = 'greater-than') {
 	const {value} = node.right;
 	const {operator} = node;
 
@@ -48,7 +56,7 @@ function checkNonZeroType(context, node, type) {
 				reportError(
 					context,
 					node,
-					'Non-zero `.length` should be compared with `> 0`.',
+					'nonZeroGreater',
 					{
 						node: node.left,
 						operator: '>',
@@ -66,7 +74,7 @@ function checkNonZeroType(context, node, type) {
 				reportError(
 					context,
 					node,
-					'Non-zero `.length` should be compared with `>= 1`.',
+					'nonZeroGreaterEqual',
 					{
 						node: node.left,
 						operator: '>=',
@@ -84,7 +92,7 @@ function checkNonZeroType(context, node, type) {
 				reportError(
 					context,
 					node,
-					'Non-zero `.length` should be compared with `!== 0`.',
+					'nonZeroEqual',
 					{
 						node: node.left,
 						operator: '!==',
@@ -134,7 +142,7 @@ function checkExpression(context, node) {
 		node.property.name === 'length' &&
 		!node.computed
 	) {
-		reportError(context, node, '`length` property should be compared to a value.');
+		reportError(context, node, 'compareToValue');
 	}
 }
 
@@ -154,7 +162,8 @@ const schema = [
 		type: 'object',
 		properties: {
 			'non-zero': {
-				enum: ['not-equal', 'greater-than', 'greater-than-or-equal']
+				enum: ['not-equal', 'greater-than', 'greater-than-or-equal'],
+				default: 'greater-than'
 			}
 		}
 	}
@@ -168,6 +177,7 @@ module.exports = {
 			url: getDocumentationUrl(__filename)
 		},
 		fixable: 'code',
-		schema
+		schema,
+		messages
 	}
 };

package/rules/filename-case.js

@@ -4,6 +4,11 @@ const {camelCase, kebabCase, snakeCase, upperFirst} = require('lodash');
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const cartesianProductSamples = require('./utils/cartesian-product-samples');
 
+const messages = {
+	renameToCase: 'Filename is not in {{chosenCases}}. Rename it to {{renamedFilenames}}.',
+	renameToCases: 'Filename is not in {{chosenCases}}. Rename it to {{renamedFilenames}}.'
+};
+
 const pascalCase = string => upperFirst(camelCase(string));
 const numberRegex = /\d+/;
 const PLACEHOLDER = '\uFFFF\uFFFF\uFFFF';
@@ -246,9 +251,6 @@ module.exports = {
 			url: getDocumentationUrl(__filename)
 		},
 		schema,
-		messages: {
-			renameToCase: 'Filename is not in {{chosenCases}}. Rename it to {{renamedFilenames}}.',
-			renameToCases: 'Filename is not in {{chosenCases}}. Rename it to {{renamedFilenames}}.'
-		}
+		messages
 	}
 };

package/rules/import-index.js

@@ -1,6 +1,11 @@
 'use strict';
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
+const MESSAGE_ID = 'import-index';
+const messages = {
+	[MESSAGE_ID]: 'Do not reference the index file directly..'
+};
+
 const regexp = /^(?<package>@.*?\/.*?|[./]+?.*?)\/(?:\.|(?:index(?:\.js)?))?$/;
 const isImportingIndex = value => regexp.test(value);
 const normalize = value => value.replace(regexp, '$<package>');
@@ -9,7 +14,7 @@ const importIndex = (context, node, argument) => {
 	if (argument && isImportingIndex(argument.value)) {
 		context.report({
 			node,
-			message: 'Do not reference the index file directly.',
+			messageId: MESSAGE_ID,
 			fix: fixer => fixer.replaceText(argument, `'${normalize(argument.value)}'`)
 		});
 	}
@@ -50,6 +55,7 @@ module.exports = {
 			url: getDocumentationUrl(__filename)
 		},
 		schema,
-		fixable: 'code'
+		fixable: 'code',
+		messages
 	}
 };

package/rules/import-style.js

@@ -3,6 +3,11 @@ const {defaultsDeep} = require('lodash');
 const {getStringIfConstant} = require('eslint-utils');
 const eslintTemplateVisitor = require('eslint-template-visitor');
 
+const MESSAGE_ID = 'importStyle';
+const messages = {
+	[MESSAGE_ID]: 'Use {{allowedStyles}} import for module `{{moduleName}}`.'
+};
+
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
 const getActualImportDeclarationStyles = importDeclaration => {
@@ -111,8 +116,6 @@ const joinOr = words => {
 		.join(' ');
 };
 
-const MESSAGE_ID = 'importStyle';
-
 // Keep this alphabetically sorted for easier maintenance
 const defaultStyles = {
 	chalk: {
@@ -364,9 +367,7 @@ module.exports = {
 		docs: {
 			url: getDocumentationUrl(__filename)
 		},
-		messages: {
-			[MESSAGE_ID]: 'Use {{allowedStyles}} import for module `{{moduleName}}`.'
-		},
+		messages,
 		schema
 	}
 };

package/rules/no-abusive-eslint-disable.js

@@ -1,6 +1,11 @@
 'use strict';
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
+const MESSAGE_ID = 'no-abusive-eslint-disable';
+const messages = {
+	[MESSAGE_ID]: 'Specify the rules you want to disable.'
+};
+
 const disableRegex = /^eslint-disable(?:-next-line|-line)?(?<ruleId>$|(?:\s+(?:@(?:[\w-]+\/){1,2})?[\w-]+)?)/;
 
 const create = context => ({
@@ -14,6 +19,8 @@ const create = context => ({
 				!result.groups.ruleId // But it did not specify any rules
 			) {
 				context.report({
+					// Can't set it at the given location as the warning
+					// will be ignored due to the disable comment
 					loc: {
 						start: {
 							...comment.loc.start,
@@ -21,7 +28,7 @@ const create = context => ({
 						},
 						end: comment.loc.end
 					},
-					message: 'Specify the rules you want to disable.'
+					messageId: MESSAGE_ID
 				});
 			}
 		}
@@ -34,6 +41,7 @@ module.exports = {
 		type: 'suggestion',
 		docs: {
 			url: getDocumentationUrl(__filename)
-		}
+		},
+		messages
 	}
 };

package/rules/no-array-instanceof.js

@@ -1,7 +1,10 @@
 'use strict';
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
-const message = 'Use `Array.isArray()` instead of `instanceof Array`.';
+const MESSAGE_ID = 'no-array-instanceof';
+const messages = {
+	[MESSAGE_ID]: 'Use `Array.isArray()` instead of `instanceof Array`.'
+};
 const selector = [
 	'BinaryExpression',
 	'[operator="instanceof"]',
@@ -15,7 +18,7 @@ const create = context => {
 	return {
 		[selector]: node => context.report({
 			node,
-			message,
+			messageId: MESSAGE_ID,
 			fix: fixer => fixer.replaceText(
 				node,
 				`Array.isArray(${sourceCode.getText(node.left)})`
@@ -31,6 +34,7 @@ module.exports = {
 		docs: {
 			url: getDocumentationUrl(__filename)
 		},
-		fixable: 'code'
+		fixable: 'code',
+		messages
 	}
 };