rubocop 1.72.2 → 1.74.0

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

@@ -47,7 +47,7 @@ module RuboCop
       class RedundantFormat < Base
         extend AutoCorrector
 
-        MSG = 'Redundant `%<method_name>s` can be removed.'
+        MSG = 'Use `%<prefer>s` directly instead of `%<method_name>s`.'
 
         RESTRICT_ON_SEND = %i[format sprintf].to_set.freeze
         ACCEPTABLE_LITERAL_TYPES = %i[str dstr sym dsym numeric boolean nil].freeze
@@ -72,10 +72,20 @@ module RuboCop
           (pair (sym %1) $_)
         PATTERN
 
+        # @!method splatted_arguments?(node)
+        def_node_matcher :splatted_arguments?, <<~PATTERN
+          (send _ %RESTRICT_ON_SEND <{
+            splat
+            (hash <kwsplat ...>)
+          } ...>)
+        PATTERN
+
         def on_send(node)
           format_without_additional_args?(node) do |value|
-            add_offense(node, message: message(node)) do |corrector|
-              corrector.replace(node, value.source)
+            replacement = value.source
+
+            add_offense(node, message: message(node, replacement)) do |corrector|
+              corrector.replace(node, replacement)
             end
             return
           end
@@ -85,8 +95,8 @@ module RuboCop
 
         private
 
-        def message(node)
-          format(MSG, method_name: node.method_name)
+        def message(node, prefer)
+          format(MSG, prefer: prefer, method_name: node.method_name)
         end
 
         def detect_unnecessary_fields(node)
@@ -96,7 +106,7 @@ module RuboCop
           arguments = node.arguments[1..]
 
           return unless string && arguments.any?
-          return if arguments.any?(&:splat_type?)
+          return if splatted_arguments?(node)
 
           register_all_fields_literal(node, string, arguments)
         end
@@ -104,9 +114,11 @@ module RuboCop
         def register_all_fields_literal(node, string, arguments)
           return unless all_fields_literal?(string, arguments.dup)
 
-          add_offense(node, message: message(node)) do |corrector|
-            replacement = format(string, *argument_values(arguments))
-            corrector.replace(node, quote(replacement, node))
+          formatted_string = format(string, *argument_values(arguments))
+          replacement = quote(formatted_string, node)
+
+          add_offense(node, message: message(node, replacement)) do |corrector|
+            corrector.replace(node, replacement)
           end
         end
 
@@ -119,7 +131,7 @@ module RuboCop
             next if sequence.percent?
 
             hash = arguments.detect(&:hash_type?)
-            argument = find_argument(sequence, arguments, hash)
+            next unless (argument = find_argument(sequence, arguments, hash))
             next unless matching_argument?(sequence, argument)
 
             count += 1
@@ -160,7 +172,7 @@ module RuboCop
         end
 
         def numeric?(argument)
-          argument&.type?(:numeric, :str) ||
+          argument.type?(:numeric, :str) ||
             rational_number?(argument) ||
             complex_number?(argument)
         end

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

@@ -60,7 +60,7 @@ module RuboCop
             (begin (send !{(str _) array} {:+ :- :* :** :/ :%} {float int}))
             (begin (send _ {:== :=== :!= :<= :>= :< :>} _))
             (send _ {:count :length :size} ...)
-            (block (send _ {:count :length :size} ...) ...)
+            (any_block (send _ {:count :length :size} ...) ...)
           }
         PATTERN
       end

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

@@ -58,7 +58,7 @@ module RuboCop
         # rubocop:disable Metrics/AbcSize
         def on_lvasgn(node)
           return unless (rhs = node.rhs)
-          return unless rhs.call_type? && method_returning_self?(rhs.method_name)
+          return unless rhs.type?(:any_block, :call) && method_returning_self?(rhs.method_name)
           return unless (receiver = rhs.receiver)
 
           receiver_type = ASSIGNMENT_TYPE_TO_RECEIVER_TYPE[node.type]

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

