rubocop 0.58.2 → 0.59.0

data/lib/rubocop/cop/style/semicolon.rb

@@ -22,6 +22,7 @@ module RuboCop
 
         def investigate(processed_source)
           return if processed_source.blank?
+
           @processed_source = processed_source
 
           check_for_line_terminator_or_opener
@@ -29,6 +30,7 @@ module RuboCop
 
         def on_begin(node)
           return if cop_config['AllowAsExpressionSeparator']
+
           exprs = node.children
 
           return if exprs.size < 2
@@ -40,6 +42,7 @@ module RuboCop
           # every line with more than 1 expression on it is an offense
           lines.each do |line, expr_on_line|
             next unless expr_on_line.size > 1
+
             # TODO: Find the correct position of the semicolon. We don't know
             # if the first semicolon on the line is a separator of
             # expressions. It's just a guess.
@@ -50,6 +53,7 @@ module RuboCop
 
         def autocorrect(range)
           return unless range
+
           ->(corrector) { corrector.remove(range) }
         end
 

data/lib/rubocop/cop/style/signal_exception.rb

@@ -138,6 +138,7 @@ module RuboCop
             check_send(:raise, node) unless ignored_node?(node)
           when :only_raise
             return if @custom_fail_defined
+
             check_send(:fail, node)
           when :only_fail
             check_send(:raise, node)

data/lib/rubocop/cop/style/string_hash_keys.rb

@@ -33,6 +33,7 @@ module RuboCop
         def on_pair(node)
           return unless string_hash_key?(node)
           return if receive_environments_method?(node)
+
           add_offense(node.key)
         end
 

data/lib/rubocop/cop/style/symbol_proc.rb

@@ -13,6 +13,7 @@ module RuboCop
       #   something.map(&:upcase)
       class SymbolProc < Cop
         include RangeHelp
+        include IgnoredMethods
 
         MSG = 'Pass `&:%<method>s` as an argument to `%<block_method>s` ' \
               'instead of a block.'.freeze
@@ -120,14 +121,6 @@ module RuboCop
           end
         end
 
-        def ignored_methods
-          cop_config['IgnoredMethods']
-        end
-
-        def ignored_method?(name)
-          ignored_methods.include?(name.to_s)
-        end
-
         def super?(node)
           SUPER_TYPES.include?(node.type)
         end

data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb

@@ -45,6 +45,7 @@ module RuboCop
 
         def on_array(node)
           return unless node.square_brackets?
+
           check_literal(node, 'item of %<article>s array')
         end
 

data/lib/rubocop/cop/style/trailing_method_end_statement.rb

@@ -84,6 +84,7 @@ module RuboCop
 
         def remove_semicolon(node, corrector)
           return unless token_before_end(node).semicolon?
+
           corrector.remove(token_before_end(node).pos)
         end
       end

data/lib/rubocop/cop/style/trailing_underscore_variable.rb

@@ -66,6 +66,7 @@ module RuboCop
         def find_first_possible_offense(variables)
           variables.reduce(nil) do |offense, variable|
             break offense unless %i[lvasgn splat].include?(variable.type)
+
             var, = *variable
             var, = *var
             if allow_named_underscore_variables

data/lib/rubocop/cop/style/unneeded_condition.rb

@@ -50,8 +50,7 @@ module RuboCop
             elsif node.modifier_form?
               corrector.replace(node.source_range, node.if_branch.source)
             else
-              corrected = [node.if_branch.source,
-                           else_source(node.else_branch)].join(' || ')
+              corrected = make_ternary_form(node)
 
               corrector.replace(node.source_range, corrected)
             end
@@ -70,6 +69,7 @@ module RuboCop
 
         def range_of_offense(node)
           return :expression unless node.ternary?
+
           range_between(node.loc.question.begin_pos, node.loc.colon.end_pos)
         end
 
@@ -94,6 +94,17 @@ module RuboCop
                       else_branch.modifier_form?
           wrap_else ? "(#{else_branch.source})" : else_branch.source
         end
+
+        def make_ternary_form(node)
+          ternary_form = [node.if_branch.source,
+                          else_source(node.else_branch)].join(' || ')
+
+          if node.parent && node.parent.send_type?
+            "(#{ternary_form})"
+          else
+            ternary_form
+          end
+        end
       end
     end
   end

data/lib/rubocop/cop/style/unneeded_percent_q.rb

@@ -32,6 +32,7 @@ module RuboCop
 
         def on_dstr(node)
           return unless string_literal?(node)
+
           check(node)
         end
 
@@ -40,6 +41,7 @@ module RuboCop
           # will call `on_dstr` for the entire string and `on_str` for the
           # non interpolated portion of the string
           return unless string_literal?(node)
+
           check(node)
         end
 

data/lib/rubocop/cop/style/word_array.rb

@@ -81,12 +81,24 @@ module RuboCop
         end
 
         def correct_bracketed(node)
