eslint 9.22.0 → 9.23.0

package/lib/rules/line-comment-position.js

@@ -13,131 +13,145 @@ const astUtils = require("./utils/ast-utils");
 
 /** @type {import('../shared/types').Rule} */
 module.exports = {
-    meta: {
-        deprecated: {
-            message: "Formatting rules are being moved out of ESLint core.",
-            url: "https://eslint.org/blog/2023/10/deprecating-formatting-rules/",
-            deprecatedSince: "9.3.0",
-            availableUntil: "10.0.0",
-            replacedBy: [
-                {
-                    message: "ESLint Stylistic now maintains deprecated stylistic core rules.",
-                    url: "https://eslint.style/guide/migration",
-                    plugin: {
-                        name: "@stylistic/eslint-plugin-js",
-                        url: "https://eslint.style/packages/js"
-                    },
-                    rule: {
-                        name: "line-comment-position",
-                        url: "https://eslint.style/rules/js/line-comment-position"
-                    }
-                }
-            ]
-        },
-        type: "layout",
-
-        docs: {
-            description: "Enforce position of line comments",
-            recommended: false,
-            url: "https://eslint.org/docs/latest/rules/line-comment-position"
-        },
-
-        schema: [
-            {
-                oneOf: [
-                    {
-                        enum: ["above", "beside"]
-                    },
-                    {
-                        type: "object",
-                        properties: {
-                            position: {
-                                enum: ["above", "beside"]
-                            },
-                            ignorePattern: {
-                                type: "string"
-                            },
-                            applyDefaultPatterns: {
-                                type: "boolean"
-                            },
-                            applyDefaultIgnorePatterns: {
-                                type: "boolean"
-                            }
-                        },
-                        additionalProperties: false
-                    }
-                ]
-            }
-        ],
-        messages: {
-            above: "Expected comment to be above code.",
-            beside: "Expected comment to be beside code."
-        }
-    },
-
-    create(context) {
-        const options = context.options[0];
-
-        let above,
-            ignorePattern,
-            applyDefaultIgnorePatterns = true;
-
-        if (!options || typeof options === "string") {
-            above = !options || options === "above";
-
-        } else {
-            above = !options.position || options.position === "above";
-            ignorePattern = options.ignorePattern;
-
-            if (Object.hasOwn(options, "applyDefaultIgnorePatterns")) {
-                applyDefaultIgnorePatterns = options.applyDefaultIgnorePatterns;
-            } else {
-                applyDefaultIgnorePatterns = options.applyDefaultPatterns !== false;
-            }
-        }
-
-        const defaultIgnoreRegExp = astUtils.COMMENTS_IGNORE_PATTERN;
-        const fallThroughRegExp = /^\s*falls?\s?through/u;
-        const customIgnoreRegExp = new RegExp(ignorePattern, "u");
-        const sourceCode = context.sourceCode;
-
-        //--------------------------------------------------------------------------
-        // Public
-        //--------------------------------------------------------------------------
-
-        return {
-            Program() {
-                const comments = sourceCode.getAllComments();
-
-                comments.filter(token => token.type === "Line").forEach(node => {
-                    if (applyDefaultIgnorePatterns && (defaultIgnoreRegExp.test(node.value) || fallThroughRegExp.test(node.value))) {
-                        return;
-                    }
-
-                    if (ignorePattern && customIgnoreRegExp.test(node.value)) {
-                        return;
-                    }
-
-                    const previous = sourceCode.getTokenBefore(node, { includeComments: true });
-                    const isOnSameLine = previous && previous.loc.end.line === node.loc.start.line;
-
-                    if (above) {
-                        if (isOnSameLine) {
-                            context.report({
-                                node,
-                                messageId: "above"
-                            });
-                        }
-                    } else {
-                        if (!isOnSameLine) {
-                            context.report({
-                                node,
-                                messageId: "beside"
-                            });
-                        }
-                    }
-                });
-            }
-        };
-    }
+	meta: {
+		deprecated: {
+			message: "Formatting rules are being moved out of ESLint core.",
+			url: "https://eslint.org/blog/2023/10/deprecating-formatting-rules/",
+			deprecatedSince: "9.3.0",
+			availableUntil: "10.0.0",
+			replacedBy: [
+				{
+					message:
+						"ESLint Stylistic now maintains deprecated stylistic core rules.",
+					url: "https://eslint.style/guide/migration",
+					plugin: {
+						name: "@stylistic/eslint-plugin-js",
+						url: "https://eslint.style/packages/js",
+					},
+					rule: {
+						name: "line-comment-position",
+						url: "https://eslint.style/rules/js/line-comment-position",
+					},
+				},
+			],
+		},
+		type: "layout",
+
+		docs: {
+			description: "Enforce position of line comments",
+			recommended: false,
+			url: "https://eslint.org/docs/latest/rules/line-comment-position",
+		},
+
+		schema: [
+			{
+				oneOf: [
+					{
+						enum: ["above", "beside"],
+					},
+					{
+						type: "object",
+						properties: {
+							position: {
+								enum: ["above", "beside"],
+							},
+							ignorePattern: {
+								type: "string",
+							},
+							applyDefaultPatterns: {
+								type: "boolean",
+							},
+							applyDefaultIgnorePatterns: {
+								type: "boolean",
+							},
+						},
+						additionalProperties: false,
+					},
+				],
+			},
+		],
+		messages: {
+			above: "Expected comment to be above code.",
+			beside: "Expected comment to be beside code.",
+		},
+	},
+
+	create(context) {
+		const options = context.options[0];
+
+		let above,
+			ignorePattern,
+			applyDefaultIgnorePatterns = true;
+
+		if (!options || typeof options === "string") {
+			above = !options || options === "above";
+		} else {
+			above = !options.position || options.position === "above";
+			ignorePattern = options.ignorePattern;
+
+			if (Object.hasOwn(options, "applyDefaultIgnorePatterns")) {
+				applyDefaultIgnorePatterns = options.applyDefaultIgnorePatterns;
+			} else {
+				applyDefaultIgnorePatterns =
+					options.applyDefaultPatterns !== false;
+			}
+		}
+
+		const defaultIgnoreRegExp = astUtils.COMMENTS_IGNORE_PATTERN;
+		const fallThroughRegExp = /^\s*falls?\s?through/u;
+		const customIgnoreRegExp = new RegExp(ignorePattern, "u");
+		const sourceCode = context.sourceCode;
+
+		//--------------------------------------------------------------------------
+		// Public
+		//--------------------------------------------------------------------------
+
+		return {
+			Program() {
+				const comments = sourceCode.getAllComments();
+
+				comments
+					.filter(token => token.type === "Line")
+					.forEach(node => {
+						if (
+							applyDefaultIgnorePatterns &&
+							(defaultIgnoreRegExp.test(node.value) ||
+								fallThroughRegExp.test(node.value))
+						) {
+							return;
+						}
+
+						if (
+							ignorePattern &&
+							customIgnoreRegExp.test(node.value)
+						) {
+							return;
+						}
+
+						const previous = sourceCode.getTokenBefore(node, {
+							includeComments: true,
+						});
+						const isOnSameLine =
+							previous &&
+							previous.loc.end.line === node.loc.start.line;
+
+						if (above) {
+							if (isOnSameLine) {
+								context.report({
+									node,
+									messageId: "above",
+								});
+							}
+						} else {
+							if (!isOnSameLine) {
+								context.report({
+									node,
+									messageId: "beside",
+								});
+							}
+						}
+					});
+			},
+		};
+	},
 };

