Skip to content

Commit b36ee0a

Browse files
committed
fix(eslint): change category param order
1 parent 1950a26 commit b36ee0a

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

packages/eslint/index.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ export async function convertRules(
6161
rules[rule] = convertRule(
6262
ruleModule,
6363
options,
64+
{ id: rule, ...context },
6465
severity === 'warn' || severity === 1
6566
? 0
6667
: severity === 'error' || severity === 2
6768
? 1
6869
: severity === 'suggestion' || severity === 3
6970
? 2
70-
: 3,
71-
{ id: rule, ...context }
71+
: 3
7272
);
7373
}
7474
return rules;
@@ -82,12 +82,12 @@ export async function convertRules(
8282
* `node node_modules/@tsslint/eslint/scripts/generateDts.js` to update them.
8383
*/
8484
export async function defineRules(
85-
rulesConfig: { [K in keyof ESLintRulesConfig]: boolean | ESLintRulesConfig[K] },
86-
category: ts.DiagnosticCategory = 3 satisfies ts.DiagnosticCategory.Message,
87-
context: Partial<ESLint.Rule.RuleContext> = {}
85+
config: { [K in keyof ESLintRulesConfig]: boolean | ESLintRulesConfig[K] },
86+
context: Partial<ESLint.Rule.RuleContext> = {},
87+
category: ts.DiagnosticCategory = 3 satisfies ts.DiagnosticCategory.Message
8888
) {
8989
const rules: TSSLint.Rules = {};
90-
for (const [rule, severityOrOptions] of Object.entries(rulesConfig)) {
90+
for (const [rule, severityOrOptions] of Object.entries(config)) {
9191
let severity: boolean;
9292
let options: any[];
9393
if (Array.isArray(severityOrOptions)) {
@@ -109,8 +109,8 @@ export async function defineRules(
109109
rules[rule] = convertRule(
110110
ruleModule,
111111
options,
112+
{ id: rule, ...context },
112113
category,
113-
{ id: rule, ...context }
114114
);
115115
}
116116
return rules;
@@ -165,8 +165,8 @@ async function loadRule(pluginName: string | undefined, ruleName: string): Promi
165165
export function convertRule(
166166
eslintRule: ESLint.Rule.RuleModule,
167167
options: any[] = [],
168-
category: ts.DiagnosticCategory = 3 satisfies ts.DiagnosticCategory.Message,
169-
context: Partial<ESLint.Rule.RuleContext> = {}
168+
context: Partial<ESLint.Rule.RuleContext> = {},
169+
category: ts.DiagnosticCategory = 3 satisfies ts.DiagnosticCategory.Message
170170
): TSSLint.Rule {
171171
// ESLint internal scripts
172172
let createEmitter;

0 commit comments

Comments
 (0)