rubocop 0.83.0 → 0.84.0

data/lib/rubocop/cop/mixin/alignment.rb

@@ -25,9 +25,7 @@ module RuboCop
       end
 
       def check_alignment(items, base_column = nil)
-        unless items.empty?
-          base_column ||= display_column(items.first.source_range)
-        end
+        base_column ||= display_column(items.first.source_range) unless items.empty?
 
         each_bad_alignment(items, base_column) do |current|
           expr = current.source_range

data/lib/rubocop/cop/mixin/array_min_size.rb

@@ -38,9 +38,7 @@ module RuboCop
       def largest_brackets_size(style, ary_size)
         self.class.largest_brackets ||= -Float::INFINITY
 
-        if style == :brackets && ary_size > self.class.largest_brackets
-          self.class.largest_brackets = ary_size
-        end
+        self.class.largest_brackets = ary_size if style == :brackets && ary_size > self.class.largest_brackets
 
         self.class.largest_brackets
       end
@@ -48,9 +46,7 @@ module RuboCop
       def smallest_percent_size(style, ary_size)
         @smallest_percent ||= Float::INFINITY
 
-        if style == :percent && ary_size < @smallest_percent
-          @smallest_percent = ary_size
-        end
+        @smallest_percent = ary_size if style == :percent && ary_size < @smallest_percent
 
         @smallest_percent
       end

data/lib/rubocop/cop/mixin/check_line_breakable.rb

@@ -88,9 +88,7 @@ module RuboCop
         # or redundant edits, we only mark one offense at a time.
         return true if contained_by_breakable_collection_on_same_line?(node)
 
-        if contained_by_multiline_collection_that_could_be_broken_up?(node)
-          return true
-        end
+        return true if contained_by_multiline_collection_that_could_be_broken_up?(node)
 
         false
       end
@@ -133,17 +131,13 @@ module RuboCop
       def contained_by_multiline_collection_that_could_be_broken_up?(node)
         node.each_ancestor.find do |ancestor|
           if ancestor.hash_type? || ancestor.array_type?
-            if breakable_collection?(ancestor, ancestor.children)
-              return children_could_be_broken_up?(ancestor.children)
-            end
+            return children_could_be_broken_up?(ancestor.children) if breakable_collection?(ancestor, ancestor.children)
           end
 
           next unless ancestor.send_type?
 
           args = process_args(ancestor.arguments)
-          if breakable_collection?(ancestor, args)
-            return children_could_be_broken_up?(args)
-          end
+          return children_could_be_broken_up?(args) if breakable_collection?(ancestor, args)
         end
 
         false
@@ -175,9 +169,7 @@ module RuboCop
         # ...then each key/value pair is treated as a method 'argument'
         # when determining where line breaks should appear.
         if (last_arg = args.last)
-          if last_arg.hash_type? && !last_arg.braces?
-            args = args.concat(args.pop.children)
-          end
+          args = args.concat(args.pop.children) if last_arg.hash_type? && !last_arg.braces?
         end
         args
       end

data/lib/rubocop/cop/mixin/configurable_enforced_style.rb

@@ -67,9 +67,7 @@ module RuboCop
       def style
         @style ||= begin
           s = cop_config[style_parameter_name].to_sym
-          unless supported_styles.include?(s)
-            raise "Unknown style #{s} selected!"
-          end
+          raise "Unknown style #{s} selected!" unless supported_styles.include?(s)
 
           s
         end

data/lib/rubocop/cop/mixin/configurable_formatting.rb

@@ -18,9 +18,7 @@ module RuboCop
 
       def report_opposing_styles(node, name)
         alternative_styles.each do |alternative|
-          if valid_name?(node, name, alternative)
-            return unexpected_style_detected(alternative)
-          end
+          return unexpected_style_detected(alternative) if valid_name?(node, name, alternative)
         end
       end
 

data/lib/rubocop/cop/mixin/multiline_element_indentation.rb

