Merge pull request #6773 from koic/add_range_type_predicate_method

Add `range_type?` which means `irange_type?` and `erange_type?`

lib/rubocop/ast/node.rb

@@ -471,6 +471,10 @@ def numeric_type?
         int_type? || float_type?
       end
 
+      def range_type?
+        irange_type? || erange_type?
+      end
+
       def_node_matcher :guard_clause?, <<-PATTERN
         [{(send nil? {:raise :fail} ...) return break next} single_line?]
       PATTERN

lib/rubocop/cop/correctors/for_to_each_corrector.rb

@@ -36,7 +36,7 @@ def collection_source
       end
 
       def requires_parentheses?
-        collection_node.irange_type? || collection_node.erange_type?
+        collection_node.range_type?
       end
 
       def end_position

lib/rubocop/cop/style/block_delimiters.rb

@@ -278,7 +278,7 @@ def conditional?(node)
         end
 
         def array_or_range?(node)
-          node.array_type? || node.irange_type? || node.erange_type?
+          node.array_type? || node.range_type?
         end
       end
     end

lib/rubocop/cop/style/method_call_with_args_parentheses.rb

@@ -259,16 +259,14 @@ def legitimate_call_with_parentheses?(node)
             allowed_chained_call_with_parentheses?(node)
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
         def call_in_literals?(node)
           node.parent &&
             (node.parent.pair_type? ||
              node.parent.array_type? ||
-             node.parent.irange_type? || node.parent.erange_type? ||
+             node.parent.range_type? ||
              splat?(node.parent) ||
              ternary_if?(node.parent))
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
 
         def call_in_logical_operators?(node)
           node.parent &&

lib/rubocop/cop/style/mutable_constant.rb

@@ -131,8 +131,7 @@ def frozen_string_literal?(node)
         end
 
         def requires_parentheses?(node)
-          node.irange_type? ||
-            node.erange_type? ||
+          node.range_type? ||
             (node.send_type? && node.loc.dot.nil?)
         end
 

spec/rubocop/ast/range_node_spec.rb

@@ -10,6 +10,7 @@
       end
 
       it { expect(range_node.is_a?(described_class)).to be(true) }
+      it { expect(range_node.range_type?).to be(true) }
     end
 
     context 'with an exclusive range' do
@@ -18,6 +19,7 @@
       end
 
       it { expect(range_node.is_a?(described_class)).to be(true) }
+      it { expect(range_node.range_type?).to be(true) }
     end
 
     context 'with an infinite range' do
@@ -27,6 +29,7 @@
       end
 
       it { expect(range_node.is_a?(described_class)).to be(true) }
+      it { expect(range_node.range_type?).to be(true) }
     end
   end
 end