mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-26 07:20:39 +00:00
Sebastian Poxhofer
58771bb183
* refactor(oxlint): enable func-style Enable the built-in func-style rule as ["warn", "declaration"] so that named functions are written as function declarations instead of arrow or function expressions assigned to variables, matching the convention in docs/development/best-practices.md (Functions section). Inline arrow callbacks are unaffected; prefer-arrow-callback continues to cover the callback direction. Severity is "warn" instead of "error" as a fallback: a repo-wide run found 196 pre-existing violations (70 in spec files, 126 in production code), exceeding the 80-violation fix threshold for this change, so no violations were fixed here. Follow-up work can convert the offenders (largest clusters: lib/modules/versioning/ruby, lib/util/cache/package, lib/modules/versioning/maven, lib/modules/versioning/gradle) and then raise the rule to "error". Note oxlint 1.72 also supports an allowTypeAnnotation option if typed consts should remain arrows. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * ci(linter): enforce func-style at error * refactor(func-style): convert const-arrow functions to declarations in with-cache spec and ruby versioning * refactor(func-style): convert const-arrow functions to declarations in maven/gradle modules * refactor(func-style): convert const-arrow functions to declarations in remaining versioning modules * refactor(func-style): convert const-arrow functions to declarations in platform modules Discriminated-union closures (ensureCommentRemoval byTopic/byContent helpers in github, gitlab, bitbucket, bitbucket-server) needed the narrowed field passed explicitly as a parameter, since function declarations are hoisted and lose the outer if-narrowing that inline arrow-function closures previously relied on. * refactor(func-style): convert const-arrow functions to declarations across util/manager/datasource modules One case (logger/renovate-logger.ts logOnceFn) is kept as an arrow function with a documented oxlint-disable: it is stored on this.logger.once[level] and relies on lexically-bound this, which a hoisted function declaration would not preserve. * refactor(func-style): convert remaining const-arrow test helpers to declarations get-updated.spec.ts: hoisted expectPipCompilePackageAndLockFile to module scope (it only closes over the module-level pipCompile mock) and added a documented oxlint-disable for vitest/expect-expect on its caller test, since oxlint's expect-expect check does not trace assertions through an externally-defined helper function. --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
87 lines
2.5 KiB
TypeScript
87 lines
2.5 KiB
TypeScript
import type { parser } from '@renovatebot/good-enough-parser';
|
|
import { query as q } from '@renovatebot/good-enough-parser';
|
|
import type { Ctx } from '../types.ts';
|
|
import { qKotlinMultiMapOfVarAssignment } from './assignments.ts';
|
|
import {
|
|
cleanupTempVars,
|
|
coalesceVariable,
|
|
increaseNestingDepth,
|
|
prependNestingDepth,
|
|
qValueMatcher,
|
|
qVariableAssignmentIdentifier,
|
|
reduceNestingDepth,
|
|
storeInTokenMap,
|
|
storeVarToken,
|
|
} from './common.ts';
|
|
import { qDependencyStrings } from './dependencies.ts';
|
|
import { handleAssignment } from './handlers.ts';
|
|
|
|
const qKotlinListOfAssignment = q.sym<Ctx>('listOf').tree({
|
|
type: 'wrapped-tree',
|
|
startsWith: '(',
|
|
endsWith: ')',
|
|
search: qDependencyStrings,
|
|
});
|
|
|
|
// const val VARIABLE = "value"
|
|
const qKotlinConstValAssignment = q
|
|
.sym<Ctx>('const')
|
|
.sym('val')
|
|
.sym(storeVarToken)
|
|
.handler(prependNestingDepth)
|
|
.handler(coalesceVariable)
|
|
.handler((ctx) => storeInTokenMap(ctx, 'keyToken'))
|
|
.op('=')
|
|
.join(qValueMatcher)
|
|
.handler((ctx) => storeInTokenMap(ctx, 'valToken'))
|
|
.handler(handleAssignment)
|
|
.handler(cleanupTempVars);
|
|
|
|
const qKotlinSingleObjectVarAssignment = q.alt(
|
|
// const val RETROFIT = "2.9.0"
|
|
qKotlinConstValAssignment,
|
|
// val dep = mapOf("qux" to "foo:bar:\${Versions.baz}")
|
|
qKotlinMultiMapOfVarAssignment,
|
|
qVariableAssignmentIdentifier
|
|
.opt(q.op<Ctx>(':').sym('String'))
|
|
.op('=')
|
|
.handler(prependNestingDepth)
|
|
.handler(coalesceVariable)
|
|
.handler((ctx) => storeInTokenMap(ctx, 'keyToken'))
|
|
.alt(
|
|
// val deps = listOf("androidx.appcompat:appcompat:$baz", listOf("androidx.webkit:webkit:${Versions.baz}"))
|
|
qKotlinListOfAssignment,
|
|
// val dep: String = "foo:bar:" + Versions.baz
|
|
qValueMatcher
|
|
.handler((ctx) => storeInTokenMap(ctx, 'valToken'))
|
|
.handler(handleAssignment),
|
|
)
|
|
.handler(cleanupTempVars),
|
|
);
|
|
|
|
// object foo { ... }
|
|
function qKotlinMultiObjectExpr(
|
|
search: q.QueryBuilder<Ctx, parser.Node>,
|
|
): q.QueryBuilder<Ctx, parser.Node> {
|
|
return q.alt(
|
|
q.sym<Ctx>('object').sym(storeVarToken).tree({
|
|
type: 'wrapped-tree',
|
|
maxDepth: 1,
|
|
startsWith: '{',
|
|
endsWith: '}',
|
|
preHandler: increaseNestingDepth,
|
|
search,
|
|
postHandler: reduceNestingDepth,
|
|
}),
|
|
qKotlinSingleObjectVarAssignment,
|
|
);
|
|
}
|
|
|
|
export const qKotlinMultiObjectVarAssignment = qKotlinMultiObjectExpr(
|
|
qKotlinMultiObjectExpr(
|
|
qKotlinMultiObjectExpr(
|
|
qKotlinMultiObjectExpr(qKotlinSingleObjectVarAssignment),
|
|
),
|
|
),
|
|
).handler(cleanupTempVars);
|