@@ -67,9 +67,7 @@ module RuboCop
           styles << :consistent
           styles << :special_inside_parentheses unless left_parenthesis
         end
-        if left_parenthesis && column == left_parenthesis.column + 1
-          styles << :special_inside_parentheses
-        end
+        styles << :special_inside_parentheses if left_parenthesis && column == left_parenthesis.column + 1
         styles << brace_alignment_style if column == left_brace.column
         styles
       end

data/lib/rubocop/cop/mixin/surrounding_space.rb

@@ -107,9 +107,7 @@ module RuboCop
 
       def empty_offenses(node, left, right, message)
         range = range_between(left.begin_pos, right.end_pos)
-        if offending_empty_space?(empty_config, left, right)
-          empty_offense(node, range, message, 'Use one')
-        end
+        empty_offense(node, range, message, 'Use one') if offending_empty_space?(empty_config, left, right)
         return unless offending_empty_no_space?(empty_config, left, right)
 
         empty_offense(node, range, message, 'Do not use')

data/lib/rubocop/cop/mixin/trailing_comma.rb

@@ -184,9 +184,7 @@ module RuboCop
         #       ...
         #     SOURCE
         #   })
-        if node.pair_type? || node.hash_type?
-          return heredoc?(node.children.last)
-        end
+        return heredoc?(node.children.last) if node.pair_type? || node.hash_type?
 
         false
       end

data/lib/rubocop/cop/naming/file_name.rb

@@ -153,9 +153,7 @@ module RuboCop
 
               namespace, name = *namespace
 
-              if name == expected.last || match_acronym?(expected.last, name)
-                expected.pop
-              end
+              expected.pop if name == expected.last || match_acronym?(expected.last, name)
             end
 
             false

data/lib/rubocop/cop/registry.rb

@@ -94,9 +94,7 @@ module RuboCop
       # @return [String] Qualified cop name
       def qualified_cop_name(name, path, shall_warn = true)
         badge = Badge.parse(name)
-        if shall_warn && department_missing?(badge, name)
-          print_warning(name, path)
-        end
+        print_warning(name, path) if shall_warn && department_missing?(badge, name)
         return name if registered?(badge)
 
         potential_badges = qualify_badge(badge)
@@ -114,9 +112,7 @@ module RuboCop
 
       def print_warning(name, path)
         message = "#{path}: Warning: no department given for #{name}."
-        if path.end_with?('.rb')
-          message += ' Run `rubocop -a --only Migration/DepartmentName` to fix.'
-        end
+        message += ' Run `rubocop -a --only Migration/DepartmentName` to fix.' if path.end_with?('.rb')
         warn message
       end
 

data/lib/rubocop/cop/severity.rb

@@ -31,9 +31,7 @@ module RuboCop
       # @api private
       def initialize(name_or_code)
         name = Severity.name_from_code(name_or_code)
-        unless NAMES.include?(name)
-          raise ArgumentError, "Unknown severity: #{name}"
-        end
+        raise ArgumentError, "Unknown severity: #{name}" unless NAMES.include?(name)
 
         @name = name.freeze
         freeze

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

@@ -7,7 +7,7 @@ module RuboCop
       # `||` instead. It can be configured to check only in conditions or in
       # all contexts.
       #
-      # @example EnforcedStyle: always (default)
+      # @example EnforcedStyle: always
       #   # bad
       #   foo.save and return
       #
@@ -22,7 +22,7 @@ module RuboCop
       #   if foo && bar
       #   end
       #
-      # @example EnforcedStyle: conditionals
+      # @example EnforcedStyle: conditionals (default)
       #   # bad
       #   if foo and bar
       #   end

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

@@ -35,9 +35,7 @@ module RuboCop
           node_expr = node.source_range
           attr_expr = attr_name.source_range
 
