Skip to content

Commit 1df2cea

Browse files
committed
Update tests
1 parent 90badae commit 1df2cea

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

scripts/eslint/rules/argument-trivia.cjs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ module.exports = createRule({
2828
recommended: "error",
2929
},
3030
messages: {
31-
parameterTriviaArgumentError: `Tag argument with parameter name`,
32-
parameterTriviaArgumentSpaceError: `There should be 1 space between an argument and its comment`,
33-
parameterTriviaArgumentNameError: `Argument name "{{ got }}" does not match expected name "{{ want }}"`,
31+
argumentTriviaArgumentError: `Tag argument with parameter name`,
32+
argumentTriviaArgumentSpaceError: `There should be 1 space between an argument and its comment`,
33+
argumentTriviaArgumentNameError: `Argument name "{{ got }}" does not match expected name "{{ want }}"`,
3434
},
3535
schema: [],
3636
type: "problem",
@@ -111,15 +111,15 @@ module.exports = createRule({
111111
const expectedName = getExpectedName();
112112
if (expectedName) {
113113
context.report({
114-
messageId: "parameterTriviaArgumentError",
114+
messageId: "argumentTriviaArgumentError",
115115
node,
116116
fix: (fixer) => {
117117
return fixer.insertTextBefore(node, `/*${expectedName}*/ `);
118118
}
119119
});
120120
}
121121
else {
122-
context.report({ messageId: "parameterTriviaArgumentError", node });
122+
context.report({ messageId: "argumentTriviaArgumentError", node });
123123
}
124124
return;
125125
}
@@ -136,7 +136,7 @@ module.exports = createRule({
136136

137137
if (got !== expectedName) {
138138
context.report({
139-
messageId: "parameterTriviaArgumentNameError",
139+
messageId: "argumentTriviaArgumentNameError",
140140
data: { got, want: expectedName },
141141
node: comment,
142142
fix: (fixer) => {
@@ -151,7 +151,7 @@ module.exports = createRule({
151151
if (argRangeStart !== commentRangeEnd + 1 && !hasNewLine) {
152152
// TODO(jakebailey): range should be whitespace
153153
context.report({
154-
messageId: "parameterTriviaArgumentSpaceError",
154+
messageId: "argumentTriviaArgumentSpaceError",
155155
node,
156156
fix: (fixer) => {
157157
return fixer.replaceTextRange([commentRangeEnd, argRangeStart], " ");
@@ -161,7 +161,7 @@ module.exports = createRule({
161161
};
162162

163163
/** @type {(node: TSESTree.CallExpression | TSESTree.NewExpression) => void} */
164-
const checkparameterTrivia = (node) => {
164+
const checkargumentTrivia = (node) => {
165165
if (shouldIgnoreCalledExpression(node)) {
166166
return;
167167
}
@@ -183,8 +183,8 @@ module.exports = createRule({
183183
};
184184

185185
return {
186-
CallExpression: checkparameterTrivia,
187-
NewExpression: checkparameterTrivia,
186+
CallExpression: checkargumentTrivia,
187+
NewExpression: checkargumentTrivia,
188188
};
189189
},
190190
});

scripts/eslint/tests/argument-trivia.test.cjs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ const fn = (prop: boolean) => {};
4848
fn.apply(null, true);
4949
`,
5050
},
51+
{
52+
code: `
53+
const fn = (prop: boolean) => {};
54+
fn(/* first comment */ /* second comment */ false);
55+
`,
56+
},
5157
],
5258

5359
invalid: [
@@ -56,28 +62,25 @@ fn.apply(null, true);
5662
const fn = (prop: null) => {};
5763
fn(null);
5864
`,
59-
errors: [{ messageId: "parameterTriviaArgumentError" }],
65+
errors: [{ messageId: "argumentTriviaArgumentError" }],
6066
},
6167
{
6268
code: `
6369
const fn = (prop: boolean) => {};
6470
fn(false);
6571
`,
66-
errors: [{ messageId: "parameterTriviaArgumentError" }],
72+
errors: [{ messageId: "argumentTriviaArgumentError" }],
6773
},
6874
{
6975
code: `
7076
const fn = (prop: boolean) => {};
7177
fn(/* boolean arg */false);
7278
`,
73-
errors: [{ messageId: "parameterTriviaArgumentSpaceError" }],
74-
},
75-
{
76-
code: `
79+
errors: [{ messageId: "argumentTriviaArgumentSpaceError" }],
80+
output:`
7781
const fn = (prop: boolean) => {};
78-
fn(/* first comment */ /* second comment */ false);
79-
`,
80-
errors: [{ messageId: "parameterTriviaArgumentError" }],
82+
fn(/* boolean arg */ false);
83+
`
8184
},
8285
],
8386
});

0 commit comments

Comments
 (0)