rubocop 1.89.0 → 1.91.0

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

@@ -167,7 +167,7 @@ module RuboCop
           [Layout::SpaceBeforeBlockBraces]
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def on_block(node)
           symbol_proc?(node) do |dispatch_node, arguments_node, method_name|
             if active_support_extensions_enabled?
@@ -184,7 +184,6 @@ module RuboCop
             register_offense(node, method_name, dispatch_node.method_name)
           end
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         alias on_numblock on_block
         alias on_itblock on_block
 

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      # Checks for `Time.new` without arguments, which is an implicit way
+      # to retrieve the current system time. Prefer the more explicit `Time.now`.
+      #
+      # @example
+      #   # bad
+      #   Time.new
+      #
+      #   # good
+      #   Time.now
+      #
+      #   # good - `Time.new` with arguments constructs a specific time
+      #   Time.new(2026, 8, 19)
+      #
+      class TimeNow < Base
+        extend AutoCorrector
+
+        MSG = 'Prefer `Time.now` over `Time.new` to retrieve the current time.'
+        RESTRICT_ON_SEND = %i[new].freeze
+
+        # @!method time_new?(node)
+        def_node_matcher :time_new?, <<~PATTERN
+          (call (const {nil? cbase} :Time) :new)
+        PATTERN
+
+        def on_send(node)
+          return unless time_new?(node)
+
+          add_offense(node) do |corrector|
+            corrector.replace(node.loc.selector.join(node.source_range.end), 'now')
+          end
+        end
+        alias on_csend on_send
+      end
+    end
+  end
+end

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

@@ -64,7 +64,7 @@ module RuboCop
 
         MSG = 'Useless trailing comma present in block arguments.'
 
-        def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler, InternalAffairs/ItblockHandler
+        def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler, InternalAffairs/ItblockHandler -- a trailing comma needs an explicit parameter list
           # lambda literal (`->`) never has block arguments.
           return if node.send_node.lambda_literal?
           return unless useless_trailing_comma?(node)

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

@@ -122,7 +122,7 @@ module RuboCop
           node.comparison_method? && !noncommutative_operator?(node)
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable-next Metrics/CyclomaticComplexity
         def valid_yoda?(node)
           return true unless (rhs = node.first_argument)
 
@@ -133,7 +133,6 @@ module RuboCop
 
           enforce_yoda? ? constant_portion?(lhs) : constant_portion?(rhs)
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
 
         def message(node)
           format(MSG, source: node.source)

data/lib/rubocop/cop/style.rb

@@ -58,11 +58,11 @@ module RuboCop
       register_cop :DigChain, "#{__dir__}/style/dig_chain"
       register_cop :Dir, "#{__dir__}/style/dir"
       register_cop :DirEmpty, "#{__dir__}/style/dir_empty"
+      register_cop :DirectiveScope, "#{__dir__}/style/directive_scope"
       register_cop :DisableCopsWithinSourceCodeDirective, "#{__dir__}/style/disable_cops_within_source_code_directive"
       register_cop :DocumentationMethod, "#{__dir__}/style/documentation_method"
       register_cop :Documentation, "#{__dir__}/style/documentation"
       register_cop :DocumentDynamicEvalDefinition, "#{__dir__}/style/document_dynamic_eval_definition"
-      register_cop :DoubleCopDisableDirective, "#{__dir__}/style/double_cop_disable_directive"
       register_cop :DoubleNegation, "#{__dir__}/style/double_negation"
       register_cop :EachForSimpleLoop, "#{__dir__}/style/each_for_simple_loop"
       register_cop :EachWithObject, "#{__dir__}/style/each_with_object"
@@ -282,6 +282,7 @@ module RuboCop
       register_cop :SymbolProc, "#{__dir__}/style/symbol_proc"
       register_cop :TallyMethod, "#{__dir__}/style/tally_method"
       register_cop :TernaryParentheses, "#{__dir__}/style/ternary_parentheses"