-          words = node.children.map { |w| to_string_literal(w.children[0]) }
+          words = node.children.map do |word|
+            if word.dstr_type?
+              string_literal = to_string_literal(word.source)
+
+              trim_string_interporation_escape_character(string_literal)
+            else
+              to_string_literal(word.children[0])
+            end
+          end
 
           lambda do |corrector|
             corrector.replace(node.source_range, "[#{words.join(', ')}]")
           end
         end
+
+        def trim_string_interporation_escape_character(str)
+          str.gsub(/\\\#{(.*?)\}/) { "\#{#{Regexp.last_match(1)}}" }
+        end
       end
     end
   end

data/lib/rubocop/cop/team.rb

@@ -59,6 +59,7 @@ module RuboCop
         Force.all.each_with_object([]) do |force_class, forces|
           joining_cops = cops.select { |cop| cop.join_force?(force_class) }
           next if joining_cops.empty?
+
           forces << force_class.new(joining_cops)
         end
       end

data/lib/rubocop/cop/variable_force.rb

@@ -99,6 +99,7 @@ module RuboCop
       def process_children(origin_node)
         origin_node.each_child_node do |child_node|
           next if scanned_node?(child_node)
+
           process_node(child_node)
         end
       end
@@ -174,6 +175,7 @@ module RuboCop
 
         variable_names.each do |name|
           next if variable_table.variable_exist?(name)
+
           variable_table.declare_variable(name, node)
         end
 
@@ -272,6 +274,7 @@ module RuboCop
       def process_zero_arity_super(node)
         variable_table.accessible_variables.each do |variable|
           next unless variable.method_argument?
+
           variable.reference!(node)
         end
       end
@@ -315,10 +318,12 @@ module RuboCop
           # Non related references which are caught in the above scan
           # would be skipped here.
           next unless variable
+
           variable.assignments.each do |assignment|
             next if assignment_nodes_in_loop.none? do |assignment_node|
                       assignment_node.equal?(assignment.node)
                     end
+
             assignment.reference!(node)
           end
         end

data/lib/rubocop/cop/variable_force/assignment.rb

@@ -48,11 +48,13 @@ module RuboCop
 
         def operator_assignment?
           return false unless meta_assignment_node
+
           OPERATOR_ASSIGNMENT_TYPES.include?(meta_assignment_node.type)
         end
 
         def multiple_assignment?
           return false unless meta_assignment_node
+
           meta_assignment_node.type == MULTIPLE_ASSIGNMENT_TYPE
         end
 
@@ -76,6 +78,7 @@ module RuboCop
           return nil unless node.parent
           return nil unless OPERATOR_ASSIGNMENT_TYPES.include?(node.parent.type)
           return nil unless node.sibling_index.zero?
+
           node.parent
         end
 
@@ -84,6 +87,7 @@ module RuboCop
           return nil unless grandparent_node
           return nil unless grandparent_node.type == MULTIPLE_ASSIGNMENT_TYPE
           return nil unless node.parent.type == MULTIPLE_LEFT_HAND_SIDE_TYPE
+
           grandparent_node
         end
       end

data/lib/rubocop/cop/variable_force/branch.rb

@@ -9,8 +9,10 @@ module RuboCop
           ([target_node] + target_node.ancestors).each do |node|
             return nil unless node.parent
             return nil unless scope.include?(node)
+
             klass = CLASSES_BY_TYPE[node.parent.type]
             next unless klass
+
             branch = klass.new(node, scope)
             return branch if branch.branched?
           end
@@ -74,6 +76,7 @@ module RuboCop
 
           def parent
             return @parent if instance_variable_defined?(:@parent)
+
             @branch = Branch.of(control_node, scope: scope)
           end
 
@@ -122,6 +125,7 @@ module RuboCop
 
           def ==(other)
             return false unless other
+
             control_node.equal?(other.control_node) &&
               child_node.equal?(other.child_node)
           end

data/lib/rubocop/cop/variable_force/branchable.rb

@@ -8,11 +8,13 @@ module RuboCop
       module Branchable
         def branch
           return @branch if instance_variable_defined?(:@branch)
+
           @branch = Branch.of(node, scope: scope)
         end
 
         def run_exclusively_with?(other)
           return false if !branch || !other.branch
+
           branch.exclusive_with?(other.branch)
         end
       end

data/lib/rubocop/cop/variable_force/scope.rb

@@ -61,6 +61,7 @@ module RuboCop
 
         def each_node(&block)
           return to_enum(__method__) unless block_given?
+
           yield node if naked_top_level?
           scan_node(node, &block)
         end
@@ -70,6 +71,7 @@ module RuboCop
         def scan_node(node, &block)
           node.each_child_node do |child_node|
             next unless include?(child_node)
+
             yield child_node
             scan_node(child_node, &block)
           end
@@ -79,16 +81,20 @@ module RuboCop
           return true if !naked_top_level? && target_node.equal?(node)
           return true if ancestor_node?(target_node)
           return false unless target_node.parent.equal?(node)
+
           indices = OUTER_SCOPE_CHILD_INDICES[target_node.parent.type]
           return false unless indices
+
           indices.include?(target_node.sibling_index)
         end
 
         def belong_to_inner_scope?(target_node)
           return false if !target_node.parent || target_node.parent.equal?(node)
           return false unless SCOPE_TYPES.include?(target_node.parent.type)
+
           indices = OUTER_SCOPE_CHILD_INDICES[target_node.parent.type]
           return true unless indices
+
           !indices.include?(target_node.sibling_index)
         end
 

data/lib/rubocop/cop/variable_force/variable_table.rb

@@ -120,6 +120,7 @@ module RuboCop
         def mark_variable_as_captured_by_block_if_so(variable)
           return unless current_scope.node.block_type?
           return if variable.scope == current_scope
+
           variable.capture_with_block!
         end
       end

data/lib/rubocop/file_finder.rb

@@ -33,11 +33,13 @@ module RuboCop
     def traverse_files_upwards(filename, start_dir, use_home)
       Pathname.new(start_dir).expand_path.ascend do |dir|
         break if FileFinder.root_level?(dir)
+
         file = dir + filename
         yield(file.to_s) if file.exist?
       end
 
       return unless use_home && ENV.key?('HOME')
+
       file = File.join(Dir.home, filename)
       yield(file) if File.exist?(file)
     end

data/lib/rubocop/formatter/disabled_config_formatter.rb

@@ -128,10 +128,10 @@ module RuboCop
 
         params.each do |param|
           value = default_cfg[param]
-          if value.is_a?(Array)
-            next if value.empty?
-            output_buffer.puts "# #{param}: #{value.join(', ')}"
-          end
+          next unless value.is_a?(Array)
+          next if value.empty?
+
+          output_buffer.puts "# #{param}: #{value.join(', ')}"
         end
       end
 

data/lib/rubocop/formatter/file_list_formatter.rb

@@ -12,6 +12,7 @@ module RuboCop
     class FileListFormatter < BaseFormatter
       def file_finished(file, offenses)
         return if offenses.empty?
+
         output.printf("%s\n", file)
       end
     end

data/lib/rubocop/formatter/simple_text_formatter.rb

@@ -27,6 +27,7 @@ module RuboCop
 
       def file_finished(file, offenses)
         return if offenses.empty?
+
         count_stats(offenses)
         report_file(file, offenses)
       end

data/lib/rubocop/options.rb

@@ -29,6 +29,7 @@ module RuboCop
         if args.any?
           raise OptionArgumentError, '-s/--stdin requires exactly one path.'
         end
+
         # We want the STDIN contents in @options[:stdin] and the file name in
         # args to simplify the rest of the processing.
         args = [@options[:stdin]]
@@ -136,6 +137,7 @@ module RuboCop
              table) do |severity|
         @options[:fail_level] = severity
       end
