rubocop 1.81.7 → 1.85.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8acfafa4ed4b94c367e6ef95c84d2d02f01222a1e8a813790948977476f34456
-  data.tar.gz: 0d2ad56c4a81da58046a098351606bfb8314f09f9e5f946ad1dd825aa70fe0f7
+  metadata.gz: d0878d77ab8d3571eaa4e50ac6d4c89bac50ba7b36a740b944293dff7e60e3c5
+  data.tar.gz: 21f33042b5a670b5da1b58cbdee49a6250f537326881e34b2766c40a4d9a9f3b
 SHA512:
-  metadata.gz: ae4edea22ca7511df39ec99591df3d537bfd3fa8974d5bb461d2b1c674b48f15296f22c81b1cd9329719a68b0d3f8d36442eaa5742cbf8e0974c6e3e2e56e29c
-  data.tar.gz: ffce467cec50d2ed0ef7b312a15dd17e9b7fd1622b70528d12f0cfe16056ae3b5111f2d360b4e855ea5811befd092a306ff56ad091b89a6050f3354f3db205a4
+  metadata.gz: 87cec420dd37c3c60d6112b9e6ced643ee22fb5b4c95148d714876fb0bfc8171634dd9b39ac6a0f7be7373e59c960a6bdbc74c01489daad3e9fcc7dbddb78e0d
+  data.tar.gz: 3f7c8637950adec215950b600ef61565b8847f1ba90f82f0ec9720ea6e7d4215f9d0312247324ea0976e4829b1bd3de3b11a4662d0a2a865433825d42779e7be

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-25 Bozhidar Batsov
+Copyright (c) 2012-26 Bozhidar Batsov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -51,7 +51,7 @@ To prevent an unwanted RuboCop update you might want to use a conservative versi
 in your `Gemfile`:
 
 ```rb
-gem 'rubocop', '~> 1.81', require: false
+gem 'rubocop', '~> 1.82', require: false
 ```
 
 See [our versioning policy](https://docs.rubocop.org/rubocop/versioning.html) for further details.
@@ -251,5 +251,5 @@ RuboCop's release notes are available [here](https://github.com/rubocop/rubocop/
 
 ## Copyright
 
-Copyright (c) 2012-2025 Bozhidar Batsov. See [LICENSE.txt](LICENSE.txt) for
+Copyright (c) 2012-2026 Bozhidar Batsov. See [LICENSE.txt](LICENSE.txt) for
 further details.

data/config/default.yml

@@ -835,6 +835,7 @@ Layout/FirstArrayElementLineBreak:
                  multi-line array.
   Enabled: false
   VersionAdded: '0.49'
+  AllowImplicitArrayLiterals: false
   AllowMultilineFinalElement: false
 
 Layout/FirstHashElementIndentation:
@@ -1037,6 +1038,15 @@ Layout/IndentationWidth:
   VersionAdded: '0.49'
   # Number of spaces for each indentation level.
   Width: 2
+  # Block body indentation for method chain blocks.
+  # The value `start_of_line` means that block bodies are indented
+  # relative to the start of the line where the block starts.
+  # The value `relative_to_receiver` means that block bodies are indented
+  # relative to the method call position in the chain.
+  EnforcedStyleAlignWith: start_of_line
+  SupportedStylesAlignWith:
+    - start_of_line
+    - relative_to_receiver
   AllowedPatterns: []
 
 Layout/InitialIndentation:
@@ -1102,7 +1112,7 @@ Layout/LineLength:
   StyleGuide: '#max-line-length'
   Enabled: true
   VersionAdded: '0.25'
-  VersionChanged: '1.69'
+  VersionChanged: '1.82'
   Max: 120
   AllowHeredoc: true
   # To make it possible to copy or click on URIs in the code, we allow lines
@@ -1112,9 +1122,12 @@ Layout/LineLength:
   URISchemes:
     - http
     - https
-  # The IgnoreCopDirectives option causes the LineLength rule to ignore cop
+  # The AllowRBSInlineAnnotation option makes LineLength allow RBS::Inline annotations
+  # such as `#: (?date: Date) -> Foo` when calculating line length.
+  AllowRBSInlineAnnotation: false
+  # The AllowCopDirectives option causes the LineLength rule to ignore cop
   # directives like '# rubocop: enable ...' when calculating a line's length.
-  IgnoreCopDirectives: true
+  AllowCopDirectives: true
   # The AllowedPatterns option is a list of !ruby/regexp and/or string
   # elements. Strings will be converted to Regexp objects. A line that matches
   # any regular expression listed in this option will be ignored by LineLength.
@@ -1707,6 +1720,11 @@ Lint/CopDirectiveSyntax:
   Enabled: pending
   VersionAdded: '1.72'
 
+Lint/DataDefineOverride:
+  Description: 'Disallow overriding the `Data` built-in methods via `Data.define`.'
+  Enabled: pending
+  VersionAdded: '1.85'
+
 Lint/Debugger:
   Description: 'Checks for debugger calls.'
   Enabled: true
@@ -2396,8 +2414,9 @@ Lint/SafeNavigationConsistency:
                  consistent and appropriate safe navigation, without excess or deficiency,
                  is used for all method calls on the same object.
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '0.55'
-  VersionChanged: '0.77'
+  VersionChanged: '1.85'
   AllowedMethods:
     - present?
     - blank?
@@ -2574,6 +2593,11 @@ Lint/UnreachableLoop:
     # eg. `exactly(2).times`
     - !ruby/regexp /(exactly|at_least|at_most)\(\d+\)\.times/
 
+Lint/UnreachablePatternBranch:
+  Description: 'Checks for unreachable `in` pattern branches after an unconditional catch-all pattern.'
+  Enabled: pending
+  VersionAdded: '1.85'
+
 Lint/UnusedBlockArgument:
   Description: 'Checks for unused block arguments.'
   StyleGuide: '#underscore-unused-vars'
@@ -2669,7 +2693,10 @@ Lint/UselessNumericOperation:
 Lint/UselessOr:
   Description: 'Checks for useless OR expressions.'
   Enabled: pending
+  SafeAutoCorrect: false
+  AutoCorrect: contextual
   VersionAdded: '1.76'
+  VersionChanged: '1.82'
 
 Lint/UselessRescue:
   Description: 'Checks for useless `rescue`s.'
@@ -3097,6 +3124,7 @@ Naming/PredicateMethod:
   AllowBangMethods: false
   # Methods that are known to not return a boolean value, despite ending in `?`.
   WaywardPredicates:
+    - infinite?
     - nonzero?
 
 Naming/PredicatePrefix:
@@ -3281,7 +3309,7 @@ Style/Alias:
 
 Style/AmbiguousEndlessMethodDefinition:
   Description: 'Checks for endless methods inside operators of lower precedence.'
-  StyleGuide: '#ambiguous-endless-method-defintions'
+  StyleGuide: '#ambiguous-endless-method-definitions'
   Enabled: pending
   VersionAdded: '1.68'
 
@@ -3525,9 +3553,11 @@ Style/BlockDelimiters:
   BracesRequiredMethods: []
 
 Style/CaseEquality:
-  Description: 'Avoid explicit use of the case equality operator(===).'
+  Description: 'Avoid explicit use of the case equality operator (`===`).'
   StyleGuide: '#no-case-equality'
   Enabled: true
+  References:
+    - 'https://docs.rubocop.org/rubocop-performance/cops_performance.html#performanceregexpmatch'
   VersionAdded: '0.9'
   VersionChanged: '0.89'
   # If `AllowOnConstant` option is enabled, the cop will ignore violations when the receiver of
@@ -3959,6 +3989,16 @@ Style/EmptyCaseCondition:
   Enabled: true
   VersionAdded: '0.40'
 
+Style/EmptyClassDefinition:
+  Description: 'Enforces consistent style for empty class definitions.'
+  Enabled: pending
+  VersionAdded: '1.84'
+  EnforcedStyle: class_keyword
+  SupportedStyles:
+    - class_keyword
+    - class_new
+    - class_definition # Deprecated.
+
 Style/EmptyElse:
   Description: 'Avoid empty else-clauses.'
   Enabled: true
@@ -4117,6 +4157,12 @@ Style/FileNull:
   SafeAutoCorrect: false
   VersionAdded: '1.69'
 
+Style/FileOpen:
+  Description: 'Checks for `File.open` without a block, which can leak file descriptors.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.85'
+
 Style/FileRead:
   Description: 'Favor `File.(bin)read` convenience methods.'
   StyleGuide: '#file-read'
@@ -4310,6 +4356,16 @@ Style/HashLikeCase:
   # to trigger this cop
   MinBranchesCount: 3
 
+Style/HashLookupMethod:
+  Description: 'Enforces the use of either `Hash#[]` or `Hash#fetch` for hash lookup.'
+  Enabled: false
+  Safe: false
+  VersionAdded: '1.84'
+  EnforcedStyle: brackets
+  SupportedStyles:
+    - brackets
+    - fetch
+
 Style/HashSlice:
   Description: >-
                  Checks for usages of `Hash#reject`, `Hash#select`, and `Hash#filter` methods
@@ -4407,6 +4463,7 @@ Style/IfWithBooleanLiteralBranches:
   VersionAdded: '1.9'
   SafeAutoCorrect: false
   AllowedMethods:
+    - infinite?
     - nonzero?
 
 Style/IfWithSemicolon:
@@ -4603,6 +4660,12 @@ Style/MapIntoArray:
   VersionChanged: '1.67'
   Safe: false
 
+Style/MapJoin:
+  Description: 'Checks for redundant `map(&:to_s)` before `join`.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.85'
+
 Style/MapToHash:
   Description: 'Prefer `to_h` with a block over `map.to_h`.'
   Enabled: pending
@@ -4625,6 +4688,7 @@ Style/MethodCallWithArgsParentheses:
   AllowedMethods: []
   AllowedPatterns: []
   IncludedMacros: []
+  IncludedMacroPatterns: []
   AllowParenthesesInMultilineCall: false
   AllowParenthesesInChaining: false
   AllowParenthesesInCamelCaseMethod: false
@@ -4735,6 +4799,12 @@ Style/ModuleFunction:
   Autocorrect: false
   SafeAutoCorrect: false
 
+Style/ModuleMemberExistenceCheck:
+  Description: 'Checks for usage of `Module` methods returning arrays that can be replaced with equivalent predicates.'
+  Enabled: pending
+  VersionAdded: '1.82'
+  AllowedMethods: []
+
 Style/MultilineBlockChain:
   Description: 'Avoid multi-line chains of blocks.'
   StyleGuide: '#single-line-blocks'
@@ -4862,6 +4932,14 @@ Style/NegatedWhile:
   Enabled: true
   VersionAdded: '0.20'
 
+Style/NegativeArrayIndex:
+  Description: >-
+    Use negative array indices instead of calculating array length minus a value.
+    Also handles range patterns with length calculations. Recognizes preserving methods
+    and their combinations, allowing safe replacement when the receiver matches.
+  Enabled: pending
+  VersionAdded: '1.84'
+
 Style/NestedFileDirname:
   Description: 'Checks for nested `File.dirname`.'
   Enabled: pending
@@ -5037,6 +5115,12 @@ Style/ObjectThen:
     - then
     - yield_self
 
+Style/OneClassPerFile:
+  Description: 'Checks that each source file defines at most one top-level class or module.'
+  Enabled: pending
+  VersionAdded: '1.85'
+  AllowedClasses: []
+
 Style/OneLineConditional:
   Description: >-
                  Favor the ternary operator (?:) or multi-line constructs over
@@ -5125,6 +5209,14 @@ Style/ParenthesesAroundCondition:
   AllowSafeAssignment: true
   AllowInMultilineConditions: false
 
+Style/PartitionInsteadOfDoubleSelect:
+  Description: >-
+                Checks for consecutive `select`/`filter`/`find_all` and `reject` calls
+                on the same receiver with the same block body.
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.85'
+
 Style/PercentLiteralDelimiters:
   Description: 'Use `%`-literal delimiters consistently.'
   StyleGuide: '#percent-literal-braces'
@@ -5157,6 +5249,12 @@ Style/PerlBackrefs:
   Enabled: true
   VersionAdded: '0.13'
 
+Style/PredicateWithKind:
+  Description: 'Prefer `any?(Klass)` to `any? { |x| x.is_a?(Klass) }`.'
+  Enabled: pending
+  SafeAutoCorrect: false
+  VersionAdded: '1.85'
+
 Style/PreferredHashMethods:
   Description: 'Checks use of `has_key?` and `has_value?` Hash methods.'
   StyleGuide: '#hash-key'
@@ -5207,6 +5305,12 @@ Style/RandomWithOffset:
   Enabled: true
   VersionAdded: '0.52'
 
+Style/ReduceToHash:
+  Description: 'Use `to_h { ... }` instead of `each_with_object`, `inject`, or `reduce` to build a hash.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.85'
+
 Style/RedundantArgument:
   Description: 'Checks for a redundant argument passed to certain methods.'
   Enabled: pending
@@ -5222,6 +5326,8 @@ Style/RedundantArgument:
     exit: true
     # Kernel.#exit!
     exit!: false
+    # String#to_i
+    to_i: 10
     # String#split
     split: ' '
     # String#chomp
@@ -5263,6 +5369,7 @@ Style/RedundantCondition:
   VersionAdded: '0.76'
   VersionChanged: '1.73'
   AllowedMethods:
+    - infinite?
     - nonzero?
 
 Style/RedundantConditional:
@@ -5373,6 +5480,11 @@ Style/RedundantLineContinuation:
   Enabled: pending
   VersionAdded: '1.49'
 
+Style/RedundantMinMaxBy:
+  Description: 'Identifies places where `max_by`/`min_by` can be replaced by `max`/`min`.'
+  Enabled: pending
+  VersionAdded: '1.85'
+
 Style/RedundantParentheses:
   Description: "Checks for parentheses that seem not to serve any purpose."
   Enabled: true
@@ -5450,6 +5562,12 @@ Style/RedundantStringEscape:
   Enabled: pending
   VersionAdded: '1.37'
 
+Style/RedundantStructKeywordInit:
+  Description: 'Checks for redundant `keyword_init` option for `Struct.new`.'
+  Enabled: pending
+  SafeAutoCorrect: false
+  VersionAdded: '1.85'
+
 Style/RegexpLiteral:
   Description: 'Use / or %r around regular expressions.'
   StyleGuide: '#percent-r'
@@ -5511,6 +5629,12 @@ Style/ReturnNilInPredicateMethodDefinition:
   VersionAdded: '1.53'
   VersionChanged: '1.67'
 
+Style/ReverseFind:
+  Description: 'Use `array.rfind` instead of `array.reverse.find`.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.84'
+
 Style/SafeNavigation:
   Description: >-
                   Transforms usages of a method call safeguarded by
@@ -5550,8 +5674,20 @@ Style/Sample:
   Enabled: true
   VersionAdded: '0.30'
 
+Style/SelectByKind:
+  Description: 'Prefer grep/grep_v to select/reject/find/detect with a kind check.'
+  Enabled: pending
+  SafeAutoCorrect: false
+  VersionAdded: '1.85'
+
+Style/SelectByRange:
+  Description: 'Prefer grep/grep_v to select/reject/find/detect with a range check.'
+  Enabled: pending
+  SafeAutoCorrect: false
+  VersionAdded: '1.85'
+
 Style/SelectByRegexp:
-  Description: 'Prefer grep/grep_v to select/reject with a regexp match.'
+  Description: 'Prefer grep/grep_v to select/reject/find/detect with a regexp match.'
   Enabled: pending
   SafeAutoCorrect: false
   VersionAdded: '1.22'
@@ -5810,6 +5946,12 @@ Style/SymbolProc:
   AllowedPatterns: []
   AllowComments: false
 
+Style/TallyMethod:
+  Description: 'Prefer `Enumerable#tally` over manual counting patterns.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.85'
+
 Style/TernaryParentheses:
   Description: 'Checks for use of parentheses around ternary conditions.'
   Enabled: true

data/config/obsoletion.yml

@@ -145,6 +145,10 @@ changed_parameters:
   - cops: Layout/CaseIndentation
     parameters: IndentWhenRelativeTo
     alternative: EnforcedStyle
+  - cops: Layout/LineLength
+    parameters: IgnoreCopDirectives
+    alternative: AllowCopDirectives
+    severity: warning
   - cops:
       - Lint/BlockAlignment
       - Layout/BlockAlignment
@@ -241,3 +245,8 @@ changed_enforced_styles:
     parameters: EnforcedStyle
     value: rails
     alternative: indented_internal_methods
+  - cops: Style/EmptyClassDefinition
+    parameters: EnforcedStyle
+    value: class_definition
+    alternative: class_keyword
+    severity: warning

data/lib/rubocop/cache_config.rb

@@ -25,5 +25,34 @@ module RuboCop
 
       File.join(root, 'rubocop_cache')
     end
+
+    # Lightweight cache root computation that reads CacheRootDirectory from
+    # the toplevel config file and environment variables without going through
+    # the full ConfigStore/ConfigLoader. This method can be used, for example,
+    # before loading configuration files. Please note that this method doesn't
+    # take into account any `inherit_from` dependencies.
+    def self.root_dir_from_toplevel_config(cache_root_override = nil)
+      root_dir do
+        next cache_root_override if cache_root_override
+
+        config_path = ConfigFinder.find_config_path(Dir.pwd)
+        file_contents = File.read(config_path)
+
+        # Returns early if `CacheRootDirectory` is not used before requiring `erb` or `yaml`.
+        next unless file_contents.include?('CacheRootDirectory')
+
+        require 'erb'
+        require 'yaml'
+        yaml_code = ERB.new(file_contents).result
+        config_yaml = YAML.safe_load(yaml_code, permitted_classes: [Regexp, Symbol], aliases: true)
+
+        # For compatibility with Ruby 3.0 or lower.
+        if Gem::Version.new(Psych::VERSION) < Gem::Version.new('4.0.0')
+          config_yaml == false ? nil : config_yaml
+        end
+
+        config_yaml&.dig('AllCops', 'CacheRootDirectory')
+      end
+    end
   end
 end

data/lib/rubocop/cli/command/lsp.rb

@@ -9,7 +9,7 @@ module RuboCop
         self.command_name = :lsp
 
         def run
-          # Load on demand, `languge-server-protocol` is heavy to require.
+          # Load on demand, `language-server-protocol` is heavy to require.
           require_relative '../../lsp/server'
           RuboCop::LSP::Server.new(@config_store).start
         end

data/lib/rubocop/cli/command/mcp.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RuboCop
+  class CLI
+    module Command
+      # Start Model Context Protocol of RuboCop.
+      # @api private
+      class MCP < Base
+        self.command_name = :mcp
+
+        def run
+          require_relative '../../mcp/server'
+
+          RuboCop::MCP::Server.new(@config_store).start
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cli.rb

@@ -66,7 +66,7 @@ module RuboCop
       STATUS_INTERRUPTED
     rescue Finished
       STATUS_SUCCESS
-    rescue OptionParser::InvalidOption => e
+    rescue OptionParser::ParseError => e
       warn e.message
       warn 'For usage information, use --help'
       STATUS_ERROR
@@ -76,7 +76,9 @@ module RuboCop
       STATUS_ERROR
     ensure
       elapsed_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - time_start
-      puts "Finished in #{elapsed_time} seconds" if @options[:debug] || @options[:display_time]
+      if @options[:debug] || @options[:display_time]
+        puts "Finished in #{elapsed_time.round(5)} seconds"
+      end
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
@@ -165,6 +167,10 @@ module RuboCop
       handle_editor_mode
 
       @config_store.apply_options!(@options)
+      # Set cache root after apply_options! to ensure force_default_config is applied first.
+      early_cache_root = ConfigLoader.cache_root(@options[:cache_root])
+      ConfigLoader.cache_root = ResultCache.cache_root(@config_store, @options[:cache_root])
+      warn_if_cache_root_changed(early_cache_root, ConfigLoader.cache_root)
 
       handle_exiting_options
 
@@ -194,7 +200,7 @@ module RuboCop
       RuboCop::LSP.enable if @options[:editor_mode]
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def handle_exiting_options
       return unless Options::EXITING_OPTIONS.any? { |o| @options.key? o }
 
@@ -202,9 +208,10 @@ module RuboCop
       run_command(:show_cops) if @options[:show_cops]
       run_command(:show_docs_url) if @options[:show_docs_url]
       run_command(:lsp) if @options[:lsp]
+      run_command(:mcp) if @options[:mcp]
       raise Finished
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     def apply_default_formatter
       # This must be done after the options have already been processed,
@@ -223,5 +230,21 @@ module RuboCop
     def report_pending_cops
       PendingCopsReporter.warn_if_needed(@config_store.for_pwd)
     end
+
+    def warn_if_cache_root_changed(early, desired)
+      return if early == desired
+      # Normalize paths to avoid false positives from symlink resolution differences
+      if File.exist?(early) && File.exist?(desired) &&
+         File.realpath(early) == File.realpath(desired)
+        return
+      end
+
+      warn Rainbow(
+        "Warning: Remote configuration cache files were stored in `#{early}` " \
+        "because a desired cache root (`#{desired}`) was not set at the top level. " \
+        'Consider setting `AllCops: CacheRootDirectory` in your toplevel configuration file, ' \
+        'using the `RUBOCOP_CACHE_ROOT` environment variable, or using CLI options.'
+      ).yellow
+    end
   end
 end

data/lib/rubocop/comment_config.rb

@@ -34,6 +34,7 @@ module RuboCop
     def initialize(processed_source)
       @processed_source = processed_source
       @no_directives = !processed_source.raw_source.include?('rubocop')
+      @stack = []
     end
 
     def cop_enabled_at_line?(cop, line_number)
@@ -69,6 +70,7 @@ module RuboCop
     def extra_enabled_comments_with_names(extras:, names:)
       each_directive do |directive|
         next unless comment_only_line?(directive.line_number)
+        next if directive.push? || directive.pop?
 
         if directive.enabled_all?
           handle_enable_all(directive, names, extras)
@@ -93,16 +95,24 @@ module RuboCop
       end
     end
 
-    def analyze # rubocop:todo Metrics/AbcSize
+    def analyze # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       return {} if @no_directives
 
       analyses = Hash.new { |hash, key| hash[key] = CopAnalysis.new([], nil) }
       inject_disabled_cops_directives(analyses)
 
       each_directive do |directive|
-        directive.cop_names.each do |cop_name|
-          cop_name = qualified_cop_name(cop_name)
-          analyses[cop_name] = analyze_cop(analyses[cop_name], directive)
+        if directive.push?
+          resolved = resolve_push_cops(directive)
+          @stack.push(snapshot_cops(analyses, resolved.values.flatten))
+          apply_push(analyses, resolved, directive.line_number)
+        elsif directive.pop?
+          pop_state(analyses, directive.line_number) if @stack.any?
+        else
+          directive.cop_names.each do |cop_name|
+            cop_name = qualified_cop_name(cop_name)
+            analyses[cop_name] = analyze_cop(analyses[cop_name], directive)
+          end
         end
       end
 
@@ -112,6 +122,49 @@ module RuboCop
       end
     end
 
+    def snapshot_cops(analyses, cop_names)
+      cop_names.to_h { |name| [name, analyses[name].dup] }
+    end
+
+    def resolve_push_cops(directive)
+      directive.push_args.transform_values do |names|
+        names.flat_map { |name| expand_cop_name(name) }
+      end
+    end
+
+    def expand_cop_name(name)
+      registry = Cop::Registry.global
+      cops = registry.department?(name) ? registry.names_for_department(name) : [name]
+      cops.map { |c| qualified_cop_name(c) }
+    end
+
+    def apply_push(analyses, resolved_cops, line)
+      resolved_cops.each do |op, cops|
+        cops.each { |cop| apply_cop_op(analyses, op, cop, line) }
+      end
+    end
+
+    def apply_cop_op(analyses, operation, cop, line)
+      analysis = analyses[cop]
+      if operation == '-' && !analysis.start_line_number
+        analyses[cop] = CopAnalysis.new(analysis.line_ranges, line)
+      elsif operation == '+' && analysis.start_line_number
+        analyses[cop] =
+          CopAnalysis.new(analysis.line_ranges + [analysis.start_line_number..line], nil)
+      end
+    end
+
+    def pop_state(analyses, line)
+      saved = @stack.pop
+      saved.each do |cop, old|
+        cur = analyses[cop]
+        new_range = cur.start_line_number ? [cur.start_line_number..(line - 1)] : []
+        ranges = cur.line_ranges + new_range
+        new_start = old.start_line_number ? line : nil
+        analyses[cop] = CopAnalysis.new(ranges, new_start)
+      end
+    end
+
     def inject_disabled_cops_directives(analyses)
       registry.disabled(config).each do |cop|
         analyses[cop.cop_name] = analyze_cop(
@@ -136,29 +189,21 @@ module RuboCop
       return analysis unless directive.disabled?
 
       line = directive.line_number
-      start_line = analysis.start_line_number
-
-      CopAnalysis.new(analysis.line_ranges + [(line..line)], start_line)
+      CopAnalysis.new(analysis.line_ranges + [(line..line)], analysis.start_line_number)
     end
 
     def analyze_disabled(analysis, directive)
       line = directive.line_number
       start_line = analysis.start_line_number
-
-      # Cop already disabled on this line, so we end the current disabled
-      # range before we start a new range.
-      return CopAnalysis.new(analysis.line_ranges + [start_line..line], line) if start_line
-
-      CopAnalysis.new(analysis.line_ranges, line)
+      new_ranges = start_line ? analysis.line_ranges + [start_line..line] : analysis.line_ranges
+      CopAnalysis.new(new_ranges, line)
     end
 
     def analyze_rest(analysis, directive)
       line = directive.line_number
       start_line = analysis.start_line_number
-
-      return CopAnalysis.new(analysis.line_ranges + [start_line..line], nil) if start_line
-
-      CopAnalysis.new(analysis.line_ranges, nil)
+      new_ranges = start_line ? analysis.line_ranges + [start_line..line] : analysis.line_ranges
+      CopAnalysis.new(new_ranges, nil)
     end
 
     def cop_line_ranges(analysis)