+      register_cop :TimeNow, "#{__dir__}/style/time_now"
       register_cop :TopLevelMethodDefinition, "#{__dir__}/style/top_level_method_definition"
       register_cop :TrailingBodyOnClass, "#{__dir__}/style/trailing_body_on_class"
       register_cop :TrailingBodyOnMethodDefinition, "#{__dir__}/style/trailing_body_on_method_definition"

data/lib/rubocop/cop/team.rb

@@ -9,7 +9,7 @@ module RuboCop
     # For performance reasons, Team will first dispatch cops & forces in two groups,
     # first the ones needed for autocorrection (if any), then the rest
     # (unless autocorrections happened).
-    # rubocop:disable Metrics/ClassLength
+    # rubocop:disable-next Metrics/ClassLength
     class Team
       InvestigationResult = Struct.new(:report, :corrector)
       private_constant :InvestigationResult
@@ -211,7 +211,7 @@ module RuboCop
         # run the other cops when no corrections are left
         on_duty = roundup_relevant_cops(processed_source)
 
-        autocorrect_cops, other_cops = on_duty.partition(&:autocorrect?)
+        autocorrect_cops, other_cops = partition_by_correcting(on_duty)
         report = investigate_partial(autocorrect_cops, processed_source,
                                      offset: offset, original: original)
 
@@ -251,6 +251,15 @@ module RuboCop
       end
 
       # @return [Array<cop>]
+      # A cop whose unsafe correction is skipped still inserts todo comments
+      # under `--disable-uncorrectable`, so it must run with the correcting
+      # cops - correctors of the later `other_cops` round are never applied.
+      def partition_by_correcting(cops)
+        cops.partition do |cop|
+          cop.autocorrect? || cop.skipped_unsafe_correction_with_disable_uncorrectable?
+        end
+      end
+
       def roundup_relevant_cops(processed_source)
         (cops + opted_in_standby_cops(processed_source)).select do |cop|
           next false if cop.excluded_file?(processed_source.file_path)
@@ -395,6 +404,5 @@ module RuboCop
         end
       end
     end
-    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rubocop/cop/util.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     # This module contains a collection of useful utility methods.
-    # rubocop:disable Metrics/ModuleLength
+    # rubocop:disable-next Metrics/ModuleLength
     module Util
       include PathUtil
 
@@ -35,7 +35,7 @@ module RuboCop
         node.loc_is?(:end, ')')
       end
 
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable-next Metrics/AbcSize, Metrics/MethodLength
       def add_parentheses(node, corrector)
         if node.args_type?
           arguments_range = node.source_range
@@ -55,7 +55,6 @@ module RuboCop
           corrector.insert_after(args_end(node), ')')
         end
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def any_descendant?(node, *types)
         if block_given?
@@ -64,7 +63,7 @@ module RuboCop
           end
         else
           # Use a block version to avoid allocating enumerators.
-          node.each_descendant do # rubocop:disable Lint/UnreachableLoop
+          node.each_descendant do # rubocop:disable Lint/UnreachableLoop -- the block form avoids allocating an enumerator
             return true
           end
         end
@@ -210,6 +209,5 @@ module RuboCop
         source == target || (source.is_a?(Array) && source.include?(target))
       end
     end
-    # rubocop:enable Metrics/ModuleLength
   end
 end

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

@@ -47,7 +47,7 @@ module RuboCop
           !@references.empty?
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def reference!(node)
           reference = Reference.new(node, @scope)
           @references << reference
@@ -72,7 +72,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         def in_modifier_conditional?(assignment, reference_node)
           conditional = modifier_conditional_of(assignment.node)

data/lib/rubocop/cops_documentation_generator.rb

@@ -20,6 +20,7 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
     safety:                ->(data) { safety_object(data.safety_objects, data.cop) },
     examples:              ->(data) { examples(data.example_objects, data.cop) },
     configuration:         ->(data) { configurations(data.cop.department, data.cop, data.config) },
+    preview:               ->(data) { preview_defaults(data.cop) },
     references:            ->(data) { references(data.cop, data.see_objects) }
   }.freeze
 
@@ -137,7 +138,7 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
     "NOTE: Requires Ruby version #{requirement}\n\n"
   end
 
