Skip to content
Merged
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions src/compiler/crystal/exception.cr
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@ module Crystal

decorator = line_number_decorator(line_number)
lstripped_line = line.lstrip
space_delta = line.chars.size - lstripped_line.chars.size
space_delta = line.size - lstripped_line.size
# Column number should start at `1`. We're using `0` to track bogus passed
# `column_number`.
final_column_number = (column_number - space_delta).clamp(0..)

io << "\n\n"
io << colorize(decorator).dim << colorize(lstripped_line.chomp).bold
append_error_indicator(io, decorator.chars.size, final_column_number, size || 0)
append_error_indicator(io, decorator.size, final_column_number, size || 0)
end
end

Expand Down Expand Up @@ -259,7 +259,7 @@ module Crystal
source_slice, spaces_removed = minimize_indentation(source_slice)

io << Crystal.with_line_numbers(source_slice, line_number, @color, from_index + 1)
offset = OFFSET_FROM_LINE_NUMBER_DECORATOR + line_number.to_s.chars.size - spaces_removed
offset = OFFSET_FROM_LINE_NUMBER_DECORATOR + line_number.to_s.size - spaces_removed
append_error_indicator(io, offset, @column_number, @size)
end
end
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/crystal/util.cr
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module Crystal
line_number_start = 1,
)
source = source.lines if source.is_a? String
line_number_padding = (source.size + line_number_start).to_s.chars.size
line_number_padding = (source.size + line_number_start).to_s.size
source.map_with_index do |line, i|
line = line.to_s.chomp
line_number = "%#{line_number_padding}d" % (i + line_number_start)
Expand Down