Skip to content

Commit 1050ee7

Browse files
mdjermanovicmdjermanovic
authored
Update: Improve report location for no-unneeded-ternary (refs #12334) (#13456)
1 parent b77b420 commit 1050ee7

File tree

2 files changed

+87
-31
lines changed

2 files changed

+87
-31
lines changed

‎lib/rules/no-unneeded-ternary.js

-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ module.exports = {
122122
if (isBooleanLiteral(node.alternate) && isBooleanLiteral(node.consequent)) {
123123
context.report({
124124
node,
125-
loc: node.consequent.loc.start,
126125
messageId: "unnecessaryConditionalExpression",
127126
fix(fixer) {
128127
if (node.consequent.value === node.alternate.value) {
@@ -144,7 +143,6 @@ module.exports = {
144143
} else if (!defaultAssignment && matchesDefaultAssignment(node)) {
145144
context.report({
146145
node,
147-
loc: node.consequent.loc.start,
148146
messageId: "unnecessaryConditionalAssignment",
149147
fix: fixer => {
150148
const shouldParenthesizeAlternate =

‎tests/lib/rules/no-unneeded-ternary.js

+87-29
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
5454
messageId: "unnecessaryConditionalExpression",
5555
type: "ConditionalExpression",
5656
line: 1,
57-
column: 19
57+
column: 9,
58+
endLine: 1,
59+
endColumn: 31
5860
}]
5961
},
6062
{
@@ -64,7 +66,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
6466
messageId: "unnecessaryConditionalExpression",
6567
type: "ConditionalExpression",
6668
line: 1,
67-
column: 18
69+
column: 9,
70+
endLine: 1,
71+
endColumn: 30
6872
}]
6973
},
7074
{
@@ -74,7 +78,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
7478
messageId: "unnecessaryConditionalExpression",
7579
type: "ConditionalExpression",
7680
line: 1,
77-
column: 13
81+
column: 9,
82+
endLine: 1,
83+
endColumn: 25
7884
}]
7985
},
8086
{
@@ -84,7 +90,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
8490
messageId: "unnecessaryConditionalExpression",
8591
type: "ConditionalExpression",
8692
line: 1,
87-
column: 19
93+
column: 9,
94+
endLine: 1,
95+
endColumn: 31
8896
}]
8997
},
9098
{
@@ -94,7 +102,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
94102
messageId: "unnecessaryConditionalExpression",
95103
type: "ConditionalExpression",
96104
line: 1,
97-
column: 18
105+
column: 9,
106+
endLine: 1,
107+
endColumn: 30
98108
}]
99109
},
100110
{
@@ -104,7 +114,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
104114
messageId: "unnecessaryConditionalExpression",
105115
type: "ConditionalExpression",
106116
line: 1,
107-
column: 17
117+
column: 9,
118+
endLine: 1,
119+
endColumn: 29
108120
}]
109121
},
110122
{
@@ -114,7 +126,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
114126
messageId: "unnecessaryConditionalExpression",
115127
type: "ConditionalExpression",
116128
line: 1,
117-
column: 18
129+
column: 9,
130+
endLine: 1,
131+
endColumn: 30
118132
}]
119133
},
120134
{
@@ -124,7 +138,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
124138
messageId: "unnecessaryConditionalExpression",
125139
type: "ConditionalExpression",
126140
line: 1,
127-
column: 21
141+
column: 9,
142+
endLine: 1,
143+
endColumn: 33
128144
}]
129145
},
130146
{
@@ -134,7 +150,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
134150
messageId: "unnecessaryConditionalExpression",
135151
type: "ConditionalExpression",
136152
line: 1,
137-
column: 28
153+
column: 9,
154+
endLine: 1,
155+
endColumn: 40
138156
}]
139157
},
140158
{
@@ -144,7 +162,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
144162
messageId: "unnecessaryConditionalExpression",
145163
type: "ConditionalExpression",
146164
line: 1,
147-
column: 15
165+
column: 9,
166+
endLine: 1,
167+
endColumn: 28
148168
}]
149169
},
150170
{
@@ -154,7 +174,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
154174
messageId: "unnecessaryConditionalExpression",
155175
type: "ConditionalExpression",
156176
line: 1,
157-
column: 17
177+
column: 9,
178+
endLine: 1,
179+
endColumn: 30
158180
}]
159181
},
160182
{
@@ -164,7 +186,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
164186
messageId: "unnecessaryConditionalExpression",
165187
type: "ConditionalExpression",
166188
line: 1,
167-
column: 28
189+
column: 9,
190+
endLine: 1,
191+
endColumn: 40
168192
}]
169193
},
170194
{
@@ -174,7 +198,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
174198
messageId: "unnecessaryConditionalExpression",
175199
type: "ConditionalExpression",
176200
line: 1,
177-
column: 16
201+
column: 9,
202+
endLine: 1,
203+
endColumn: 28
178204
}]
179205
},
180206
{
@@ -193,7 +219,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
193219
messageId: "unnecessaryConditionalAssignment",
194220
type: "ConditionalExpression",
195221
line: 4,
196-
column: 38
222+
column: 30,
223+
endLine: 4,
224+
endColumn: 78
197225
}]
198226
},
199227
{
@@ -204,7 +232,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
204232
messageId: "unnecessaryConditionalAssignment",
205233
type: "ConditionalExpression",
206234
line: 1,
207-
column: 7
235+
column: 1,
236+
endLine: 1,
237+
endColumn: 30
208238
}]
209239
},
210240
{
@@ -216,7 +246,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
216246
messageId: "unnecessaryConditionalAssignment",
217247
type: "ConditionalExpression",
218248
line: 1,
219-
column: 24
249+
column: 18,
250+
endLine: 1,
251+
endColumn: 39
220252
}]
221253
},
222254
{
@@ -227,7 +259,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
227259
messageId: "unnecessaryConditionalAssignment",
228260
type: "ConditionalExpression",
229261
line: 1,
230-
column: 15
262+
column: 9,
263+
endLine: 1,
264+
endColumn: 25
231265
}]
232266
},
233267
{
@@ -238,7 +272,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
238272
messageId: "unnecessaryConditionalAssignment",
239273
type: "ConditionalExpression",
240274
line: 1,
241-
column: 24
275+
column: 9,
276+
endLine: 1,
277+
endColumn: 66
242278
}]
243279
},
244280
{
@@ -250,7 +286,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
250286
messageId: "unnecessaryConditionalAssignment",
251287
type: "ConditionalExpression",
252288
line: 1,
253-
column: 13
289+
column: 9,
290+
endLine: 1,
291+
endColumn: 23
254292
}]
255293
},
256294
{
@@ -262,7 +300,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
262300
messageId: "unnecessaryConditionalAssignment",
263301
type: "ConditionalExpression",
264302
line: 1,
265-
column: 13
303+
column: 9,
304+
endLine: 1,
305+
endColumn: 22
266306
}]
267307
},
268308
{
@@ -274,7 +314,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
274314
messageId: "unnecessaryConditionalAssignment",
275315
type: "ConditionalExpression",
276316
line: 1,
277-
column: 13
317+
column: 9,
318+
endLine: 1,
319+
endColumn: 25
278320
}]
279321
},
280322
{
@@ -286,7 +328,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
286328
messageId: "unnecessaryConditionalAssignment",
287329
type: "ConditionalExpression",
288330
line: 1,
289-
column: 13
331+
column: 9,
332+
endLine: 1,
333+
endColumn: 24
290334
}]
291335
},
292336
{
@@ -298,7 +342,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
298342
messageId: "unnecessaryConditionalAssignment",
299343
type: "ConditionalExpression",
300344
line: 1,
301-
column: 13
345+
column: 9,
346+
endLine: 1,
347+
endColumn: 27
302348
}]
303349
},
304350
{
@@ -310,7 +356,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
310356
messageId: "unnecessaryConditionalAssignment",
311357
type: "ConditionalExpression",
312358
line: 1,
313-
column: 13
359+
column: 9,
360+
endLine: 1,
361+
endColumn: 18
314362
}]
315363
},
316364
{
@@ -322,7 +370,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
322370
messageId: "unnecessaryConditionalAssignment",
323371
type: "ConditionalExpression",
324372
line: 1,
325-
column: 13
373+
column: 9,
374+
endLine: 1,
375+
endColumn: 23
326376
}]
327377
},
328378
{
@@ -333,7 +383,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
333383
messageId: "unnecessaryConditionalAssignment",
334384
type: "ConditionalExpression",
335385
line: 1,
336-
column: 7
386+
column: 3,
387+
endLine: 1,
388+
endColumn: 12
337389
}]
338390
},
339391
{
@@ -344,7 +396,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
344396
messageId: "unnecessaryConditionalAssignment",
345397
type: "ConditionalExpression",
346398
line: 1,
347-
column: 5
399+
column: 1,
400+
endLine: 1,
401+
endColumn: 10
348402
}]
349403
},
350404
{
@@ -355,7 +409,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
355409
messageId: "unnecessaryConditionalAssignment",
356410
type: "ConditionalExpression",
357411
line: 1,
358-
column: 15
412+
column: 9,
413+
endLine: 1,
414+
endColumn: 24
359415
}]
360416
},
361417
{
@@ -367,7 +423,9 @@ ruleTester.run("no-unneeded-ternary", rule, {
367423
messageId: "unnecessaryConditionalAssignment",
368424
type: "ConditionalExpression",
369425
line: 1,
370-
column: 15
426+
column: 9,
427+
endLine: 1,
428+
endColumn: 27
371429
}]
372430
}
373431
]

0 commit comments

Comments
 (0)