-  # rubocop:disable Metrics/MethodLength
+  # rubocop:disable-next Metrics/MethodLength
   def properties(cop)
     header = [
       'Enabled by default', 'Safe', 'Supports autocorrection', 'Version Added',
@@ -160,7 +161,6 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
     ]]
     "#{to_table(header, content)}\n"
   end
-  # rubocop:enable Metrics/MethodLength
 
   def cop_header(cop)
     content = +"\n"
@@ -195,7 +195,7 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
   def configurations(department, cop, cop_config)
     header = ['Name', 'Default value', 'Configurable values']
     configs = cop_config.each_key.reject do |key|
-      key == 'AllowMultipleStyles' ||
+      key == 'AllowMultipleStyles' || key == 'Preview' ||
         (key != 'SupportedTypes' && key.start_with?('Supported'))
     end
     return '' if configs.empty?
@@ -210,6 +210,22 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
     cop_subsection('Configurable attributes', cop) + to_table(header, content)
   end
 
+  def preview_defaults(cop)
+    cop_config = config.for_cop(cop)
+    preview = cop_config['Preview']
+    return '' unless preview.is_a?(Hash)
+
+    header = ['Name', 'Current default', 'Preview default']
+    content = preview.map do |name, value|
+      [name, format_table_value(cop_config[name]), format_table_value(value)]
+    end
+
+    cop_subsection('Preview defaults', cop) +
+      'These defaults apply under xref:versioning.adoc#preview[Preview] and are ' \
+      "expected to become the regular defaults in the next major release.\n\n" +
+      to_table(header, content)
+  end
+
   def configuration_name(department, name)
     return name unless name == 'AllowMultilineFinalElement'
 
@@ -217,7 +233,7 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
     "xref:#{filename}#allowmultilinefinalelement[AllowMultilineFinalElement]"
   end
 
-  # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength
+  # rubocop:disable-next Metrics/CyclomaticComplexity,Metrics/MethodLength
   def configurable_values(cop_config, name)
     case name
     when /^Enforced/
@@ -244,7 +260,6 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
       end
     end
   end
-  # rubocop:enable Metrics/CyclomaticComplexity,Metrics/MethodLength
 
   def to_table(header, content)
     table = ['|===', "| #{header.join(' | ')}\n\n"].join("\n")
@@ -303,7 +318,7 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
     "\ninclude::../partials/#{filename}[]\n"
   end
 
-  # rubocop:disable Metrics/MethodLength
+  # rubocop:disable-next Metrics/MethodLength
   def print_cops_of_department(department)
     selected_cops = cops_of_department(department)
     content = +<<~HEADER
@@ -323,7 +338,6 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
       file.write("#{content.strip}\n")
     end
   end
-  # rubocop:enable Metrics/MethodLength
 
   def print_cop_with_doc(cop) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
     cop_config = config.for_cop(cop)
@@ -392,7 +406,11 @@ class CopsDocumentationGenerator # rubocop:disable Metrics/ClassLength
   def cop_status(status)
     return 'Disabled' unless status
 
-    status == 'pending' ? 'Pending' : 'Enabled'
+    case status
+    when 'pending' then 'Pending'
+    when 'preview' then 'Preview'
+    else 'Enabled'
+    end
   end
 
   # HTML anchor are somewhat limited in what characters they can contain, just

data/lib/rubocop/directive_comment.rb

@@ -26,19 +26,26 @@ module RuboCop
     # @api private
     PUSH_POP_ARGS_PATTERN = "([+\\-]#{COP_NAME_PATTERN_NC}(?:\\s+[+\\-]#{COP_NAME_PATTERN_NC})*)"
     # @api private
-    AVAILABLE_MODES = %w[disable enable todo push pop].freeze
+    AVAILABLE_MODES = %w[disable enable todo push pop disable-next todo-next enable-next
+                         next].freeze
+    # @api private
+    # Longest first, so a `-next` mode is not matched as its prefix
+    # (`-` is a word boundary).
+    MODES_PATTERN = AVAILABLE_MODES.sort_by { |mode| -mode.length }.join('|').freeze
     # @api private
     DIRECTIVE_MARKER_PATTERN = '# rubocop : '
     # @api private
     DIRECTIVE_MARKER_REGEXP = Regexp.new(DIRECTIVE_MARKER_PATTERN.gsub(' ', '\s*'))
     # @api private
