@@ -222,6 +222,10 @@ func DefaultConfig() Configuration {
222222
223223// Result represents the result of one error.
224224type Result struct {
225+ ReportAt token.Pos
226+ FixRangeStart token.Pos
227+ FixRangeEnd token.Pos
228+
225229 Node ast.Node
226230 FixNode ast.Node
227231 Reason string
@@ -416,20 +420,20 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) {
416420 // it was and use *that* statement's position
417421 if p .config .ForceExclusiveShortDeclarations && cuddledWithLastStmt {
418422 if p .isShortDecl (stmt ) && ! p .isShortDecl (previousStatement ) {
419- p .addError (
420- stmt ,
421- nil ,
423+ p .addErrorRange (
424+ stmt .Pos (),
425+ stmt .End (),
426+ stmt .End (),
422427 reasonShortDeclNotExclusive ,
423428 WhitespaceShouldAddAfter ,
424- false ,
425429 )
426430 } else if p .isShortDecl (previousStatement ) && ! p .isShortDecl (stmt ) {
427- p .addError (
428- previousStatement ,
429- nil ,
431+ p .addErrorRange (
432+ previousStatement .Pos (),
433+ previousStatement .Pos (),
434+ previousStatement .Pos (),
430435 reasonShortDeclNotExclusive ,
431436 WhitespaceShouldAddBefore ,
432- false ,
433437 )
434438 }
435439 }
@@ -449,7 +453,7 @@ func (p *Processor) parseBlockStatements(statements []ast.Stmt) {
449453 // If the variable on the line above is allowed to be
450454 // cuddled, break two lines above so we keep the proper
451455 // cuddling.
452- p .addWhitespaceBeforeFixOtherNodeError (n1 , n2 , reason )
456+ p .addErrorRange (n1 . Pos () , n2 . Pos (), n2 . Pos (), reason , WhitespaceShouldAddBefore )
453457 } else {
454458 // If not, break here so we separate the cuddled variable.
455459 p .addWhitespaceBeforeError (n1 , reason )
@@ -1140,7 +1144,15 @@ func (p *Processor) findLeadingAndTrailingWhitespaces(ident *ast.Ident, stmt, ne
11401144 // And now if the first statement is passed the number of allowed lines,
11411145 // then we had extra WS, possibly before the first comment group.
11421146 if p .nodeStart (firstStatement ) > blockStartLine + allowedLinesBeforeFirstStatement {
1143- p .addError (stmt , nil , reasonBlockStartsWithWS , WhitespaceShouldRemoveBeginning , false )
1147+ // TODO: We need to pick a better start of the range so we don't delete
1148+ // potential comments.
1149+ p .addErrorRange (
1150+ blockStartPos ,
1151+ blockStartPos ,
1152+ firstStatement .Pos (),
1153+ reasonBlockStartsWithWS ,
1154+ WhitespaceShouldRemoveBeginning ,
1155+ )
11441156 }
11451157
11461158 // If the blockEndLine is not 0 we're a regular block (not case).
@@ -1163,7 +1175,13 @@ func (p *Processor) findLeadingAndTrailingWhitespaces(ident *ast.Ident, stmt, ne
11631175 }
11641176
11651177 if p .nodeEnd (lastStatement ) != blockEndLine - 1 && ! isExampleFunc (ident ) {
1166- p .addError (stmt , nil , reasonBlockEndsWithWS , WhitespaceShouldRemoveEnd , false )
1178+ p .addErrorRange (
1179+ stmt .End (),
1180+ lastStatement .End (),
1181+ stmt .End (),
1182+ reasonBlockEndsWithWS ,
1183+ WhitespaceShouldRemoveEnd ,
1184+ )
11671185 }
11681186
11691187 return
@@ -1278,32 +1296,20 @@ func isEmptyLabeledStmt(node ast.Node) bool {
12781296}
12791297
12801298func (p * Processor ) addWhitespaceBeforeError (node ast.Node , reason string ) {
1281- p .addError (node , nil , reason , WhitespaceShouldAddBefore , false )
1282- }
1283-
1284- func (p * Processor ) addWhitespaceBeforeFixOtherNodeError (reportNode , fixNode ast.Node , reason string ) {
1285- p .addError (reportNode , fixNode , reason , WhitespaceShouldAddBefore , false )
1299+ p .addErrorRange (node .Pos (), node .Pos (), node .Pos (), reason , WhitespaceShouldAddBefore )
12861300}
12871301
12881302func (p * Processor ) addWhitespaceAfterError (node ast.Node , reason string ) {
1289- p .addError (node , nil , reason , WhitespaceShouldAddAfter , false )
1303+ p .addErrorRange (node . Pos (), node . End (), node . End (), reason , WhitespaceShouldAddAfter )
12901304}
12911305
1292- // Add an error for the file and line number for the current token.Pos with the
1293- // given reason.
1294- //
1295- //nolint:unparam // We will potentially use this in the future.
1296- func (p * Processor ) addError (reportNode , fixNode ast.Node , reason string , errType ErrorType , noFix bool ) {
1297- if fixNode == nil {
1298- fixNode = reportNode
1299- }
1300-
1306+ func (p * Processor ) addErrorRange (reportAt , start , end token.Pos , reason string , errType ErrorType ) {
13011307 p .Result = append (p .Result , Result {
1302- Node : reportNode ,
1303- FixNode : fixNode ,
1304- Reason : reason ,
1305- NoFix : noFix ,
1306- Type : errType ,
1308+ ReportAt : reportAt ,
1309+ FixRangeStart : start ,
1310+ FixRangeEnd : end ,
1311+ Reason : reason ,
1312+ Type : errType ,
13071313 })
13081314}
13091315
0 commit comments