Skip to content

Commit f283ecd

Browse files
Merge pull request #1641 from presidentbeef/zero_line_numbers_instead_of_nil
Fix warning sorting with nil line numbers
2 parents d9400f9 + fabd7c0 commit f283ecd

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lib/brakeman/report/ignore/config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def save_to_file warnings, file = @file
126126

127127
w[:note] = @notes[w[:fingerprint]] || ""
128128
w
129-
end.sort_by { |w| [w[:fingerprint], w[:line]] }
129+
end.sort_by { |w| [w[:fingerprint], w[:line] || 0] }
130130

131131
output = {
132132
:ignored_warnings => warnings,

lib/brakeman/report/report_csv.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def generate_report
1717
]
1818

1919
rows = tracker.filtered_warnings.sort_by do |w|
20-
[w.confidence, w.warning_type, w.file, w.line, w.fingerprint]
20+
[w.confidence, w.warning_type, w.file, w.line || 0, w.fingerprint]
2121
end.map do |warning|
2222
generate_row(headers, warning)
2323
end

lib/brakeman/report/report_text.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def generate_warnings
9292
HighLine.color("No warnings found", :bold, :green)
9393
else
9494
warnings = tracker.filtered_warnings.sort_by do |w|
95-
[w.confidence, w.warning_type, w.file, w.line, w.fingerprint]
95+
[w.confidence, w.warning_type, w.file, w.line || 0, w.fingerprint]
9696
end.map do |w|
9797
output_warning w
9898
end

0 commit comments

Comments
 (0)