-    DIRECTIVE_HEADER_PATTERN = "#{DIRECTIVE_MARKER_PATTERN}((?:#{AVAILABLE_MODES.join('|')}))\\b"
+    DIRECTIVE_HEADER_PATTERN = "#{DIRECTIVE_MARKER_PATTERN}((?:#{MODES_PATTERN}))\\b"
     # @api private
     DIRECTIVE_COMMENT_REGEXP = Regexp.new(
       "#{DIRECTIVE_HEADER_PATTERN}(?:\\s+#{COPS_PATTERN}|\\s+#{PUSH_POP_ARGS_PATTERN})?"
         .gsub(' ', '\s*')
     )
     # @api private
+    SIGNED_OPERATIONS = %w[+ -].freeze
+    # @api private
     TRAILING_COMMENT_MARKER = '--'
     # @api private
     MALFORMED_DIRECTIVE_WITHOUT_COP_NAME_REGEXP = Regexp.new(
@@ -67,7 +74,7 @@ module RuboCop
     # Checks if the comment is malformed as a `# rubocop:` directive
     def malformed?
       return true if !start_with_marker? || @match_data.nil?
-      return true if missing_cop_name?
+      return true if missing_cop_name? || invalid_signed_args?
 
       tail = @match_data.post_match.lstrip
       !(tail.empty? || tail.start_with?(TRAILING_COMMENT_MARKER))
@@ -80,6 +87,28 @@ module RuboCop
       MALFORMED_DIRECTIVE_WITHOUT_COP_NAME_REGEXP.match?(comment.text)
     end
 
+    # `push` and `next` arguments must be `+`/`-` prefixed cop names, and
+    # `pop` takes no arguments at all.
+    def invalid_signed_args?
+      return cops ? !cops.empty? : false if pop?
+      return false unless push? || next?
+      return false unless cops
+
+      cops.split.any? { |cop_spec| !cop_spec.start_with?('+', '-') }
+    end
+
+    # The text of the directive's optional `--` trailing comment, or `nil`
+    # when there is none.
+    def reason
+      return unless @match_data
+
+      tail = @match_data.post_match.lstrip
+      return unless tail.start_with?(TRAILING_COMMENT_MARKER)
+
+      reason = tail.delete_prefix(TRAILING_COMMENT_MARKER).strip
+      reason unless reason.empty?
+    end
+
     # Checks if this directive relates to single line
     def single_line?
       !comment.text.start_with?(DIRECTIVE_COMMENT_REGEXP)
@@ -98,6 +127,19 @@ module RuboCop
       )
     end
 
+    # `#range` stops at the cop list, so a `--` reason sits outside it. The reason documents the
+    # directive and means nothing once the directive is gone, so removal has to cover both. Any
+    # other trailing text is an ordinary comment and is left alone.
+    def range_with_reason
+      directive_range = range
+      trailing = Parser::Source::Range.new(
+        comment.source_range.source_buffer, directive_range.end_pos, comment.source_range.end_pos
+      )
+      return directive_range unless trailing.source.lstrip.start_with?(TRAILING_COMMENT_MARKER)
+
+      directive_range.with(end_pos: comment.source_range.end_pos)
+    end
+
     # Returns match captures to directive comment pattern
     def match_captures
       @match_captures ||= @match_data && begin
@@ -111,12 +153,22 @@ module RuboCop
 
     # Checks if this directive disables cops
     def disabled?
-      %w[disable todo].include?(mode)
+      %w[disable todo].include?(mode) || disable_next?
+    end
+
+    # Checks if this directive disables cops for the next statement only
+    def disable_next?
+      %w[disable-next todo-next].include?(mode)
     end
 
     # Checks if this directive enables cops
     def enabled?
