Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Prevent Accessing Negative Index #27

Merged
merged 1 commit into from
Jul 25, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions formatter/general.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,40 @@ func (f *GeneralIssueFormatter) Format(
) string {
var result strings.Builder

lineIndex := issue.Start.Line - 1
if lineIndex < 0 {
lineIndex = 0
}
if lineIndex >= len(snippet.Lines) {
lineIndex = len(snippet.Lines) - 1
}

lineNumberStr := fmt.Sprintf("%d", issue.Start.Line)
padding := strings.Repeat(" ", len(lineNumberStr)-1)
result.WriteString(lineStyle.Sprintf(" %s|\n", padding))

line := expandTabs(snippet.Lines[issue.Start.Line-1])
result.WriteString(lineStyle.Sprintf("%d | ", issue.Start.Line))
result.WriteString(line + "\n")
// line := expandTabs(snippet.Lines[issue.Start.Line-1])
// result.WriteString(lineStyle.Sprintf("%d | ", issue.Start.Line))
// result.WriteString(line + "\n")

// visualColumn := calculateVisualColumn(line, issue.Start.Column)
// result.WriteString(lineStyle.Sprintf(" %s| ", padding))
// result.WriteString(strings.Repeat(" ", visualColumn))
// result.WriteString(messageStyle.Sprintf("^ %s\n\n", issue.Message))

if len(snippet.Lines) > 0 {
line := expandTabs(snippet.Lines[lineIndex])
result.WriteString(lineStyle.Sprintf("%d | ", issue.Start.Line))
result.WriteString(line + "\n")

visualColumn := calculateVisualColumn(line, issue.Start.Column)
result.WriteString(lineStyle.Sprintf(" %s| ", padding))
result.WriteString(strings.Repeat(" ", visualColumn))
result.WriteString(messageStyle.Sprintf("^ %s\n\n", issue.Message))
visualColumn := calculateVisualColumn(line, issue.Start.Column)
result.WriteString(lineStyle.Sprintf(" %s| ", padding))
result.WriteString(strings.Repeat(" ", visualColumn))
result.WriteString(messageStyle.Sprintf("^ %s\n\n", issue.Message))
} else {
result.WriteString(messageStyle.Sprintf("Unable to display line. File might be empty.\n"))
result.WriteString(messageStyle.Sprintf("Issue: %s\n\n", issue.Message))
}

return result.String()
}
Expand Down
Loading