lib/rubocop/cop/lint/useless_times.rb in rubocop-0.91.0 vs lib/rubocop/cop/lint/useless_times.rb in rubocop-0.91.1
- old
+ new
@@ -47,11 +47,11 @@
node = node.block_node if node.block_literal?
add_offense(node, message: format(MSG, count: count)) do |corrector|
next unless own_line?(node)
- if count < 1
+ if never_process?(count, node)
remove_node(corrector, node)
elsif !proc_name.empty?
autocorrect_block_pass(corrector, node, proc_name)
else
autocorrect_block(corrector, node)
@@ -59,10 +59,14 @@
end
end
private
+ def never_process?(count, node)
+ count < 1 || node.block_type? && node.body.nil?
+ end
+
def remove_node(corrector, node)
corrector.remove(range_by_whole_lines(node.loc.expression, include_final_newline: true))
end
def autocorrect_block_pass(corrector, node, proc_name)
@@ -80,10 +84,15 @@
end
def fix_indentation(source, range)
# Cleanup indentation in a multiline block
source_lines = source.split("\n")
- source_lines[1..-1].each { |line| line[range] = '' }
+
+ source_lines[1..-1].each do |line|
+ next if line.empty?
+
+ line[range] = ''
+ end
source_lines.join("\n")
end
def own_line?(node)
# If there is anything else on the line other than whitespace,