-          if setter&.boolean_type?
-            remove = range_between(attr_expr.end_pos, node_expr.end_pos)
-          end
+          remove = range_between(attr_expr.end_pos, node_expr.end_pos) if setter&.boolean_type?
 
           lambda do |corrector|
             corrector.replace(node.loc.selector, replacement_method(node))

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ClassLength
 module RuboCop
   module Cop
     module Style
@@ -210,9 +209,7 @@ module RuboCop
         end
 
         def message(node)
-          if braces_required_method?(node.method_name)
-            return braces_required_message(node)
-          end
+          return braces_required_message(node) if braces_required_method?(node.method_name)
 
           case style
           when :line_count_based    then line_count_based_message(node)
@@ -276,9 +273,7 @@ module RuboCop
         # rubocop:enable Metrics/CyclomaticComplexity
 
         def proper_block_style?(node)
-          if special_method?(node.method_name)
-            return special_method_proper_block_style?(node)
-          end
+          return special_method_proper_block_style?(node) if special_method?(node.method_name)
 
           case style
           when :line_count_based    then line_count_based_block_style?(node)
@@ -387,4 +382,3 @@ module RuboCop
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

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

@@ -312,9 +312,7 @@ module RuboCop
           # ignore pseudo-assignments without rhs in for nodes
           return if node.parent&.for_type?
 
-          if assignment.begin_type? && assignment.children.one?
-            assignment, = *assignment
-          end
+          assignment, = *assignment if assignment.begin_type? && assignment.children.one?
 
           assignment
         end

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

@@ -3,32 +3,69 @@
 module RuboCop
   module Cop
     module Style
-      # This cop checks for uses of double negation (!!) to convert something
-      # to a boolean value. As this is both cryptic and usually redundant, it
-      # should be avoided.
+      # This cop checks for uses of double negation (`!!`) to convert something to a boolean value.
       #
-      # @example
+      # When using `EnforcedStyle: allowed_in_returns`, allow double nagation in contexts
+      # that use boolean as a return value. When using `EnforcedStyle: forbidden`, double nagation
+      # should be forbidden always.
       #
+      # @example
       #   # bad
       #   !!something
       #
       #   # good
       #   !something.nil?
       #
+      # @example EnforcedStyle: allowed_in_returns (default)
+      #   # good
+      #   def foo?
+      #     !!return_value
+      #   end
+      #
+      # @example EnforcedStyle: forbidden
+      #   # bad
+      #   def foo?
+      #     !!return_value
+      #   end
+      #
       # Please, note that when something is a boolean value
       # !!something and !something.nil? are not the same thing.
       # As you're unlikely to write code that can accept values of any type
       # this is rarely a problem in practice.
       class DoubleNegation < Cop
+        include ConfigurableEnforcedStyle
+
         MSG = 'Avoid the use of double negation (`!!`).'
 
         def_node_matcher :double_negative?, '(send (send _ :!) :!)'
 
         def on_send(node)
           return unless double_negative?(node) && node.prefix_bang?
+          return if style == :allowed_in_returns && allowed_in_returns?(node)
 
           add_offense(node, location: :selector)
         end
+
+        private
+
+        def allowed_in_returns?(node)
+          node.parent&.return_type? || end_of_method_definition?(node)
+        end
+
+        def end_of_method_definition?(node)
+          return false unless (def_node = find_def_node_from_ascendant(node))
+
+          last_child = def_node.child_nodes.last
+
+          last_child.last_line == node.last_line
+        end
+
+        def find_def_node_from_ascendant(node)
+          return unless (parent = node.parent)
+          return parent if parent.def_type? || parent.defs_type?
+
+          find_def_node_from_ascendant(node.parent)
+        end
       end
     end
   end

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

@@ -68,9 +68,7 @@ module RuboCop
 
         def first_argument_unparenthesized?(node)
           parent = node.parent