@@ -67,11 +67,13 @@ module RuboCop
           node.parent && parentheses?(node.parent)
         end
 
+        # rubocop:disable Metrics/AbcSize
         def correct_rescue_block(corrector, node, parenthesized)
           operation = node.body
 
           node_indentation, node_offset = indentation_and_offset(node, parenthesized)
 
+          corrector.wrap(operation, '[', ']') if operation.array_type? && !operation.bracketed?
           corrector.remove(range_between(operation.source_range.end_pos, node.source_range.end_pos))
           corrector.insert_before(operation, "begin\n#{node_indentation}")
           corrector.insert_after(heredoc_end(operation) || operation, <<~RESCUE_CLAUSE.chop)
@@ -81,6 +83,7 @@ module RuboCop
             #{node_offset}end
           RESCUE_CLAUSE
         end
+        # rubocop:enable Metrics/AbcSize
 
         def indentation_and_offset(node, parenthesized)
           node_indentation = indentation(node)

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

@@ -8,9 +8,9 @@ module RuboCop
       #
       # Endless methods added in Ruby 3.0 are also accepted by this cop.
       #
-      # If `Style/EndlessMethod` is enabled with `EnforcedStyle: allow_single_line` or
-      # `allow_always`, single-line methods will be autocorrected to endless
-      # methods if there is only one statement in the body.
+      # If `Style/EndlessMethod` is enabled with `EnforcedStyle: allow_single_line`, `allow_always`,
+      # `require_single_line`, or `require_always`, single-line methods will be autocorrected
+      # to endless methods if there is only one statement in the body.
       #
       # @example
       #   # bad

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

@@ -230,12 +230,6 @@ module RuboCop
             !condition.comparison_method?
         end
 
-        def arguments_range(node)
-          range_between(
-            node.first_argument.source_range.begin_pos, node.last_argument.source_range.end_pos
-          )
-        end
-
         def wrap_condition?(node)
           node.operator_keyword? || (node.call_type? && node.arguments.any? && !node.parenthesized?)
         end

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

@@ -128,7 +128,7 @@ module RuboCop
         end
 
         def uncorrectable?(part)
-          part.multiline? || heredoc?(part) || part.each_descendant(:block).any?
+          part.multiline? || heredoc?(part) || part.each_descendant(:any_block).any?
         end
 
         def heredoc?(node)

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

@@ -6,12 +6,13 @@ module RuboCop
       # Checks for trailing comma in array literals.
       # The configuration options are:
       #
-      # * `consistent_comma`: Requires a comma after the
-      # last item of all non-empty, multiline array literals.
-      # * `comma`: Requires a comma after last item in an array,
-      # but only when each item is on its own line.
-      # * `no_comma`: Does not require a comma after the
-      # last item in an array
+      # * `consistent_comma`: Requires a comma after the last item of all non-empty, multiline array
+      # literals.
+      # * `comma`: Requires a comma after the last item in an array, but only when each item is on
+      # its own line.
+      # * `diff_comma`: Requires a comma after the last item in an array, but only when that item is
+      # followed by an immediate newline.
+      # * `no_comma`: Does not require a comma after the last item in an array
       #
       # @example EnforcedStyleForMultiline: consistent_comma
       #   # bad
@@ -37,6 +38,14 @@ module RuboCop
       #     2,
       #   ]
       #
+      #   # bad
+      #   a = [1, 2,
+      #        3, 4]
+      #
+      #   # good
+      #   a = [1, 2,
+      #        3, 4,]
+      #
       # @example EnforcedStyleForMultiline: comma
       #   # bad
       #   a = [1, 2,]
@@ -72,6 +81,38 @@ module RuboCop
       #     2,
       #   ]
       #
