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.

Sign up for GitHub

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

Break down build_suggestions into smaller methods #1

Open
wants to merge 3 commits into
base: fix-suggestions
Choose a base branch
from
Open

Break down build_suggestions into smaller methods #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfaab64
Break down `build_suggestions` into smaller methods
pavelsavva Feb 22, 2025
116c1f9
Empty line. Oops
pavelsavva Feb 22, 2025
39730da
Comments
pavelsavva Feb 22, 2025
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
57 changes: 38 additions & 19 deletions rdjson_formatter/rdjson_formatter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,38 +96,57 @@ def build_suggestions(offense)
corrections = offense.corrector.as_replacements
return [] if corrections.empty?

merged_range = determine_merged_range(corrections, source_buffer)
corrected_text = build_corrected_text(corrections, source_buffer, merged_range)

[{
range: build_suggestion_range(merged_range),
text: corrected_text
}]
end

# @param [Array{Array}] corrections
# @param [Parser::Source::Buffer] source_buffer
# @return [Parser::Source::Range]
def determine_merged_range(corrections, source_buffer)
min_begin_pos = corrections.map { |range, _| range.begin_pos }.min
max_end_pos = corrections.map { |range, _| range.end_pos }.max
merged_range = Parser::Source::Range.new(source_buffer, min_begin_pos, max_end_pos)
Parser::Source::Range.new(source_buffer, min_begin_pos, max_end_pos)
end

# @param [Array{Array}] corrections
# @param [Parser::Source::Buffer] source_buffer
# @param [Parser::Source::Range] merged_range
# @return [String]
def build_corrected_text(corrections, source_buffer, merged_range)
current_pos = merged_range.begin_pos
corrected_text = ''
current_pos = min_begin_pos

sorted_corrections = corrections.sort_by { |range, _| range.begin_pos }

sorted_corrections.each do |range, replacement_text|
next if range.end_pos < min_begin_pos || range.begin_pos > max_end_pos
corrections.sort_by { |range, _| range.begin_pos }.each do |range, replacement_text|
next if range.end_pos < merged_range.begin_pos || range.begin_pos > merged_range.end_pos

corrected_text += source_buffer.source[current_pos...range.begin_pos] if current_pos < range.begin_pos
corrected_text += replacement_text.to_s
current_pos = range.end_pos
end

corrected_text += source_buffer.source[current_pos...max_end_pos] if current_pos < max_end_pos
corrected_text += source_buffer.source[current_pos...merged_range.end_pos] if current_pos < merged_range.end_pos
corrected_text
end

[{
range: {
start: {
line: merged_range.line,
column: merged_range.column + 1 # rubocop is 0-origin, reviewdog is 1-origin
},
end: {
line: merged_range.last_line,
column: merged_range.last_column + 1
}
# @param [Parser::Source::Range] merged_range
# @return [Hash]
def build_suggestion_range(merged_range)
{
start: {
line: merged_range.line,
column: merged_range.column + 1 # rubocop is 0-origin, reviewdog is 1-origin
},
text: corrected_text
}]
end: {
line: merged_range.last_line,
column: merged_range.last_column + 1
}
}
end

# https://github.com/reviewdog/reviewdog/blob/1d8f6d6897dcfa67c33a2ccdc2ea23a8cca96c8c/proto/rdf/reviewdog.proto
Expand Down