Skip to content

Commit df01af1

Browse files
authored
Update: padded-blocks loc position changes (refs #12334) (#13328)
1 parent bd3f092 commit df01af1

2 files changed

Lines changed: 230 additions & 69 deletions

File tree

lib/rules/padded-blocks.js

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,14 @@ module.exports = {
203203
}
204204

205205
if (requirePaddingFor(node)) {
206+
206207
if (!blockHasTopPadding) {
207208
context.report({
208209
node,
209-
loc: { line: tokenBeforeFirst.loc.start.line, column: tokenBeforeFirst.loc.start.column },
210+
loc: {
211+
start: tokenBeforeFirst.loc.start,
212+
end: firstBlockToken.loc.start
213+
},
210214
fix(fixer) {
211215
return fixer.insertTextAfter(tokenBeforeFirst, "\n");
212216
},
@@ -216,7 +220,10 @@ module.exports = {
216220
if (!blockHasBottomPadding) {
217221
context.report({
218222
node,
219-
loc: { line: tokenAfterLast.loc.end.line, column: tokenAfterLast.loc.end.column - 1 },
223+
loc: {
224+
end: tokenAfterLast.loc.start,
225+
start: lastBlockToken.loc.end
226+
},
220227
fix(fixer) {
221228
return fixer.insertTextBefore(tokenAfterLast, "\n");
222229
},
@@ -228,7 +235,10 @@ module.exports = {
228235

229236
context.report({
230237
node,
231-
loc: { line: tokenBeforeFirst.loc.start.line, column: tokenBeforeFirst.loc.start.column },
238+
loc: {
239+
start: tokenBeforeFirst.loc.start,
240+
end: firstBlockToken.loc.start
241+
},
232242
fix(fixer) {
233243
return fixer.replaceTextRange([tokenBeforeFirst.range[1], firstBlockToken.range[0] - firstBlockToken.loc.start.column], "\n");
234244
},
@@ -240,7 +250,10 @@ module.exports = {
240250

241251
context.report({
242252
node,
243-
loc: { line: tokenAfterLast.loc.end.line, column: tokenAfterLast.loc.end.column - 1 },
253+
loc: {
254+
end: tokenAfterLast.loc.start,
255+
start: lastBlockToken.loc.end
256+
},
244257
messageId: "neverPadBlock",
245258
fix(fixer) {
246259
return fixer.replaceTextRange([lastBlockToken.range[1], tokenAfterLast.range[0] - tokenAfterLast.loc.start.column], "\n");

0 commit comments

Comments
 (0)