+      # @example EnforcedStyleForMultiline: diff_comma
+      #   # bad
+      #   a = [1, 2,]
+      #
+      #   # good
+      #   a = [1, 2]
+      #
+      #   # good
+      #   a = [
+      #     1, 2,
+      #     3,
+      #   ]
+      #
+      #   # good
+      #   a = [
+      #     1, 2, 3,
+      #   ]
+      #
+      #   # good
+      #   a = [
+      #     1,
+      #     2,
+      #   ]
+      #
+      #   # bad
+      #   a = [1, 2,
+      #        3, 4,]
+      #
+      #   # good
+      #   a = [1, 2,
+      #        3, 4]
+      #
       # @example EnforcedStyleForMultiline: no_comma (default)
       #   # bad
       #   a = [1, 2,]

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

@@ -6,12 +6,13 @@ module RuboCop
       # Checks for trailing comma in hash literals.
       # The configuration options are:
       #
-      # * `consistent_comma`: Requires a comma after the
-      # last item of all non-empty, multiline hash literals.
-      # * `comma`: Requires a comma after the last item in a hash,
-      # but only when each item is on its own line.
-      # * `no_comma`: Does not require a comma after the
-      # last item in a hash
+      # * `consistent_comma`: Requires a comma after the last item of all non-empty, multiline hash
+      # literals.
+      # * `comma`: Requires a comma after the last item in a hash, but only when each item is on its
+      # own line.
+      # * `diff_comma`: Requires a comma after the last item in a hash, but only when that item is
+      # followed by an immediate newline.
+      # * `no_comma`: Does not require a comma after the last item in a hash
       #
       # @example EnforcedStyleForMultiline: consistent_comma
       #
@@ -38,6 +39,14 @@ module RuboCop
       #     bar: 2,
       #   }
       #
+      #   # bad
+      #   a = { foo: 1, bar: 2,
+      #         baz: 3, qux: 4 }
+      #
+      #   # good
+      #   a = { foo: 1, bar: 2,
+      #         baz: 3, qux: 4, }
+      #
       # @example EnforcedStyleForMultiline: comma
       #
       #   # bad
@@ -74,6 +83,39 @@ module RuboCop
       #     bar: 2,
       #   }
       #
+      # @example EnforcedStyleForMultiline: diff_comma
+      #
+      #   # bad
+      #   a = { foo: 1, bar: 2, }
+      #
+      #   # good
+      #   a = { foo: 1, bar: 2 }
+      #
+      #   # good
+      #   a = {
+      #     foo: 1, bar: 2,
+      #     qux: 3,
+      #   }
+      #
+      #   # good
+      #   a = {
+      #     foo: 1, bar: 2, qux: 3,
+      #   }
+      #
+      #   # good
+      #   a = {
+      #     foo: 1,
+      #     bar: 2,
+      #   }
+      #
+      #   # bad
+      #   a = { foo: 1, bar: 2,
+      #         baz: 3, qux: 4, }
+      #
+      #   # good
+      #   a = { foo: 1, bar: 2,
+      #         baz: 3, qux: 4 }
+      #
       # @example EnforcedStyleForMultiline: no_comma (default)
       #
       #   # bad

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

@@ -113,7 +113,7 @@ module RuboCop
         private
 
         def in_module_or_instance_eval?(node)
-          node.each_ancestor(:block, :class, :sclass, :module).each do |pnode|
+          node.each_ancestor(:any_block, :class, :sclass, :module).each do |pnode|
             case pnode.type
             when :class, :sclass
               return false

data/lib/rubocop/cop/utils/format_string.rb

@@ -5,8 +5,11 @@ module RuboCop
     module Utils
       # Parses {Kernel#sprintf} format strings.
       class FormatString
+        # Escaping the `#` in `INTERPOLATION` and `TEMPLATE_NAME` is necessary to
+        # avoid a bug in Ruby 3.2.0
+        # See: https://bugs.ruby-lang.org/issues/19379
         DIGIT_DOLLAR  = /(?<arg_number>\d+)\$/.freeze