package/lib/rules/linebreak-style.js

@@ -18,109 +18,110 @@ const astUtils = require("./utils/ast-utils");
 
 /** @type {import('../shared/types').Rule} */
 module.exports = {
-    meta: {
-        deprecated: {
-            message: "Formatting rules are being moved out of ESLint core.",
-            url: "https://eslint.org/blog/2023/10/deprecating-formatting-rules/",
-            deprecatedSince: "8.53.0",
-            availableUntil: "10.0.0",
-            replacedBy: [
-                {
-                    message: "ESLint Stylistic now maintains deprecated stylistic core rules.",
-                    url: "https://eslint.style/guide/migration",
-                    plugin: {
-                        name: "@stylistic/eslint-plugin-js",
-                        url: "https://eslint.style/packages/js"
-                    },
-                    rule: {
-                        name: "linebreak-style",
-                        url: "https://eslint.style/rules/js/linebreak-style"
-                    }
-                }
-            ]
-        },
-        type: "layout",
-
-        docs: {
-            description: "Enforce consistent linebreak style",
-            recommended: false,
-            url: "https://eslint.org/docs/latest/rules/linebreak-style"
-        },
-
-        fixable: "whitespace",
-
-        schema: [
-            {
-                enum: ["unix", "windows"]
-            }
-        ],
-        messages: {
-            expectedLF: "Expected linebreaks to be 'LF' but found 'CRLF'.",
-            expectedCRLF: "Expected linebreaks to be 'CRLF' but found 'LF'."
-        }
-    },
-
-    create(context) {
-        const sourceCode = context.sourceCode;
-
-        //--------------------------------------------------------------------------
-        // Helpers
-        //--------------------------------------------------------------------------
-
-        /**
-         * Builds a fix function that replaces text at the specified range in the source text.
-         * @param {int[]} range The range to replace
-         * @param {string} text The text to insert.
-         * @returns {Function} Fixer function
-         * @private
-         */
-        function createFix(range, text) {
-            return function(fixer) {
-                return fixer.replaceTextRange(range, text);
-            };
-        }
-
-        //--------------------------------------------------------------------------
-        // Public
-        //--------------------------------------------------------------------------
-
-        return {
-            Program: function checkForLinebreakStyle(node) {
-                const linebreakStyle = context.options[0] || "unix",
-                    expectedLF = linebreakStyle === "unix",
-                    expectedLFChars = expectedLF ? "\n" : "\r\n",
-                    source = sourceCode.getText(),
-                    pattern = astUtils.createGlobalLinebreakMatcher();
-                let match;
-
-                let i = 0;
-
-                while ((match = pattern.exec(source)) !== null) {
-                    i++;
-                    if (match[0] === expectedLFChars) {
-                        continue;
-                    }
-
-                    const index = match.index;
-                    const range = [index, index + match[0].length];
-
-                    context.report({
-                        node,
-                        loc: {
-                            start: {
-                                line: i,
-                                column: sourceCode.lines[i - 1].length
-                            },
-                            end: {
-                                line: i + 1,
-                                column: 0
-                            }
-                        },
-                        messageId: expectedLF ? "expectedLF" : "expectedCRLF",
-                        fix: createFix(range, expectedLFChars)
-                    });
-                }
-            }
-        };
-    }
+	meta: {
+		deprecated: {
+			message: "Formatting rules are being moved out of ESLint core.",
+			url: "https://eslint.org/blog/2023/10/deprecating-formatting-rules/",
+			deprecatedSince: "8.53.0",
+			availableUntil: "10.0.0",
+			replacedBy: [
+				{
+					message:
+						"ESLint Stylistic now maintains deprecated stylistic core rules.",
+					url: "https://eslint.style/guide/migration",
+					plugin: {
+						name: "@stylistic/eslint-plugin-js",
+						url: "https://eslint.style/packages/js",
+					},
+					rule: {
+						name: "linebreak-style",
+						url: "https://eslint.style/rules/js/linebreak-style",
+					},
+				},
+			],
+		},
+		type: "layout",
+
+		docs: {
+			description: "Enforce consistent linebreak style",
+			recommended: false,
+			url: "https://eslint.org/docs/latest/rules/linebreak-style",
+		},
+
+		fixable: "whitespace",
+
+		schema: [
+			{
+				enum: ["unix", "windows"],
+			},
+		],
+		messages: {
+			expectedLF: "Expected linebreaks to be 'LF' but found 'CRLF'.",
+			expectedCRLF: "Expected linebreaks to be 'CRLF' but found 'LF'.",
+		},
+	},
+
+	create(context) {
+		const sourceCode = context.sourceCode;
+
+		//--------------------------------------------------------------------------
+		// Helpers
+		//--------------------------------------------------------------------------
+
+		/**
+		 * Builds a fix function that replaces text at the specified range in the source text.
+		 * @param {int[]} range The range to replace
+		 * @param {string} text The text to insert.
+		 * @returns {Function} Fixer function
+		 * @private
+		 */
+		function createFix(range, text) {
+			return function (fixer) {
+				return fixer.replaceTextRange(range, text);
+			};
+		}
+
+		//--------------------------------------------------------------------------
+		// Public
+		//--------------------------------------------------------------------------
+
+		return {
+			Program: function checkForLinebreakStyle(node) {
+				const linebreakStyle = context.options[0] || "unix",
+					expectedLF = linebreakStyle === "unix",
+					expectedLFChars = expectedLF ? "\n" : "\r\n",
+					source = sourceCode.getText(),
+					pattern = astUtils.createGlobalLinebreakMatcher();
+				let match;
+
+				let i = 0;
+
+				while ((match = pattern.exec(source)) !== null) {
+					i++;
+					if (match[0] === expectedLFChars) {
+						continue;
+					}
+
+					const index = match.index;
+					const range = [index, index + match[0].length];
+
+					context.report({
+						node,
+						loc: {
+							start: {
+								line: i,
+								column: sourceCode.lines[i - 1].length,
+							},
+							end: {
+								line: i + 1,
+								column: 0,
+							},
+						},
+						messageId: expectedLF ? "expectedLF" : "expectedCRLF",
+						fix: createFix(range, expectedLFChars),
+					});
+				}
+			},
+		};
+	},
 };