mirror of
https://github.com/github/codeql-action.git
synced 2025-12-30 19:20:08 +08:00
* Bump the npm group with 12 updates Bumps the npm group with 12 updates: | Package | From | To | | --- | --- | --- | | [@octokit/types](https://github.com/octokit/types.ts) | `12.1.1` | `12.3.0` | | [@types/uuid](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/uuid) | `9.0.6` | `9.0.7` | | [@types/adm-zip](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/adm-zip) | `0.5.3` | `0.5.4` | | [@types/js-yaml](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/js-yaml) | `4.0.8` | `4.0.9` | | [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver) | `7.5.4` | `7.5.5` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `6.9.1` | `6.12.0` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `6.9.1` | `6.12.0` | | [eslint](https://github.com/eslint/eslint) | `8.52.0` | `8.54.0` | | [nock](https://github.com/nock/nock) | `13.3.7` | `13.3.8` | | [sinon](https://github.com/sinonjs/sinon) | `17.0.0` | `17.0.1` | | [@types/sinon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sinon) | `10.0.20` | `17.0.1` | | [typescript](https://github.com/Microsoft/TypeScript) | `5.2.2` | `5.3.2` | Updates `@octokit/types` from 12.1.1 to 12.3.0 - [Release notes](https://github.com/octokit/types.ts/releases) - [Commits](https://github.com/octokit/types.ts/compare/v12.1.1...v12.3.0) Updates `@types/uuid` from 9.0.6 to 9.0.7 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/uuid) Updates `@types/adm-zip` from 0.5.3 to 0.5.4 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/adm-zip) Updates `@types/js-yaml` from 4.0.8 to 4.0.9 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/js-yaml) Updates `@types/semver` from 7.5.4 to 7.5.5 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver) Updates `@typescript-eslint/eslint-plugin` from 6.9.1 to 6.12.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.12.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 6.9.1 to 6.12.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.12.0/packages/parser) Updates `eslint` from 8.52.0 to 8.54.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.52.0...v8.54.0) Updates `nock` from 13.3.7 to 13.3.8 - [Release notes](https://github.com/nock/nock/releases) - [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md) - [Commits](https://github.com/nock/nock/compare/v13.3.7...v13.3.8) Updates `sinon` from 17.0.0 to 17.0.1 - [Release notes](https://github.com/sinonjs/sinon/releases) - [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md) - [Commits](https://github.com/sinonjs/sinon/compare/v17.0.0...v17.0.1) Updates `@types/sinon` from 10.0.20 to 17.0.1 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sinon) Updates `typescript` from 5.2.2 to 5.3.2 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/commits) --- updated-dependencies: - dependency-name: "@octokit/types" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@types/uuid" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@types/adm-zip" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@types/js-yaml" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@types/semver" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: nock dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: sinon dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@types/sinon" dependency-type: direct:development update-type: version-update:semver-major dependency-group: npm - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm ... Signed-off-by: dependabot[bot] <support@github.com> * Update checked-in dependencies * Rebuild --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
311 lines
11 KiB
JavaScript
311 lines
11 KiB
JavaScript
/**
|
|
* @fileoverview A rule to ensure blank lines within blocks.
|
|
* @author Mathias Schreck <https://github.com/lo1tuma>
|
|
* @deprecated in ESLint v8.53.0
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Requirements
|
|
//------------------------------------------------------------------------------
|
|
|
|
const astUtils = require("./utils/ast-utils");
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Rule Definition
|
|
//------------------------------------------------------------------------------
|
|
|
|
/** @type {import('../shared/types').Rule} */
|
|
module.exports = {
|
|
meta: {
|
|
deprecated: true,
|
|
replacedBy: [],
|
|
type: "layout",
|
|
|
|
docs: {
|
|
description: "Require or disallow padding within blocks",
|
|
recommended: false,
|
|
url: "https://eslint.org/docs/latest/rules/padded-blocks"
|
|
},
|
|
|
|
fixable: "whitespace",
|
|
|
|
schema: [
|
|
{
|
|
oneOf: [
|
|
{
|
|
enum: ["always", "never"]
|
|
},
|
|
{
|
|
type: "object",
|
|
properties: {
|
|
blocks: {
|
|
enum: ["always", "never"]
|
|
},
|
|
switches: {
|
|
enum: ["always", "never"]
|
|
},
|
|
classes: {
|
|
enum: ["always", "never"]
|
|
}
|
|
},
|
|
additionalProperties: false,
|
|
minProperties: 1
|
|
}
|
|
]
|
|
},
|
|
{
|
|
type: "object",
|
|
properties: {
|
|
allowSingleLineBlocks: {
|
|
type: "boolean"
|
|
}
|
|
},
|
|
additionalProperties: false
|
|
}
|
|
],
|
|
|
|
messages: {
|
|
alwaysPadBlock: "Block must be padded by blank lines.",
|
|
neverPadBlock: "Block must not be padded by blank lines."
|
|
}
|
|
},
|
|
|
|
create(context) {
|
|
const options = {};
|
|
const typeOptions = context.options[0] || "always";
|
|
const exceptOptions = context.options[1] || {};
|
|
|
|
if (typeof typeOptions === "string") {
|
|
const shouldHavePadding = typeOptions === "always";
|
|
|
|
options.blocks = shouldHavePadding;
|
|
options.switches = shouldHavePadding;
|
|
options.classes = shouldHavePadding;
|
|
} else {
|
|
if (Object.prototype.hasOwnProperty.call(typeOptions, "blocks")) {
|
|
options.blocks = typeOptions.blocks === "always";
|
|
}
|
|
if (Object.prototype.hasOwnProperty.call(typeOptions, "switches")) {
|
|
options.switches = typeOptions.switches === "always";
|
|
}
|
|
if (Object.prototype.hasOwnProperty.call(typeOptions, "classes")) {
|
|
options.classes = typeOptions.classes === "always";
|
|
}
|
|
}
|
|
|
|
if (Object.prototype.hasOwnProperty.call(exceptOptions, "allowSingleLineBlocks")) {
|
|
options.allowSingleLineBlocks = exceptOptions.allowSingleLineBlocks === true;
|
|
}
|
|
|
|
const sourceCode = context.sourceCode;
|
|
|
|
/**
|
|
* Gets the open brace token from a given node.
|
|
* @param {ASTNode} node A BlockStatement or SwitchStatement node from which to get the open brace.
|
|
* @returns {Token} The token of the open brace.
|
|
*/
|
|
function getOpenBrace(node) {
|
|
if (node.type === "SwitchStatement") {
|
|
return sourceCode.getTokenBefore(node.cases[0]);
|
|
}
|
|
|
|
if (node.type === "StaticBlock") {
|
|
return sourceCode.getFirstToken(node, { skip: 1 }); // skip the `static` token
|
|
}
|
|
|
|
// `BlockStatement` or `ClassBody`
|
|
return sourceCode.getFirstToken(node);
|
|
}
|
|
|
|
/**
|
|
* Checks if the given parameter is a comment node
|
|
* @param {ASTNode|Token} node An AST node or token
|
|
* @returns {boolean} True if node is a comment
|
|
*/
|
|
function isComment(node) {
|
|
return node.type === "Line" || node.type === "Block";
|
|
}
|
|
|
|
/**
|
|
* Checks if there is padding between two tokens
|
|
* @param {Token} first The first token
|
|
* @param {Token} second The second token
|
|
* @returns {boolean} True if there is at least a line between the tokens
|
|
*/
|
|
function isPaddingBetweenTokens(first, second) {
|
|
return second.loc.start.line - first.loc.end.line >= 2;
|
|
}
|
|
|
|
|
|
/**
|
|
* Checks if the given token has a blank line after it.
|
|
* @param {Token} token The token to check.
|
|
* @returns {boolean} Whether or not the token is followed by a blank line.
|
|
*/
|
|
function getFirstBlockToken(token) {
|
|
let prev,
|
|
first = token;
|
|
|
|
do {
|
|
prev = first;
|
|
first = sourceCode.getTokenAfter(first, { includeComments: true });
|
|
} while (isComment(first) && first.loc.start.line === prev.loc.end.line);
|
|
|
|
return first;
|
|
}
|
|
|
|
/**
|
|
* Checks if the given token is preceded by a blank line.
|
|
* @param {Token} token The token to check
|
|
* @returns {boolean} Whether or not the token is preceded by a blank line
|
|
*/
|
|
function getLastBlockToken(token) {
|
|
let last = token,
|
|
next;
|
|
|
|
do {
|
|
next = last;
|
|
last = sourceCode.getTokenBefore(last, { includeComments: true });
|
|
} while (isComment(last) && last.loc.end.line === next.loc.start.line);
|
|
|
|
return last;
|
|
}
|
|
|
|
/**
|
|
* Checks if a node should be padded, according to the rule config.
|
|
* @param {ASTNode} node The AST node to check.
|
|
* @throws {Error} (Unreachable)
|
|
* @returns {boolean} True if the node should be padded, false otherwise.
|
|
*/
|
|
function requirePaddingFor(node) {
|
|
switch (node.type) {
|
|
case "BlockStatement":
|
|
case "StaticBlock":
|
|
return options.blocks;
|
|
case "SwitchStatement":
|
|
return options.switches;
|
|
case "ClassBody":
|
|
return options.classes;
|
|
|
|
/* c8 ignore next */
|
|
default:
|
|
throw new Error("unreachable");
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Checks the given BlockStatement node to be padded if the block is not empty.
|
|
* @param {ASTNode} node The AST node of a BlockStatement.
|
|
* @returns {void} undefined.
|
|
*/
|
|
function checkPadding(node) {
|
|
const openBrace = getOpenBrace(node),
|
|
firstBlockToken = getFirstBlockToken(openBrace),
|
|
tokenBeforeFirst = sourceCode.getTokenBefore(firstBlockToken, { includeComments: true }),
|
|
closeBrace = sourceCode.getLastToken(node),
|
|
lastBlockToken = getLastBlockToken(closeBrace),
|
|
tokenAfterLast = sourceCode.getTokenAfter(lastBlockToken, { includeComments: true }),
|
|
blockHasTopPadding = isPaddingBetweenTokens(tokenBeforeFirst, firstBlockToken),
|
|
blockHasBottomPadding = isPaddingBetweenTokens(lastBlockToken, tokenAfterLast);
|
|
|
|
if (options.allowSingleLineBlocks && astUtils.isTokenOnSameLine(tokenBeforeFirst, tokenAfterLast)) {
|
|
return;
|
|
}
|
|
|
|
if (requirePaddingFor(node)) {
|
|
|
|
if (!blockHasTopPadding) {
|
|
context.report({
|
|
node,
|
|
loc: {
|
|
start: tokenBeforeFirst.loc.start,
|
|
end: firstBlockToken.loc.start
|
|
},
|
|
fix(fixer) {
|
|
return fixer.insertTextAfter(tokenBeforeFirst, "\n");
|
|
},
|
|
messageId: "alwaysPadBlock"
|
|
});
|
|
}
|
|
if (!blockHasBottomPadding) {
|
|
context.report({
|
|
node,
|
|
loc: {
|
|
end: tokenAfterLast.loc.start,
|
|
start: lastBlockToken.loc.end
|
|
},
|
|
fix(fixer) {
|
|
return fixer.insertTextBefore(tokenAfterLast, "\n");
|
|
},
|
|
messageId: "alwaysPadBlock"
|
|
});
|
|
}
|
|
} else {
|
|
if (blockHasTopPadding) {
|
|
|
|
context.report({
|
|
node,
|
|
loc: {
|
|
start: tokenBeforeFirst.loc.start,
|
|
end: firstBlockToken.loc.start
|
|
},
|
|
fix(fixer) {
|
|
return fixer.replaceTextRange([tokenBeforeFirst.range[1], firstBlockToken.range[0] - firstBlockToken.loc.start.column], "\n");
|
|
},
|
|
messageId: "neverPadBlock"
|
|
});
|
|
}
|
|
|
|
if (blockHasBottomPadding) {
|
|
|
|
context.report({
|
|
node,
|
|
loc: {
|
|
end: tokenAfterLast.loc.start,
|
|
start: lastBlockToken.loc.end
|
|
},
|
|
messageId: "neverPadBlock",
|
|
fix(fixer) {
|
|
return fixer.replaceTextRange([lastBlockToken.range[1], tokenAfterLast.range[0] - tokenAfterLast.loc.start.column], "\n");
|
|
}
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
const rule = {};
|
|
|
|
if (Object.prototype.hasOwnProperty.call(options, "switches")) {
|
|
rule.SwitchStatement = function(node) {
|
|
if (node.cases.length === 0) {
|
|
return;
|
|
}
|
|
checkPadding(node);
|
|
};
|
|
}
|
|
|
|
if (Object.prototype.hasOwnProperty.call(options, "blocks")) {
|
|
rule.BlockStatement = function(node) {
|
|
if (node.body.length === 0) {
|
|
return;
|
|
}
|
|
checkPadding(node);
|
|
};
|
|
rule.StaticBlock = rule.BlockStatement;
|
|
}
|
|
|
|
if (Object.prototype.hasOwnProperty.call(options, "classes")) {
|
|
rule.ClassBody = function(node) {
|
|
if (node.body.length === 0) {
|
|
return;
|
|
}
|
|
checkPadding(node);
|
|
};
|
|
}
|
|
|
|
return rule;
|
|
}
|
|
};
|