-      mode == 'enable'
+      mode == 'enable' || enable_next?
+    end
+
+    # Checks if this directive enables cops for the next statement only
+    def enable_next?
+      mode == 'enable-next'
     end
 
     # Checks if this directive is a push
@@ -129,10 +181,17 @@ module RuboCop
       mode == 'pop'
     end
 
-    # Returns the push arguments as a hash of cop names with their operations
-    def push_args
-      @push_args ||= parse_push_args
+    # Checks if this directive toggles cops for the next statement only
+    def next?
+      mode == 'next'
+    end
+
+    # Returns the `+`/`-` arguments of a `push` or `next` directive as a hash
+    # of operations to cop names
+    def signed_args
+      @signed_args ||= parse_signed_args
     end
+    alias push_args signed_args
 
     # Checks if this directive enables all cops
     def enabled_all?
@@ -176,6 +235,8 @@ module RuboCop
     end
 
     def directive_count
+      return signed_args.values.sum(&:count) if push? || next?
+
       raw_cop_names.count
     end
 
@@ -210,13 +271,15 @@ module RuboCop
       cops - [LINT_REDUNDANT_DIRECTIVE_COP, LINT_SYNTAX_COP]
     end
 
-    def parse_push_args
-      return {} unless push? && cops
+    def parse_signed_args
+      return {} unless (push? || next?) && cops
 
       args = {}
       cops.split.each do |cop_spec|
         op = cop_spec[0]
         cop_name = cop_spec[1..]
+        next unless SIGNED_OPERATIONS.include?(op)
+
         args[op] ||= []
         args[op] << cop_name
       end

data/lib/rubocop/formatter/disabled_config_formatter.rb

@@ -23,6 +23,7 @@ module RuboCop
         Enabled
         Exclude
         Include
+        Preview
         Reference
         References
         Safe
@@ -93,6 +94,7 @@ module RuboCop
         command += ' --auto-gen-only-exclude' if @options[:auto_gen_only_exclude]
         command += ' --disable-pending-cops' if @options[:disable_pending_cops]
         command += ' --enable-pending-cops' if @options[:enable_pending_cops]
+        command += preview_option
         command += exclude_limit_option
         command += ' --no-offense-counts' unless show_offense_counts?
 
@@ -103,6 +105,14 @@ module RuboCop
         command
       end
 
+      def preview_option
+        case @options[:preview]
+        when true then ' --preview'
+        when false then ' --no-preview'
+        else ''
+        end
+      end
+
       def exclude_limit_option
         if no_exclude_limit?
           ' --no-exclude-limit'
@@ -259,7 +269,7 @@ module RuboCop
         config = ConfigStore.new.for(parent)
         cfg = config[cop_name] || {}
 
-        if merge_mode_for_exclude?(config) || merge_mode_for_exclude?(cfg)
+        if exclude_merges?(config, cfg)
           offending_files
         else
           cop_exclude = cfg['Exclude']
@@ -272,6 +282,14 @@ module RuboCop
         end
       end
 
+      # `Preview` merges `Exclude` with the default configuration, so the excludes
+      # already in the configuration do not have to be copied into the todo file.
+      def exclude_merges?(config, cop_config)
+        merge_mode_for_exclude?(config) ||
+          merge_mode_for_exclude?(cop_config) ||
+          config.preview?(@options)
+      end
+
       def merge_mode_for_exclude?(cfg)
         Array(cfg.to_h.dig('inherit_mode', 'merge')).include?('Exclude')
       end

data/lib/rubocop/formatter/emacs_style_formatter.rb

@@ -23,7 +23,9 @@ module RuboCop
 
       def message(offense)
         message =
-          if offense.corrected_with_todo?
+          if offense.disabled?
+            "[Suppressed] #{offense.message}"
+          elsif offense.corrected_with_todo?
             "[Todo] #{offense.message}"
           elsif offense.corrected?
             "[Corrected] #{offense.message}"

data/lib/rubocop/formatter/formatter_set.rb