-        INTERPOLATION = /#\{.*?\}/.freeze
+        INTERPOLATION = /\#\{.*?\}/.freeze
         FLAG          = /[ #0+-]|#{DIGIT_DOLLAR}/.freeze
         NUMBER_ARG    = /\*#{DIGIT_DOLLAR}?/.freeze
         NUMBER        = /\d+|#{NUMBER_ARG}|#{INTERPOLATION}/.freeze
@@ -14,7 +17,7 @@ module RuboCop
         PRECISION     = /\.(?<precision>#{NUMBER}?)/.freeze
         TYPE          = /(?<type>[bBdiouxXeEfgGaAcps])/.freeze
         NAME          = /<(?<name>\w+)>/.freeze
-        TEMPLATE_NAME = /(?<!#)\{(?<name>\w+)\}/.freeze
+        TEMPLATE_NAME = /(?<!\#)\{(?<name>\w+)\}/.freeze
 
         SEQUENCE = /
             % (?<type>%)

data/lib/rubocop/cops_documentation_generator.rb

@@ -28,6 +28,12 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
   #
   #   CopsDocumentationGenerator.new(departments: ['Lint']).call
   #
+  # For plugin extensions, specify `:plugin_name` keyword as follows:
+  #
+  #   CopsDocumentationGenerator.new(
+  #     departments: ['Performance'], plugin_name: 'rubocop-performance'
+  #   ).call
+  #
   # You can append additional information:
   #
   #   callback = ->(data) { required_rails_version(data.cop) }
@@ -36,11 +42,16 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
   # This will insert the string returned from the lambda _after_ the section from RuboCop itself.
   # See `CopsDocumentationGenerator::STRUCTURE` for available sections.
   #
-  def initialize(departments: [], extra_info: {}, base_dir: Dir.pwd)
+  def initialize(departments: [], extra_info: {}, base_dir: Dir.pwd, plugin_name: nil)
     @departments = departments.map(&:to_sym).sort!
     @extra_info = extra_info
     @cops = RuboCop::Cop::Registry.global
     @config = RuboCop::ConfigLoader.default_configuration
+    # NOTE: For example, this prevents excessive plugin loading before another task executes,
+    # in cases where plugins are already loaded by `internal_investigation`.
+    if plugin_name && @config.loaded_plugins.none? { |plugin| plugin.about.name == plugin_name }
+      RuboCop::Plugin.integrate_plugins(RuboCop::Config.new, [plugin_name])
+    end
     @base_dir = base_dir
     @docs_path = "#{base_dir}/docs/modules/ROOT"
     FileUtils.mkdir_p("#{@docs_path}/pages")

data/lib/rubocop/directive_comment.rb

@@ -12,7 +12,7 @@ module RuboCop
     # @api private
     LINT_SYNTAX_COP = "#{LINT_DEPARTMENT}/Syntax"
     # @api private
-    COP_NAME_PATTERN = '([A-Z]\w+/)*(?:[A-Z]\w+)'
+    COP_NAME_PATTERN = '([A-Za-z]\w+/)*(?:[A-Za-z]\w+)'
     # @api private
     COP_NAMES_PATTERN = "(?:#{COP_NAME_PATTERN} , )*#{COP_NAME_PATTERN}"
     # @api private

data/lib/rubocop/ext/regexp_node.rb

@@ -43,7 +43,6 @@ module RuboCop
       def named_capturing?(exp, event, named)
         event == :enter &&
           named == exp.respond_to?(:name) &&
-          !exp.text.start_with?('(?<=') &&
           exp.respond_to?(:capturing?) &&
           exp.capturing?
       end

data/lib/rubocop/plugin/load_error.rb

@@ -15,7 +15,7 @@ module RuboCop
         <<~MESSAGE
           Failed to load plugin `#{@plugin_name}` because the corresponding plugin class could not be determined for instantiation.
           Try upgrading it first (e.g., `bundle update #{@plugin_name}`).
-          If `#{@plugin_name}` is not yet a plugin, use `require: #{@plugin_name}` instead of `plugins: `#{@plugin_name}` in your configuration.
+          If `#{@plugin_name}` is not yet a plugin, use `require: #{@plugin_name}` instead of `plugins: #{@plugin_name}` in your configuration.
 
           For further assistance, check with the developer regarding the following points:
           https://docs.rubocop.org/rubocop/plugin_migration_guide.html

data/lib/rubocop/plugin.rb

@@ -22,9 +22,16 @@ module RuboCop
       def plugin_capable?(feature_name)
         return true if BUILTIN_INTERNAL_PLUGINS.key?(feature_name)
         return true if feature_name == OBSOLETE_INTERNAL_AFFAIRS_PLUGIN_NAME
-        return false unless (gem = Gem.loaded_specs[feature_name])
 
-        !!gem.metadata['default_lint_roller_plugin']
+        begin
+          # When not using Bundler. Makes the spec available but does not require it.
+          gem feature_name
+        rescue Gem::LoadError
+          # The user requested a gem that they do not have installed
+        end
+        return false unless (spec = Gem.loaded_specs[feature_name])
+
+        !!spec.metadata['default_lint_roller_plugin']
       end
 
       def integrate_plugins(rubocop_config, plugins)

data/lib/rubocop/rspec/shared_contexts.rb

@@ -80,6 +80,21 @@ RSpec.shared_context 'maintain registry' do
   end
 end
 
+RSpec.shared_context 'maintain default configuration' do
+  around(:each) do |example|
+    # Make a copy of the current configuration that will not change when source hash changes
+    default_configuration = RuboCop::ConfigLoader.default_configuration
+    config = RuboCop::Config.create(
+      default_configuration.to_h.clone,
+      default_configuration.loaded_path
+    )
+
+    example.run
+
+    RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, config)
+  end
+end
+
 # This context assumes nothing and defines `cop`, among others.
 RSpec.shared_context 'config' do # rubocop:disable Metrics/BlockLength
   ### Meant to be overridden at will

data/lib/rubocop/rspec/support.rb

@@ -15,6 +15,7 @@ RSpec.configure do |config|
   config.include_context 'isolated bundler', :isolated_bundler
   config.include_context 'lsp', :lsp
   config.include_context 'maintain registry', :restore_registry
+  config.include_context 'maintain default configuration', :restore_configuration
   config.include_context 'ruby 2.0', :ruby20
   config.include_context 'ruby 2.1', :ruby21
   config.include_context 'ruby 2.2', :ruby22

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.72.2'
+    STRING = '1.74.0'
 
     MSG = '%<version>s (using %<parser_version>s, ' \
           'rubocop-ast %<rubocop_ast_version>s, ' \

data/lib/rubocop.rb

@@ -148,7 +148,6 @@ require_relative 'rubocop/cop/mixin/comments_help' # relies on visibility_help
 require_relative 'rubocop/cop/mixin/def_node' # relies on visibility_help
 
 require_relative 'rubocop/cop/utils/format_string'
-require_relative 'rubocop/cop/utils/regexp_ranges'
 
 require_relative 'rubocop/cop/migration/department_name'
 
@@ -510,6 +509,7 @@ require_relative 'rubocop/cop/style/combinable_loops'
 require_relative 'rubocop/cop/style/command_literal'
 require_relative 'rubocop/cop/style/comment_annotation'
 require_relative 'rubocop/cop/style/commented_keyword'
+require_relative 'rubocop/cop/style/comparable_between'
 require_relative 'rubocop/cop/style/comparable_clamp'
 require_relative 'rubocop/cop/style/concat_array_literals'
 require_relative 'rubocop/cop/style/conditional_assignment'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.72.2
+  version: 1.74.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -9,7 +9,7 @@ authors:
 - Yuji Nakayama
 bindir: exe
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -297,6 +297,7 @@ files:
 - lib/rubocop/cop/internal_affairs/node_pattern_groups.rb
 - lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_processor.rb
 - lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_walker.rb
+- lib/rubocop/cop/internal_affairs/node_type_group.rb
 - lib/rubocop/cop/internal_affairs/node_type_multiple_predicates.rb
 - lib/rubocop/cop/internal_affairs/node_type_predicate.rb
 - lib/rubocop/cop/internal_affairs/numblock_handler.rb
@@ -728,6 +729,7 @@ files:
 - lib/rubocop/cop/style/command_literal.rb
 - lib/rubocop/cop/style/comment_annotation.rb
 - lib/rubocop/cop/style/commented_keyword.rb
+- lib/rubocop/cop/style/comparable_between.rb
 - lib/rubocop/cop/style/comparable_clamp.rb
 - lib/rubocop/cop/style/concat_array_literals.rb
 - lib/rubocop/cop/style/conditional_assignment.rb
@@ -971,7 +973,6 @@ files:
 - lib/rubocop/cop/team.rb
 - lib/rubocop/cop/util.rb
 - lib/rubocop/cop/utils/format_string.rb
-- lib/rubocop/cop/utils/regexp_ranges.rb
 - lib/rubocop/cop/variable_force.rb
 - lib/rubocop/cop/variable_force/assignment.rb
 - lib/rubocop/cop/variable_force/branch.rb
@@ -1075,9 +1076,9 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://rubocop.org/
-  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.72.2
+  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.74.0
   source_code_uri: https://github.com/rubocop/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.72/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.74/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
   rubygems_mfa_required: 'true'
 rdoc_options: []

data/lib/rubocop/cop/utils/regexp_ranges.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Utils
-      # Helper to abstract complexity of building range pairs
-      # with octal escape reconstruction (needed for regexp_parser < 2.7).
-      class RegexpRanges
-        attr_reader :root
-
-        def initialize(root)
-          @root = root
-          @compound_token = []
-          @pairs = []
-          @populated = false
-        end
-
-        def compound_token
-          populate_all unless @populated
-
-          @compound_token
-        end
-
-        def pairs
-          populate_all unless @populated
-
-          @pairs
-        end
-
-        private
-
-        def populate_all
-          populate(@root)
-
-          # If either bound is a compound the first one is an escape
-          # and that's all we need to work with.
-          # If there are any cops that wanted to operate on the compound
-          # expression we could wrap it with a facade class.
-          @pairs.map! { |pair| pair.map(&:first) }
-
-          @populated = true
-        end
-
-        def populate(expr)
-          expressions = expr.expressions.to_a
-
-          until expressions.empty?
-            current = expressions.shift
-
-            if escaped_octal?(current)
-              @compound_token << current
-              @compound_token.concat(pop_octal_digits(expressions))
-              # If we have all the digits we can discard.
-            end
-
-            next unless current.type == :set
-
-            process_set(expressions, current)
-            @compound_token.clear
-          end
-        end
-
-        def process_set(expressions, current)
-          case current.token
-          when :range
-            @pairs << compose_range(expressions, current)
-          when :character
-            # Child expressions may include the range we are looking for.
-            populate(current)
-          when :intersection
-            # Each child expression could have child expressions that lead to ranges.
-            current.expressions.each do |intersected|
-              populate(intersected)
-            end
-          end
-        end
-
-        def compose_range(expressions, current)
-          range_start, range_end = current.expressions
-          range_start = if @compound_token.size.between?(1, 2) && octal_digit?(range_start.text)
-                          @compound_token.dup << range_start
-                        else
-                          [range_start]
-                        end
-          range_end = [range_end]
-          range_end.concat(pop_octal_digits(expressions)) if escaped_octal?(range_end.first)
-          [range_start, range_end]
-        end
-
-        def escaped_octal?(expr)
-          expr.text.valid_encoding? && expr.text =~ /^\\[0-7]$/
-        end
-
-        def octal_digit?(char)
-          ('0'..'7').cover?(char)
-        end
-
-        def pop_octal_digits(expressions)
-          digits = []
-
-          2.times do
-            next unless (next_child = expressions.first)
-            next unless next_child.type == :literal && next_child.text =~ /^[0-7]$/
-
-            digits << expressions.shift
-          end
-
-          digits
-        end
-      end
-    end
-  end
-end