From 12148faa743d6a2b10be3c6bec73c15ecb38b3a5 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sun, 15 Dec 2024 18:09:46 +0100 Subject: [PATCH] fix: use adjusted position --- analyzer.go | 2 +- wsl.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/analyzer.go b/analyzer.go index 46d5019..b868856 100644 --- a/analyzer.go +++ b/analyzer.go @@ -82,7 +82,7 @@ func (wa *wslAnalyzer) run(pass *analysis.Pass) (interface{}, error) { continue } - filename := pass.Fset.PositionFor(file.Pos(), false).Filename + filename := pass.Fset.Position(file.Pos()).Filename if !strings.HasSuffix(filename, ".go") { continue } diff --git a/wsl.go b/wsl.go index 76f4abf..8d125c2 100644 --- a/wsl.go +++ b/wsl.go @@ -1113,8 +1113,8 @@ func (p *processor) findLeadingAndTrailingWhitespaces(ident *ast.Ident, stmt, ne return } - blockStartLine = p.fileSet.PositionFor(blockStartPos, false).Line - blockEndLine = p.fileSet.PositionFor(blockEndPos, false).Line + blockStartLine = p.fileSet.Position(blockStartPos).Line + blockEndLine = p.fileSet.Position(blockEndPos).Line // No whitespace possible if LBrace and RBrace is on the same line. if blockStartLine == blockEndLine { @@ -1362,14 +1362,14 @@ func isExampleFunc(ident *ast.Ident) bool { } func (p *processor) nodeStart(node ast.Node) int { - return p.fileSet.PositionFor(node.Pos(), false).Line + return p.fileSet.Position(node.Pos()).Line } func (p *processor) nodeEnd(node ast.Node) int { - line := p.fileSet.PositionFor(node.End(), false).Line + line := p.fileSet.Position(node.End()).Line if isEmptyLabeledStmt(node) { - return p.fileSet.PositionFor(node.Pos(), false).Line + return p.fileSet.Position(node.Pos()).Line } return line @@ -1408,7 +1408,7 @@ func (p *processor) addErrorRange(reportAt, start, end token.Pos, reason string) } func (p *processor) addWarning(w string, pos token.Pos, t interface{}) { - position := p.fileSet.PositionFor(pos, false) + position := p.fileSet.Position(pos) p.warnings = append(p.warnings, fmt.Sprintf("%s:%d: %s (%T)", position.Filename, position.Line, w, t),