@@ -23,6 +23,7 @@ module RuboCop
         '[pa]cman'      => 'PacmanFormatter',
         '[p]rogress'    => 'ProgressFormatter',
         '[q]uiet'       => 'QuietFormatter',
+        '[sa]rif'       => 'SARIFFormatter',
         '[s]imple'      => 'SimpleTextFormatter',
         '[t]ap'         => 'TapFormatter',
         '[w]orst'       => 'WorstOffendersFormatter'
@@ -57,7 +58,7 @@ module RuboCop
         if output_path
           dir_path = File.dirname(output_path)
           FileUtils.mkdir_p(dir_path)
-          output = File.open(output_path, 'w') # rubocop:disable Style/FileOpen
+          output = File.open(output_path, 'w') # rubocop:disable Style/FileOpen -- the file is closed by `close_output_files`, not by a block
         else
           output = $stdout
         end

data/lib/rubocop/formatter/github_actions_formatter.rb

@@ -15,6 +15,10 @@ module RuboCop
         @offenses_for_files[file] = offenses unless offenses.empty?
       end
 
+      def file_started(_file, options)
+        @config_store = options[:config_store]
+      end
+
       def finished(_inspected_files)
         @offenses_for_files.each do |file, offenses|
           offenses.each do |offense|
@@ -31,11 +35,8 @@ module RuboCop
       end
 
       def minimum_severity_to_fail
-        @minimum_severity_to_fail ||= begin
-          # Unless given explicitly as `fail_level`, `:info` severity offenses do not fail
-          name = options.fetch(:fail_level, :refactor)
-          RuboCop::Cop::Severity.new(name)
-        end
+        @minimum_severity_to_fail ||=
+          RuboCop::Cop::Severity.minimum_to_fail(options, @config_store&.for_pwd)
       end
 
       def github_severity(offense)

data/lib/rubocop/formatter/html_formatter.rb

@@ -74,11 +74,10 @@ module RuboCop
         end
 
         # Make Kernel#binding public.
-        # rubocop:disable Lint/UselessMethodDefinition
+        # rubocop:disable-next Lint/UselessMethodDefinition -- redefined only to make `Kernel#binding` public
         def binding
           super
         end
-        # rubocop:enable Lint/UselessMethodDefinition
 
         def decorated_message(offense)
           offense.message.gsub(/`(.+?)`/) { "<code>#{escape(Regexp.last_match(1))}</code>" }
@@ -144,11 +143,10 @@ module RuboCop
         }.freeze
 
         # Make Kernel#binding public.
-        # rubocop:disable Lint/UselessMethodDefinition
+        # rubocop:disable-next Lint/UselessMethodDefinition -- redefined only to make `Kernel#binding` public
         def binding
           super
         end
-        # rubocop:enable Lint/UselessMethodDefinition
       end
     end
   end

data/lib/rubocop/formatter/json_formatter.rb

@@ -47,7 +47,7 @@ module RuboCop
       end
 
       def hash_for_offense(offense)
-        {
+        hash = {
           severity:    offense.severity.name,
           message:     offense.message,
           cop_name:    offense.cop_name,
@@ -55,18 +55,23 @@ module RuboCop
           correctable: offense.correctable?,
           location:    hash_for_location(offense)
         }
+
+        # Suppressed offenses appear only under `--display-suppressed`, so
+        # these keys are additive for existing consumers.
+        if offense.disabled?
+          hash[:suppressed] = true
+          hash[:justification] = offense.justification
+        end
+
+        hash
       end
 
-      # TODO: Consider better solution for Offense#real_column.
-      #       The minimum value of `start_column: real_column` is 1.
-      #       So, the minimum value of `last_column` should be 1.
-      #       And non-zero value of `last_column` should be used as is.
       def hash_for_location(offense)
         {
           start_line:   offense.line,
           start_column: offense.real_column,
           last_line:    offense.last_line,
-          last_column:  offense.last_column.zero? ? 1 : offense.last_column,
+          last_column:  offense.real_last_column,
           length:       offense.location.length,
           # `line` and `column` exist for compatibility.
           # Use `start_line` and `start_column` instead.