rubocop 0.48.0 → 0.48.1

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

@@ -12,22 +12,20 @@ module RuboCop
       # @example
       #   # Style/PercentLiteralDelimiters:
       #   #   PreferredDelimiters:
-      #   #     default: ()
-      #   #     %i:      []
+      #   #     default: []
+      #   #     %i:      ()
       #
       #   # good
-      #   %w(alpha beta) + %i[gamma delta]
+      #   %w[alpha beta] + %i(gamma delta)
       #
       #   # bad
-      #   %W[alpha #{beta}]
+      #   %W(alpha #{beta})
       #
       #   # bad
-      #   %I[alpha beta]
+      #   %I(alpha beta)
       class PercentLiteralDelimiters < Cop
         include PercentLiteral
 
-        PERCENT_LITERAL_TYPES = %w(% %i %I %q %Q %r %s %w %W %x).freeze
-
         def on_array(node)
           process(node, '%w', '%W', '%i', '%I')
         end
@@ -78,35 +76,6 @@ module RuboCop
           add_offense(node, :expression)
         end
 
-        def preferred_delimiters
-          @preferred_delimiters ||=
-            begin
-              ensure_valid_preferred_delimiters
-
-              if cop_config['PreferredDelimiters'].key?('default')
-                Hash[PERCENT_LITERAL_TYPES.map do |type|
-                  [type, cop_config['PreferredDelimiters'][type] ||
-                    cop_config['PreferredDelimiters']['default']]
-                end]
-              else
-                cop_config['PreferredDelimiters']
-              end
-            end
-        end
-
-        def ensure_valid_preferred_delimiters
-          invalid = cop_config['PreferredDelimiters'].keys -
-                    (PERCENT_LITERAL_TYPES + %w(default))
-          return if invalid.empty?
-
-          raise ArgumentError,
-                "Invalid preferred delimiter config key: #{invalid.join(', ')}"
-        end
-
-        def preferred_delimiters_for(type)
-          preferred_delimiters[type].split(//)
-        end
-
         def uses_preferred_delimiter?(node, type)
           preferred_delimiters_for(type)[0] == begin_source(node)[-1]
         end

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

@@ -16,7 +16,7 @@ module RuboCop
           lambda do |corrector|
             backref, = *node
             parent_type = node.parent ? node.parent.type : nil
-            if %i(dstr xstr regexp).include?(parent_type)
+            if %i[dstr xstr regexp].include?(parent_type)
               corrector.replace(node.source_range,
                                 "{Regexp.last_match(#{backref})}")
             else

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

@@ -37,8 +37,8 @@ module RuboCop
         MSG = 'Use `Hash#%s` instead of `Hash#%s`.'.freeze
 
         OFFENDING_SELECTORS = {
-          short: %i(has_key? has_value?),
-          verbose: %i(key? value?)
+          short: %i[has_key? has_value?],
+          verbose: %i[key? value?]
         }.freeze
 
         def on_send(node)

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

@@ -16,7 +16,7 @@ module RuboCop
       class RedundantParentheses < Cop
         include Parentheses
 
-        ALLOWED_LITERALS = %i(irange erange).freeze
+        ALLOWED_LITERALS = %i[irange erange].freeze
 
         def_node_matcher :square_brackets?,
                          '(send {(send _recv _msg) str array hash} :[] ...)'

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

@@ -71,9 +71,7 @@ module RuboCop
           add_scope(node)
         end
 
-        def on_defs(node)
-          add_scope(node)
-        end
+        alias on_defs on_def
 
         def on_args(node)
           node.children.each { |arg| on_argument(arg) }
@@ -90,6 +88,7 @@ module RuboCop
 
         def on_send(node)
           return unless node.self_receiver? && regular_method_call?(node)
+          return if node.parent && node.parent.mlhs_type?
 
           return if @allowed_send_nodes.include?(node) ||
                     @local_variables_scopes[node].include?(node.method_name)
@@ -127,11 +126,11 @@ module RuboCop
         end
 
         def keyword?(method_name)
-          %i(alias and begin break case class def defined? do
+          %i[alias and begin break case class def defined? do
              else elsif end ensure false for if in module
              next nil not or redo rescue retry return self
              super then true undef unless until when while
-             yield).include?(method_name)
+             yield].include?(method_name)
         end
 
         def allow_self(node)

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

@@ -100,7 +100,7 @@ module RuboCop
           replacement = if slash_literal?(node)
                           ['%r', ''].zip(preferred_delimiters).map(&:join)
                         else
-                          %w(/ /)
+                          %w[/ /]
                         end
 
           lambda do |corrector|

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

@@ -14,7 +14,7 @@ module RuboCop
       #   x += 1
       class SelfAssignment < Cop
         MSG = 'Use self-assignment shorthand `%s=`.'.freeze
-        OPS = %i(+ - * ** / | &).freeze
+        OPS = %i[+ - * ** / | &].freeze
 
         def on_lvasgn(node)
           check(node, :lvar)
@@ -36,7 +36,7 @@ module RuboCop
 
           if rhs.send_type?
             check_send_node(node, rhs, var_name, var_type)
-          elsif %i(and or).include?(rhs.type)
+          elsif %i[and or].include?(rhs.type)
             check_boolean_node(node, rhs, var_name, var_type)
           end
         end
@@ -66,7 +66,7 @@ module RuboCop
 
           if rhs.send_type?
             autocorrect_send_node(node, rhs)
-          elsif %i(and or).include?(rhs.type)
+          elsif %i[and or].include?(rhs.type)
             autocorrect_boolean_node(node, rhs)
           end
         end

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

@@ -31,16 +31,16 @@ module RuboCop
         DO = 'do'.freeze
         SAFE_NAVIGATION = '&.'.freeze
         ACCEPT_LEFT_PAREN =
-          %w(break defined? next not rescue return super yield).freeze
+          %w[break defined? next not rescue return super yield].freeze
         ACCEPT_LEFT_SQUARE_BRACKET =
-          %w(super yield).freeze
+          %w[super yield].freeze
 
         def on_and(node)
           check(node, [:operator].freeze) if node.keyword?
         end
 
         def on_block(node)
-          check(node, %i(begin end).freeze)
+          check(node, %i[begin end].freeze)
         end
 
         def on_break(node)
@@ -48,7 +48,7 @@ module RuboCop
         end
 
         def on_case(node)
-          check(node, %i(keyword else).freeze)
+          check(node, %i[keyword else].freeze)
         end
 
         def on_ensure(node)
@@ -56,15 +56,15 @@ module RuboCop
         end
 
         def on_for(node)
-          check(node, %i(begin end).freeze)
+          check(node, %i[begin end].freeze)
         end
 
         def on_if(node)
-          check(node, %i(keyword else begin end).freeze, 'then'.freeze)
+          check(node, %i[keyword else begin end].freeze, 'then'.freeze)
         end
 
         def on_kwbegin(node)
-          check(node, %i(begin end).freeze, nil)
+          check(node, %i[begin end].freeze, nil)
         end
 
         def on_next(node)
@@ -108,7 +108,7 @@ module RuboCop
         end
 
         def on_until(node)
-          check(node, %i(begin end keyword).freeze)
+          check(node, %i[begin end keyword].freeze)
         end
 
         def on_when(node)
@@ -116,7 +116,7 @@ module RuboCop
         end
 
         def on_while(node)
-          check(node, %i(begin end keyword).freeze)
+          check(node, %i[begin end keyword].freeze)
         end
 
         def on_yield(node)

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

@@ -8,7 +8,7 @@ module RuboCop
       class SpaceAroundOperators < Cop
         include PrecedingFollowingAlignment
 
-        IRREGULAR_METHODS = %i([] ! []=).freeze
+        IRREGULAR_METHODS = %i[[] ! []=].freeze
 
         def on_pair(node)
           return unless node.hash_rocket?

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

@@ -9,7 +9,7 @@ module RuboCop
 
         def specifics
           [
-            %i(tLBRACK tLBRACK2),
+            %i[tLBRACK tLBRACK2],
             :tRBRACK,
             'square brackets'
           ]

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

@@ -8,7 +8,7 @@ module RuboCop
         include SpaceInside
 
         def specifics
-          [%i(tLPAREN tLPAREN2), :tRPAREN, 'parentheses']
+          [%i[tLPAREN tLPAREN2], :tRPAREN, 'parentheses']
         end
       end
     end

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

@@ -19,19 +19,19 @@ module RuboCop
           :$0 => [:$PROGRAM_NAME],
           :$! => [:$ERROR_INFO],
           :$@ => [:$ERROR_POSITION],
-          :$; => %i($FIELD_SEPARATOR $FS),
-          :$, => %i($OUTPUT_FIELD_SEPARATOR $OFS),
-          :$/ => %i($INPUT_RECORD_SEPARATOR $RS),
-          :$\ => %i($OUTPUT_RECORD_SEPARATOR $ORS),
-          :$. => %i($INPUT_LINE_NUMBER $NR),
+          :$; => %i[$FIELD_SEPARATOR $FS],
+          :$, => %i[$OUTPUT_FIELD_SEPARATOR $OFS],
+          :$/ => %i[$INPUT_RECORD_SEPARATOR $RS],
+          :$\ => %i[$OUTPUT_RECORD_SEPARATOR $ORS],
+          :$. => %i[$INPUT_LINE_NUMBER $NR],
           :$_ => [:$LAST_READ_LINE],
           :$> => [:$DEFAULT_OUTPUT],
           :$< => [:$DEFAULT_INPUT],
-          :$$ => %i($PROCESS_ID $PID),
+          :$$ => %i[$PROCESS_ID $PID],
           :$? => [:$CHILD_STATUS],
           :$~ => [:$LAST_MATCH_INFO],
           :$= => [:$IGNORECASE],
-          :$* => %i($ARGV ARGV),
+          :$* => %i[$ARGV ARGV],
           :$& => [:$MATCH],
           :$` => [:$PREMATCH],
           :$' => [:$POSTMATCH],
@@ -51,12 +51,12 @@ module RuboCop
         PERL_VARS.each { |_, v| v.freeze }.freeze
 
         # Anything *not* in this set is provided by the English library.
-        NON_ENGLISH_VARS = Set.new(%i(
+        NON_ENGLISH_VARS = Set.new(%i[
                                      $LOAD_PATH
                                      $LOADED_FEATURES
                                      $PROGRAM_NAME
                                      ARGV
-                                   )).freeze
+                                   ]).freeze
 
         def on_gvar(node)
           global_var, = *node
@@ -126,7 +126,7 @@ module RuboCop
           parent_type = node.parent && node.parent.type
           preferred_name = preferred_names(global_var).first
 
-          unless %i(dstr xstr regexp).include?(parent_type)
+          unless %i[dstr xstr regexp].include?(parent_type)
             return preferred_name.to_s
           end
 

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

@@ -13,7 +13,7 @@ module RuboCop
       #   something.map(&:upcase)
       class SymbolProc < Cop
         MSG = 'Pass `&:%s` as an argument to `%s` instead of a block.'.freeze
-        SUPER_TYPES = %i(super zsuper).freeze
+        SUPER_TYPES = %i[super zsuper].freeze
 
         def_node_matcher :proc_node?, '(send (const nil :Proc) :new)'
         def_node_matcher :symbol_proc?, <<-PATTERN
@@ -31,7 +31,7 @@ module RuboCop
             # configurable - https://github.com/bbatsov/rubocop/issues/1485
             # we should ignore lambdas & procs
             return if proc_node?(send_or_super)
-            return if %i(lambda proc).include?(block_method_name)
+            return if %i[lambda proc].include?(block_method_name)
             return if ignored_method?(block_method_name)
             return unless can_shorten?(block_args, block_body)
 

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

@@ -5,7 +5,8 @@ module RuboCop
     module Style
       # This cop checks for the presence of parentheses around ternary
       # conditions. It is configurable to enforce inclusion or omission of
-      # parentheses using `EnforcedStyle`.
+      # parentheses using `EnforcedStyle`. Omission is only enforced when
+      # removing the parentheses won't cause a different behaviour.
       #
       # @example
       #
@@ -161,7 +162,7 @@ module RuboCop
 
         def_node_matcher :method_call_argument, <<-PATTERN
           {(:defined? $...)
-           (send {(send ...) nil} _ $(send nil _)...)}
+           (send {_ nil} _ $(send nil _)...)}
         PATTERN
 
         def_node_matcher :square_brackets?,

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

@@ -95,7 +95,7 @@ module RuboCop
 
         def looks_like_trivial_writer?(args, body)
           args.children.one? &&
-            !%i(restarg blockarg).include?(args.children[0].type) &&
+            !%i[restarg blockarg].include?(args.children[0].type) &&
             body && body.ivasgn_type? &&
             body.children[1] && body.children[1].lvar_type?
         end

data/lib/rubocop/cop/util.rb

@@ -10,14 +10,14 @@ module RuboCop
 
       BYTE_ORDER_MARK = 0xfeff # The Unicode codepoint
 
-      EQUALS_ASGN_NODES = %i(lvasgn ivasgn cvasgn gvasgn
-                             casgn masgn).freeze
-      SHORTHAND_ASGN_NODES = %i(op_asgn or_asgn and_asgn).freeze
+      EQUALS_ASGN_NODES = %i[lvasgn ivasgn cvasgn gvasgn
+                             casgn masgn].freeze
+      SHORTHAND_ASGN_NODES = %i[op_asgn or_asgn and_asgn].freeze
       ASGN_NODES = (EQUALS_ASGN_NODES + SHORTHAND_ASGN_NODES).freeze
 
-      MODIFIER_NODES = %i(if while until).freeze
+      MODIFIER_NODES = %i[if while until].freeze
       CONDITIONAL_NODES = (MODIFIER_NODES + [:case]).freeze
-      LOGICAL_OPERATOR_NODES = %i(and or).freeze
+      LOGICAL_OPERATOR_NODES = %i[and or].freeze
 
       # http://phrogz.net/programmingruby/language.html#table_18.4
       # Backtick is added last just to help editors parse this code.
@@ -236,10 +236,10 @@ module RuboCop
       end
 
       def symbol_without_quote?(string)
-        special_gvars = %w(
+        special_gvars = %w[
           $! $" $$ $& $' $* $+ $, $/ $; $: $. $< $= $> $? $@ $\\ $_ $` $~ $0
           $-0 $-F $-I $-K $-W $-a $-d $-i $-l $-p $-v $-w
-        )
+        ]
         redefinable_operators = %w(
           | ^ & <=> == === =~ > >= < <= << >>
           + - * / % ** ~ +@ -@ [] []= ` ! != !~

data/lib/rubocop/cop/variable_force.rb

@@ -35,7 +35,7 @@ module RuboCop
         :shadowarg # This means block local variable (obj.each { |arg; this| }).
       ].freeze
 
-      LOGICAL_OPERATOR_ASSIGNMENT_TYPES = %i(or_asgn and_asgn).freeze
+      LOGICAL_OPERATOR_ASSIGNMENT_TYPES = %i[or_asgn and_asgn].freeze
       OPERATOR_ASSIGNMENT_TYPES =
         (LOGICAL_OPERATOR_ASSIGNMENT_TYPES + [:op_asgn]).freeze
 
@@ -43,15 +43,15 @@ module RuboCop
 
       VARIABLE_REFERENCE_TYPE = :lvar
 
-      POST_CONDITION_LOOP_TYPES = %i(while_post until_post).freeze
-      LOOP_TYPES = (POST_CONDITION_LOOP_TYPES + %i(while until for)).freeze
+      POST_CONDITION_LOOP_TYPES = %i[while_post until_post].freeze
+      LOOP_TYPES = (POST_CONDITION_LOOP_TYPES + %i[while until for]).freeze
 
       RESCUE_TYPE = :rescue
 
       ZERO_ARITY_SUPER_TYPE = :zsuper
 
-      TWISTED_SCOPE_TYPES = %i(block class sclass defs).freeze
-      SCOPE_TYPES = (TWISTED_SCOPE_TYPES + %i(module def)).freeze
+      TWISTED_SCOPE_TYPES = %i[block class sclass defs].freeze
+      SCOPE_TYPES = (TWISTED_SCOPE_TYPES + %i[module def]).freeze
 
       SEND_TYPE = :send
 
@@ -376,14 +376,14 @@ module RuboCop
       end
 
       # Hooks invoked by VariableTable.
-      %i(
+      %i[
         before_entering_scope
         after_entering_scope
         before_leaving_scope
         after_leaving_scope
         before_declaring_variable
         after_declaring_variable
-      ).each do |hook|
+      ].each do |hook|
         define_method(hook) do |arg|
           # Invoke hook in cops.
           run_hook(hook, arg, variable_table)

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

@@ -83,7 +83,7 @@ module RuboCop
         end
 
         def method_argument?
-          argument? && %i(def defs).include?(@scope.node.type)
+          argument? && %i[def defs].include?(@scope.node.type)
         end
 
         def block_argument?
@@ -91,7 +91,7 @@ module RuboCop
         end
 
         def keyword_argument?
-          %i(kwarg kwoptarg).include?(@declaration_node.type)
+          %i[kwarg kwoptarg].include?(@declaration_node.type)
         end
 
         def explicit_block_local_variable?