-          unless parent && %i[send super zsuper].include?(parent.type)
-            return false
-          end
+          return false unless parent && %i[send super zsuper].include?(parent.type)
 
           node.object_id == parent.arguments.first.object_id &&
             !parentheses?(node.parent)

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

@@ -149,9 +149,7 @@ module RuboCop
           end
 
           next_token = processed_source.tokens[token_number]
-          if next_token && next_token.text =~ Encoding::ENCODING_PATTERN
-            token = next_token
-          end
+          token = next_token if next_token && next_token.text =~ Encoding::ENCODING_PATTERN
 
           token
         end
@@ -216,7 +214,7 @@ module RuboCop
           if comment
             corrector.insert_after(line_range(comment.line), following_comment)
           else
-            corrector.insert_before(line_range(1), preceding_comment)
+            corrector.insert_before(processed_source.buffer.source_range, preceding_comment)
           end
         end
 

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

@@ -168,11 +168,7 @@ module RuboCop
         end
 
         def autocorrect_ruby19(corrector, pair_node)
-          key = pair_node.key.source_range
-          op = pair_node.loc.operator
-
-          range = key.join(op)
-          range = range_with_surrounding_space(range: range, side: :right)
+          range = range_for_autocorrect_ruby19(pair_node)
 
           space = argument_without_space?(pair_node.parent) ? ' ' : ''
 
@@ -180,6 +176,17 @@ module RuboCop
             range,
             range.source.sub(/^:(.*\S)\s*=>\s*$/, space.to_s + '\1: ')
           )
+
+          hash_node = pair_node.parent
+          corrector.wrap(hash_node, '{', '}') if hash_node.parent&.return_type? && !hash_node.braces?
+        end
+
+        def range_for_autocorrect_ruby19(pair_node)
+          key = pair_node.key.source_range
+          operator = pair_node.loc.operator
+
+          range = key.join(operator)
+          range_with_surrounding_space(range: range, side: :right)
         end
 
         def argument_without_space?(node)

data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb

@@ -22,9 +22,7 @@ module RuboCop
             lambda do |corrector|
               corrector.replace(args_begin(node), '(')
 
-              unless args_parenthesized?(node)
-                corrector.insert_after(args_end(node), ')')
-              end
+              corrector.insert_after(args_end(node), ')') unless args_parenthesized?(node)
             end
           end
 

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

@@ -41,9 +41,7 @@ module RuboCop
 
         def same_name_assignment?(node)
           any_assignment?(node) do |asgn_node|
-            if asgn_node.masgn_type?
-              next variable_in_mass_assignment?(node.method_name, asgn_node)
-            end
+            next variable_in_mass_assignment?(node.method_name, asgn_node) if asgn_node.masgn_type?
 
             asgn_node.loc.name.source == node.method_name.to_s
           end

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

@@ -49,13 +49,9 @@ module RuboCop
         def replacement(node)
           return to_ternary(node) unless node.parent
 
-          if %i[and or].include?(node.parent.type)
-            return "(#{to_ternary(node)})"
-          end
+          return "(#{to_ternary(node)})" if %i[and or].include?(node.parent.type)
 
-          if node.parent.send_type? && node.parent.operator_method?
-            return "(#{to_ternary(node)})"
-          end
+          return "(#{to_ternary(node)})" if node.parent.send_type? && node.parent.operator_method?
 
           to_ternary(node)
         end

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

@@ -93,12 +93,8 @@ module RuboCop
 
         def check(begin_node)
           node = begin_node.children.first
-          if keyword_with_redundant_parentheses?(node)
-            return offense(begin_node, 'a keyword')
-          end
-          if disallowed_literal?(begin_node, node)
-            return offense(begin_node, 'a literal')
-          end
+          return offense(begin_node, 'a keyword') if keyword_with_redundant_parentheses?(node)
+          return offense(begin_node, 'a literal') if disallowed_literal?(begin_node, node)
           return offense(begin_node, 'a variable') if node.variable?
           return offense(begin_node, 'a constant') if node.const_type?