+      option(opts, '--display-only-fail-level-offenses')
     end
 
     def add_flags_with_optional_args(opts)
@@ -251,10 +253,16 @@ module RuboCop
       unless boolean_or_empty_cache?
         raise OptionArgumentError, '-C/--cache argument must be true or false'
       end
+
+      if display_only_fail_level_offenses_with_autocorrect?
+        raise OptionArgumentError, '--autocorrect can not be used with ' \
+          '--display-only-fail-level-offenses'
+      end
       validate_auto_gen_config
       validate_parallel
 
       return if incompatible_options.size <= 1
+
       raise OptionArgumentError, 'Incompatible cli options: ' \
                                  "#{incompatible_options.inspect}"
     end
@@ -304,6 +312,10 @@ module RuboCop
                               UnneededCopDisableDirective]).any?
     end
 
+    def display_only_fail_level_offenses_with_autocorrect?
+      @options[:display_only_fail_level_offenses] && @options[:autocorrect]
+    end
+
     def except_syntax?
       @options.key?(:except) &&
         (@options[:except] & %w[Lint/Syntax Syntax]).any?
@@ -319,6 +331,7 @@ module RuboCop
 
     def validate_exclude_limit_option
       return if @options[:exclude_limit] =~ /^\d+$/
+
       # Emulate OptionParser's behavior to make failures consistent regardless
       # of option order.
       raise OptionParser::MissingArgument
@@ -378,6 +391,9 @@ module RuboCop
                              'if no format is specified.'],
       fail_level:           ['Minimum severity (A/R/C/W/E/F) for exit',
                              'with error code.'],
+      display_only_fail_level_offenses:
+                            ['Only output offense messages at',
+                             'the specified --fail-level or above'],
       show_cops:            ['Shows the given cops, or all cops by',
                              'default, and their configurations for the',
                              'current directory.'],