rubocop-rbs_inline 1.8.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4bebfc6eae9ec29990f1dafdf2fc773737b2cf001c450702b138b1d9ab81dec
-  data.tar.gz: f9ebb04f3712f5f02cd6b7388ea74b056fdce19027be61ed6b651cf1b5915ca8
+  metadata.gz: 6bb68dac2a82e53e5c2b8640e5feab967ca592c9a91927ed91f921c705629c1e
+  data.tar.gz: c35f3396438d8776982b2907e5d7cfe8d72f902b20e041158ba985a05f43aa41
 SHA512:
-  metadata.gz: 46b9e51e95573630afbe686500cdf154a2cdf2d76bd19f441552fe76267682fb586118f96e7b0c5316352b49fc6e5ddc3b080fd1dc8b6711d31e382694ad767d
-  data.tar.gz: 9bd7d22ee40b4d009b1c2f2f86d855a37ee32349c12afffdebbda6cf5edf54bf9c474f67bdfb170987ea512c0934deb48d709f1afbc49acef88f968ebff4297a
+  metadata.gz: d53b2590db9f7dad7887c594c687fd51e9470d7c6a6c2dfbf76b8b002389fb5c5410d05477a4e6956e5ff0ca5cc9bddecee970eb81e7e5af563091bea86348af
+  data.tar.gz: f3d1f4a2c7eec7e5cf6a6a1c9bb397a8cde822d9056df9c7e45fef360f244b8731c5afb5b6feaac3f97f664f058140e5c173c344186e85263df1efa667332f7f

data/.claude/hooks/pre-commit-check.sh

@@ -18,12 +18,52 @@ fi
 
 echo "Running pre-commit checks..." >&2
 
-# Generate RBS and run all checks
-if ! bundle exec rbs-inline --opt-out --output=sig/ lib/ >&2; then
+# Regenerate RBS from scratch so that files orphaned by deleted lib/ sources are dropped too
+if ! bundle exec rake rbs:regenerate >&2; then
     echo "Error: RBS generation failed" >&2
     exit 2
 fi
 
+# True when $command stages the whole of sig/ itself, which the check below cannot see because
+# this hook runs first. Staging only part of sig/ does not count - the rest still drops out.
+stages_sig() {
+    local segment tokens token stages_everything pathspec_given
+
+    while IFS= read -r segment; do
+        segment=${segment//[\"\']/}
+        read -ra tokens <<<"${segment#*add}"
+        stages_everything=0
+        pathspec_given=0
+
+        for token in "${tokens[@]}"; do
+            case "$token" in
+                --) ;;
+                -*A*|--all) stages_everything=1 ;;
+                -*) ;;
+                .|./|sig|sig/|./sig|./sig/) return 0 ;;
+                *) pathspec_given=1 ;;
+            esac
+        done
+
+        # -A alone stages every path; given a pathspec it stages that path only
+        [ "$stages_everything" = 1 ] && [ "$pathspec_given" = 0 ] && return 0
+    done < <(grep -oE '(^|[;&|(])[[:space:]]*git[[:space:]]+add[^;&|(]*' <<<"$command")
+
+    return 1
+}
+
+# Stop rather than let the RBS just regenerated above drop out of the commit unnoticed
+if [[ "$command" =~ git[[:space:]]+commit([[:space:]]|$) ]] && ! stages_sig; then
+    unstaged_sig=$(git status --porcelain --untracked-files=all -- sig/ | awk 'substr($0, 2, 1) != " "')
+
+    if [ -n "$unstaged_sig" ]; then
+        echo "Error: sig/ has changes that are not staged:" >&2
+        echo "$unstaged_sig" >&2
+        echo "Run 'git add sig/' and commit again." >&2
+        exit 2
+    fi
+fi
+
 if ! bundle exec rake >&2; then
     echo "Error: rake checks failed" >&2
     exit 2

data/.claude/hooks/protect-sig-files.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+# Prevents direct editing of auto-generated RBS type definition files.
+# Type definitions in the project's own sig/ are managed by PostToolUse hooks.
+# Hand-written stubs for third-party gems under sig/gems/ are exempt.
+
+# Hook input is JSON from stdin
+input=$(cat)
+tool_name=$(echo "$input" | jq -r '.tool_name // ""')
+
+# Block Write/Edit operations on sig/ files
+if [[ "$tool_name" == "Write" || "$tool_name" == "Edit" ]]; then
+    file_path=$(echo "$input" | jq -r '.tool_input.file_path // ""')
+
+    # Judge the path relative to the project root: only the sig/ there is
+    # generated. A sig/ nested elsewhere is hand-written and stays editable.
+    project_root="${CLAUDE_PROJECT_DIR:-$PWD}"
+    rel_path="${file_path#"${project_root}/"}"
+
+    if [[ "$rel_path" == sig/gems/* ]]; then
+        exit 0
+    fi
+
+    if [[ "$rel_path" == sig/* ]]; then
+        echo "❌ ERROR: Direct editing of generated sig/ files is not allowed." >&2
+        echo "📝 This repository's own types are generated: fix the inline RBS comments in the .rb file." >&2
+        echo "💡 Hand-written files are allowed only under sig/gems/ (stubs for third-party gems)." >&2
+        exit 2
+    fi
+fi
+
+# Block manual rbs-inline execution
+if [[ "$tool_name" == "Bash" ]]; then
+    command=$(echo "$input" | jq -r '.tool_input.command // ""')
+
+    # Match rbs-inline only at a command position, not as an argument.
+    rbs_inline_re=$'(^|[;&|(\n])[[:space:]]*(bundle[[:space:]]+exec[[:space:]]+)?([^[:space:]]*/)?rbs-inline([[:space:]]|[;&|)]|$)'
+
+    if [[ "$command" =~ $rbs_inline_re ]]; then
+        echo "❌ ERROR: Manual rbs-inline execution is not allowed." >&2
+        echo "🔄 Type definitions are auto-generated by hooks." >&2
+        exit 2
+    fi
+fi
+
+exit 0

data/.claude/settings.json

@@ -1,7 +1,4 @@
 {
-  "permissions": {
-    "allow": ["RemoteTrigger"]
-  },
   "hooks": {
     "SessionStart": [
       {
@@ -9,13 +6,23 @@
         "hooks": [
           {
             "type": "command",
-            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/setup.sh",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/claude-code-web-session-start.sh",
             "timeout": 300
           }
         ]
       }
     ],
     "PreToolUse": [
+      {
+        "matcher": "Edit|Write|Bash",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/protect-sig-files.sh",
+            "timeout": 5000
+          }
+        ]
+      },
       {
         "matcher": "Bash",
         "hooks": [

data/.rubocop.yml

@@ -44,12 +44,12 @@ Naming/FileName:
 RSpec/ExampleLength:
   Enabled: false
 
-RSpec/MultipleMemoizedHelpers:
-  Max: 10
-
 RSpec/MultipleExpectations:
   Enabled: false
 
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
+
 RSpec/NamedSubject:
   Enabled: false
 
@@ -62,16 +62,6 @@ RSpec/SpecFilePathFormat:
   Exclude:
     - "spec/rubocop/cop/style/rbs_inline/mixin/**/*_spec.rb"
 
-# RbsInline
-Style/RbsInline:
-  Mode: opt_out
-
-Style/RbsInline/MissingTypeAnnotation:
-  EnforcedStyle: doc_style_and_return_annotation
-
-Style/RbsInline/RedundantTypeAnnotation:
-  EnforcedStyle: doc_style_and_return_annotation
-
 # Style
 Style/AccessorGrouping:
   Enabled: false
@@ -85,6 +75,15 @@ Style/Documentation:
 Style/HashSyntax:
   EnforcedShorthandSyntax: always
 
+Style/RbsInline:
+  Mode: opt_out
+
+Style/RbsInline/MissingTypeAnnotation:
+  EnforcedStyle: doc_style_and_return_annotation
+
+Style/RbsInline/RedundantTypeAnnotation:
+  EnforcedStyle: doc_style_and_return_annotation
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 2.0.0 (2026-08-05)
+
+### Breaking Changes
+
+- **Style/RbsInline**: `Mode` now defaults to `opt_in`, and any value other than `opt_in` / `opt_out` fails the run.
+- **Style/RbsInline/RequireRbsInlineComment**: Removed the deprecated `EnforcedStyle`. Use `Style/RbsInline: Mode` instead: `always` → `opt_in`, `never` → `opt_out`.
+
+### Enhancements
+
+- **Style/RbsInline/DataDefineWithBlock**, **Style/RbsInline/StructNewWithBlock**: Clarified the offense message: it now says to keep the `Data.define` / `Struct.new` call and move the block's methods into a class that reopens it, and names that class when the definition is assigned to a constant.
+
 ## 1.8.0 (2026-07-26)
 
 ### Enhancements

data/CLAUDE.md

@@ -38,7 +38,7 @@ Cops live in `lib/rubocop/cop/style/rbs_inline/`, one per file; the shared modul
 
 Conventions:
 
-- Every cop `prepend`s `FileFilter` except `RequireRbsInlineComment`.
+- Every cop `prepend`s `FileFilter` except `RequireRbsInlineComment`, which reads `Mode` through `ModeConfig` instead — it has to run on the files the filter skips.
 - `Data.define` and `Struct.new` cops come in pairs sharing a base module. Behavior belongs in the module; only the node matcher and `MSG` in the cop.
 
 ### Plugin System
@@ -55,6 +55,8 @@ Tests use RuboCop's RSpec support helpers (`expect_offense` / `expect_no_offense
 
 `:config` specs build a bare `RuboCop::Config`, so `config/default.yml` and RuboCop's department-to-cop defaults are not merged in. A spec that sets a value at the department level proves nothing about how it resolves in a real run.
 
+The department-level `Mode` is not merged in either, and the cops have no default for it, so `spec_helper.rb` declares `Mode: opt_out` for every `:config` spec, and `rbs_inline_config` for the specs written against the default configuration. A spec that builds its own config has to declare it itself.
+
 ## Code Style Notes
 
 - `Layout/LeadingCommentSpace` and `Style/CommentedKeyword` are disabled because RBS::Inline `#:` comments violate these rules by design.

data/README.md

@@ -31,18 +31,17 @@ rubocop-rbs_inline provides the following cops to validate [RBS::Inline](https:/
 
 The `Style/RbsInline` department has a shared `Mode` setting that gates whether each `Style/RbsInline/*` cop reports offenses on a given file:
 
-- `Mode: opt_in` — cops only check files that carry `# rbs_inline: enabled`. Files with `# rbs_inline: disabled` or no magic comment are skipped. Matches RBS::Inline's opt-in mode.
+- `Mode: opt_in` (default) — cops only check files that carry `# rbs_inline: enabled`. Files with `# rbs_inline: disabled` or no magic comment are skipped. Matches RBS::Inline's opt-in mode.
 - `Mode: opt_out` — cops check every file except those with `# rbs_inline: disabled`. Matches RBS::Inline's opt-out mode.
-- unset — cops check every file (legacy behavior; the default will change to `opt_in` in the next major release).
 
 Declare it once at the department level in your `.rubocop.yml`:
 
 ```yaml
 Style/RbsInline:
-  Mode: opt_in
+  Mode: opt_out
 ```
 
-Unknown `Mode` values (e.g. `Mode: opt-in`) emit a warning and disable filtering for the run.
+Any other value (e.g. `Mode: opt-in`) fails the run with a configuration error.
 
 ### Style/RbsInline/DataClassCommentAlignment
 
@@ -504,8 +503,6 @@ Style/RbsInline/RequireRbsInlineComment:
   AllowMissingComment: true
 ```
 
-The legacy `EnforcedStyle` parameter (`always` / `never`) is deprecated in favor of `Mode`; it will be removed in the next major release.
-
 **Examples (Mode: opt_in):**
 ```ruby
 # bad
@@ -659,7 +656,7 @@ Style/RbsInline/MissingTypeAnnotation:
   Visibility: public
 ```
 
-To restrict every cop to files that carry `# rbs_inline: enabled`, see [Style/RbsInline (shared configuration)](#stylerbsinline-shared-configuration).
+To check every file rather than only those that carry `# rbs_inline: enabled`, see [Style/RbsInline (shared configuration)](#stylerbsinline-shared-configuration).
 
 See [config/default.yml](config/default.yml) for all available configuration options.
 

data/Rakefile

@@ -35,14 +35,23 @@ task :new_cop, [:cop] do |_task, args|
 end
 
 namespace :rbs do
-  desc "Install RBS signatures"
+  # sig/gems holds hand-written types for external gems, so it is never regenerated
+  kept = ->(path) { path == "sig/gems" || path.start_with?("sig/gems/") }
+
+  desc "Install RBS collection"
   task :install do
     sh "bundle", "exec", "rbs", "collection", "install", "--frozen"
   end
 
-  desc "Generate RBS files"
-  task :generate do
+  desc "Regenerate all RBS files under sig/ from scratch (run manually after editing lib/)"
+  task :regenerate do
+    Dir.glob("sig/**/*.rbs").reject(&kept).each { rm _1 }
+
     sh "rbs-inline", "--opt-out", "--output=sig", "lib"
+
+    # Drop the directories the deletion above left empty, deepest first
+    dirs = Dir.glob("sig/**/*").select { File.directory?(_1) }
+    dirs.reject(&kept).sort.reverse_each { rmdir _1 if Dir.empty?(_1) }
   end
 
   desc "Validate RBS files"

data/config/default.yml

@@ -5,7 +5,7 @@ Style/RbsInline:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
-  Mode: ~
+  Mode: opt_in
 
 Style/RbsInline/DataClassCommentAlignment:
   Description: "Checks that `#:` inline type annotations in `Data.define` blocks are aligned."
@@ -96,7 +96,6 @@ Style/RbsInline/RequireRbsInlineComment:
   Enabled: true
   VersionAdded: "1.5.0"
   AllowMissingComment: false
-  EnforcedStyle: ~
 
 Style/RbsInline/StructClassCommentAlignment:
   Description: "Checks that `#:` inline type annotations in `Struct.new` blocks are aligned."

data/lib/rubocop/cop/rbs_inline_cops.rb

@@ -11,6 +11,7 @@ require_relative "style/rbs_inline/mixin/data_struct_helper"
 require_relative "style/rbs_inline/mixin/missing_class_annotation"
 require_relative "style/rbs_inline/mixin/class_comment_alignment"
 require_relative "style/rbs_inline/mixin/data_class_matcher"
+require_relative "style/rbs_inline/mixin/mode_config"
 require_relative "style/rbs_inline/mixin/file_filter"
 require_relative "style/rbs_inline/mixin/struct_class_matcher"
 

data/lib/rubocop/cop/style/rbs_inline/data_define_with_block.rb

@@ -30,10 +30,11 @@ module RuboCop
         class DataDefineWithBlock < Base
           prepend FileFilter
           include DataClassMatcher
+          include ASTUtils
 
           MSG = "Do not use `Data.define` with a block. RBS::Inline does not parse block contents, " \
-                "so methods defined in the block will not be recognized. " \
-                "Use a separate class definition instead."
+                "so methods defined in the block will not be recognized. Keep the `Data.define` call " \
+                "and move the methods into %<destination>s."
 
           # @rbs node: RuboCop::AST::SendNode
           def on_send(node) #: void
@@ -42,7 +43,18 @@ module RuboCop
             block_node = node.parent
             return unless block_node&.block_type?
 
-            add_offense(node)
+            add_offense(node, message: format(MSG, destination: destination(block_node)))
+          end
+
+          private
+
+          # The constant the definition is assigned to is the class to reopen.
+          # @rbs node: RuboCop::AST::Node
+          def destination(node) #: String
+            class_name = assigned_constant_name(node)
+            return "a `class` that reopens it" unless class_name
+
+            "`class #{class_name} ... end` written after it"
           end
         end
       end

data/lib/rubocop/cop/style/rbs_inline/mixin/ast_utils.rb

@@ -39,6 +39,19 @@ module RuboCop
             node.source || raise
           end
 
+          # Returns the name of the constant `node` is assigned to, or `nil` when the name
+          # is not statically determinable (e.g. `self::Foo = ...`).
+          # @rbs node: RuboCop::AST::Node
+          def assigned_constant_name(node) #: String?
+            parent = node.parent
+            return nil unless parent.is_a?(RuboCop::AST::CasgnNode)
+            return nil unless parent.each_path.all? { _1.const_type? || _1.cbase_type? }
+
+            # `const_name` drops the leading `::`, which would name a different constant
+            # when the assignment appears inside a namespace.
+            parent.absolute? ? "::#{parent.const_name}" : parent.const_name
+          end
+
           #: (RuboCop::AST::SymbolNode) -> Symbol
           #: (RuboCop::AST::StrNode) -> Symbol
           #: (RuboCop::AST::Node) -> Symbol?

data/lib/rubocop/cop/style/rbs_inline/mixin/file_filter.rb

@@ -8,8 +8,7 @@ module RuboCop
         #
         # When `Mode` is `opt_in`, offenses are only reported for files that contain
         # a `# rbs_inline: enabled` magic comment. When `Mode` is `opt_out`, all files
-        # are checked unless they contain `# rbs_inline: disabled`. When `Mode` is not
-        # set, all files are checked (legacy behavior).
+        # are checked unless they contain `# rbs_inline: disabled`.
         #
         # This module is designed to be `prepend`ed to a cop so that it can short-circuit
         # the cop's heavy work (annotation parsing via `parse_comments`) and suppress any
@@ -17,32 +16,11 @@ module RuboCop
         #
         # @rbs module-self RuboCop::Cop::Base
         module FileFilter
-          # @rbs! type mode = :opt_in | :opt_out
+          include ModeConfig
 
           MAGIC_COMMENT_ENABLED  = /\A# rbs_inline: enabled\R?\z/ #: Regexp
           MAGIC_COMMENT_DISABLED = /\A# rbs_inline: disabled\R?\z/ #: Regexp
 
-          SUPPORTED_MODES = %i[opt_in opt_out].freeze #: Array[mode]
-
-          # Tracks Mode values that have already been reported as invalid, so we
-          # only emit one warning per typo across the whole rubocop run instead of
-          # one per (file × cop).
-          # @rbs self.@warned_invalid_modes: Hash[String, bool]
-
-          @warned_invalid_modes = {} # rubocop:disable Style/RbsInline/UntypedInstanceVariable
-
-          # @rbs raw: untyped
-          def self.warn_invalid_mode(raw) #: void
-            key = raw.to_s
-            return if @warned_invalid_modes[key]
-
-            @warned_invalid_modes[key] = true
-            Kernel.warn(
-              "[rubocop-rbs_inline] Style/RbsInline Mode #{raw.inspect} is not supported. " \
-              "Expected one of: #{SUPPORTED_MODES.join(", ")}. Filtering is disabled for this run."
-            )
-          end
-
           # @rbs @rbs_inline_skip_file: bool
 
           def on_new_investigation #: void
@@ -68,28 +46,12 @@ module RuboCop
           private
 
           def skip_by_mode? #: bool
-            mode = configured_mode
-            return false if mode.nil?
-
             # `# rbs_inline: disabled` always opts a file out, regardless of Mode
             # (matches rbs-inline itself: rbs-inline skips disabled files in both
             # opt_in and opt_out modes).
             return true if rbs_inline_disabled?
 
-            mode == :opt_in && !rbs_inline_enabled?
-          end
-
-          def configured_mode #: mode?
-            raw = cop_config["Mode"]
-            return nil if raw.nil?
-
-            # `raw.to_s.to_sym` handles YAML-native Integer / Boolean without
-            # raising NoMethodError on the plain `to_sym`.
-            mode = raw.to_s.to_sym
-            return mode if SUPPORTED_MODES.include?(mode)
-
-            FileFilter.warn_invalid_mode(raw)
-            nil
+            configured_mode == :opt_in && !rbs_inline_enabled?
           end
 
           # Iterate the already-materialized `processed_source.comments` so this

data/lib/rubocop/cop/style/rbs_inline/mixin/mode_config.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      module RbsInline
+        # Resolves the `Mode` setting shared by every cop in the `Style/RbsInline`
+        # department.
+        #
+        # @rbs module-self RuboCop::Cop::Base
+        module ModeConfig
+          # @rbs! type mode = :opt_in | :opt_out
+
+          SUPPORTED_MODES = %i[opt_in opt_out].freeze #: Array[mode]
+
+          # Hook RuboCop calls while mobilizing its cops, so an unsupported `Mode`
+          # fails the run as a config error instead of an error on every file.
+          def validate_config #: void
+            configured_mode
+          end
+
+          private
+
+          def configured_mode #: mode
+            raw = cop_config["Mode"]
+            # `raw.to_s.to_sym` handles YAML-native Integer / Boolean without
+            # raising NoMethodError on the plain `to_sym`.
+            mode = raw.to_s.to_sym
+            return mode if SUPPORTED_MODES.include?(mode)
+
+            raise ValidationError,
+                  "`Style/RbsInline: Mode: #{raw.inspect}` is not supported. " \
+                  "Expected one of: #{SUPPORTED_MODES.join(", ")}."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/style/rbs_inline/require_rbs_inline_comment.rb

@@ -53,33 +53,20 @@ module RuboCop
         #   end
         #
         class RequireRbsInlineComment < Base
+          include ModeConfig
           include RangeHelp
           extend AutoCorrector
 
           MSG_MISSING = "Missing `# rbs_inline:` magic comment."
           MSG_FORBIDDEN = "Remove `# rbs_inline:` magic comment."
 
-          # @rbs self.@enforced_style_deprecation_warned: bool
-
-          @enforced_style_deprecation_warned = false # rubocop:disable Style/RbsInline/UntypedInstanceVariable
-
-          def self.enforced_style_deprecation_warned? #: bool
-            @enforced_style_deprecation_warned == true
-          end
-
-          def self.mark_enforced_style_deprecation_warned! #: void
-            @enforced_style_deprecation_warned = true
-          end
-
           def on_new_investigation #: void
             return if processed_source.buffer.source.empty?
 
-            warn_deprecated_enforced_style
-
             magic_comment = find_rbs_inline_magic_comment
             return if disabled?(magic_comment)
 
-            case effective_mode
+            case configured_mode
             when :opt_in then check_opt_in(magic_comment)
             when :opt_out then check_opt_out(magic_comment)
             end
@@ -154,36 +141,10 @@ module RuboCop
             comments[last_idx] || raise
           end
 
-          def effective_mode #: FileFilter::mode
-            mode = cop_config["Mode"]
-            if mode
-              # `raw.to_s.to_sym` handles YAML-native Integer / Boolean safely.
-              sym = mode.to_s.to_sym
-              return sym if FileFilter::SUPPORTED_MODES.include?(sym)
-
-              FileFilter.warn_invalid_mode(mode)
-            end
-
-            cop_config["EnforcedStyle"]&.to_sym == :never ? :opt_out : :opt_in
-          end
-
           def allow_missing_comment? #: bool
             cop_config["AllowMissingComment"] == true
           end
 
-          def warn_deprecated_enforced_style #: void
-            return if self.class.enforced_style_deprecation_warned?
-            return if cop_config["EnforcedStyle"].nil?
-
-            self.class.mark_enforced_style_deprecation_warned!
-            Kernel.warn(
-              "[rubocop-rbs_inline] Style/RbsInline/RequireRbsInlineComment.EnforcedStyle is deprecated. " \
-              "Please migrate to `Style/RbsInline: Mode: opt_in` (was `EnforcedStyle: always`) or " \
-              "`Style/RbsInline: Mode: opt_out` (was `EnforcedStyle: never`). " \
-              "EnforcedStyle will be removed in the next major version."
-            )
-          end
-
           def first_line_range #: Parser::Source::Range
             first_line = processed_source.ast&.source_range&.first_line || 1
             processed_source.buffer.line_range(first_line)

data/lib/rubocop/cop/style/rbs_inline/struct_new_with_block.rb

@@ -27,10 +27,11 @@ module RuboCop
         class StructNewWithBlock < Base
           prepend FileFilter
           include StructClassMatcher
+          include ASTUtils
 
           MSG = "Do not use `Struct.new` with a block. RBS::Inline does not parse block contents, " \
-                "so methods defined in the block will not be recognized. " \
-                "Use a separate class definition instead."
+                "so methods defined in the block will not be recognized. Keep the `Struct.new` call " \
+                "and move the methods into %<destination>s."
 
           # @rbs node: RuboCop::AST::SendNode
           def on_send(node) #: void
@@ -39,7 +40,18 @@ module RuboCop
             block_node = node.parent
             return unless block_node&.block_type?
 
-            add_offense(node)
+            add_offense(node, message: format(MSG, destination: destination(block_node)))
+          end
+
+          private
+
+          # The constant the definition is assigned to is the class to reopen.
+          # @rbs node: RuboCop::AST::Node
+          def destination(node) #: String
+            class_name = assigned_constant_name(node)
+            return "a `class` that reopens it" unless class_name
+
+            "`class #{class_name} ... end` written after it"
           end
         end
       end

data/lib/rubocop/rbs_inline/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module RbsInline
-    VERSION = "1.8.0"
+    VERSION = "2.0.0"
   end
 end

data/rbs_collection.lock.yaml

@@ -6,7 +6,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: diff-lcs
@@ -14,7 +14,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: fileutils
@@ -34,7 +34,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: logger
@@ -42,7 +42,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: monitor
@@ -58,7 +58,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: parser
@@ -66,7 +66,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: prism
@@ -78,7 +78,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -86,7 +86,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
@@ -106,7 +106,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop
@@ -114,7 +114,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop-ast
@@ -122,7 +122,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
+    revision: 82762423fc5694b82888ea89a972847cf19838c2
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop-numbered-params

data/sig/gems/rubocop/rubocop.rbs

@@ -7,6 +7,12 @@ module Parser
 end
 
 module RuboCop
+  class Error < StandardError
+  end
+
+  class ValidationError < Error
+  end
+
   module Cop
     module ConfigurableEnforcedStyle
       def no_acceptable_style!: () -> void

data/sig/rubocop/cop/style/rbs_inline/data_define_with_block.rbs

@@ -31,10 +31,18 @@ module RuboCop
 
           include DataClassMatcher
 
+          include ASTUtils
+
           MSG: ::String
 
           # @rbs node: RuboCop::AST::SendNode
           def on_send: (RuboCop::AST::SendNode node) -> void
+
+          private
+
+          # The constant the definition is assigned to is the class to reopen.
+          # @rbs node: RuboCop::AST::Node
+          def destination: (RuboCop::AST::Node node) -> String
         end
       end
     end

data/sig/rubocop/cop/style/rbs_inline/mixin/ast_utils.rbs

@@ -23,6 +23,11 @@ module RuboCop
           # @rbs node: RuboCop::AST::Node
           def source!: (RuboCop::AST::Node node) -> String
 
+          # Returns the name of the constant `node` is assigned to, or `nil` when the name
+          # is not statically determinable (e.g. `self::Foo = ...`).
+          # @rbs node: RuboCop::AST::Node
+          def assigned_constant_name: (RuboCop::AST::Node node) -> String?
+
           # : (RuboCop::AST::SymbolNode) -> Symbol
           # : (RuboCop::AST::StrNode) -> Symbol
           # : (RuboCop::AST::Node) -> Symbol?

data/sig/rubocop/cop/style/rbs_inline/mixin/file_filter.rbs

@@ -8,8 +8,7 @@ module RuboCop
         #
         # When `Mode` is `opt_in`, offenses are only reported for files that contain
         # a `# rbs_inline: enabled` magic comment. When `Mode` is `opt_out`, all files
-        # are checked unless they contain `# rbs_inline: disabled`. When `Mode` is not
-        # set, all files are checked (legacy behavior).
+        # are checked unless they contain `# rbs_inline: disabled`.
         #
         # This module is designed to be `prepend`ed to a cop so that it can short-circuit
         # the cop's heavy work (annotation parsing via `parse_comments`) and suppress any
@@ -17,19 +16,12 @@ module RuboCop
         #
         # @rbs module-self RuboCop::Cop::Base
         module FileFilter : RuboCop::Cop::Base
-          type mode = :opt_in | :opt_out
+          include ModeConfig
 
           MAGIC_COMMENT_ENABLED: Regexp
 
           MAGIC_COMMENT_DISABLED: Regexp
 
-          SUPPORTED_MODES: Array[mode]
-
-          self.@warned_invalid_modes: Hash[String, bool]
-
-          # @rbs raw: untyped
-          def self.warn_invalid_mode: (untyped raw) -> void
-
           @rbs_inline_skip_file: bool
 
           def on_new_investigation: () -> void
@@ -47,8 +39,6 @@ module RuboCop
 
           def skip_by_mode?: () -> bool
 
-          def configured_mode: () -> mode?
-
           # Iterate the already-materialized `processed_source.comments` so this
           # matches RequireRbsInlineComment's detection exactly (line endings,
           # indented comments, heredoc/string content are all handled correctly

data/sig/rubocop/cop/style/rbs_inline/mixin/mode_config.rbs

@@ -0,0 +1,27 @@
+# Generated from lib/rubocop/cop/style/rbs_inline/mixin/mode_config.rb with RBS::Inline
+
+module RuboCop
+  module Cop
+    module Style
+      module RbsInline
+        # Resolves the `Mode` setting shared by every cop in the `Style/RbsInline`
+        # department.
+        #
+        # @rbs module-self RuboCop::Cop::Base
+        module ModeConfig : RuboCop::Cop::Base
+          type mode = :opt_in | :opt_out
+
+          SUPPORTED_MODES: Array[mode]
+
+          # Hook RuboCop calls while mobilizing its cops, so an unsupported `Mode`
+          # fails the run as a config error instead of an error on every file.
+          def validate_config: () -> void
+
+          private
+
+          def configured_mode: () -> mode
+        end
+      end
+    end
+  end
+end

data/sig/rubocop/cop/style/rbs_inline/require_rbs_inline_comment.rbs

@@ -52,6 +52,8 @@ module RuboCop
         #   class Foo
         #   end
         class RequireRbsInlineComment < Base
+          include ModeConfig
+
           include RangeHelp
 
           extend AutoCorrector
@@ -60,12 +62,6 @@ module RuboCop
 
           MSG_FORBIDDEN: ::String
 
-          self.@enforced_style_deprecation_warned: bool
-
-          def self.enforced_style_deprecation_warned?: () -> bool
-
-          def self.mark_enforced_style_deprecation_warned!: () -> void
-
           def on_new_investigation: () -> void
 
           private
@@ -90,12 +86,8 @@ module RuboCop
 
           def find_last_comment_in_first_block: () -> Parser::Source::Comment
 
-          def effective_mode: () -> FileFilter::mode
-
           def allow_missing_comment?: () -> bool
 
-          def warn_deprecated_enforced_style: () -> void
-
           def first_line_range: () -> Parser::Source::Range
         end
       end

data/sig/rubocop/cop/style/rbs_inline/struct_new_with_block.rbs

@@ -28,10 +28,18 @@ module RuboCop
 
           include StructClassMatcher
 
+          include ASTUtils
+
           MSG: ::String
 
           # @rbs node: RuboCop::AST::SendNode
           def on_send: (RuboCop::AST::SendNode node) -> void
+
+          private
+
+          # The constant the definition is assigned to is the class to reopen.
+          # @rbs node: RuboCop::AST::Node
+          def destination: (RuboCop::AST::Node node) -> String
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rbs_inline
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-26 00:00:00.000000000 Z
+date: 2026-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller
@@ -65,10 +65,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".claude/hooks/claude-code-web-session-start.sh"
 - ".claude/hooks/pre-commit-check.sh"
+- ".claude/hooks/protect-sig-files.sh"
 - ".claude/hooks/rbs-inline.sh"
 - ".claude/hooks/self-review.sh"
-- ".claude/hooks/setup.sh"
 - ".claude/settings.json"
 - ".rspec"
 - ".rubocop.yml"
@@ -102,6 +103,7 @@ files:
 - lib/rubocop/cop/style/rbs_inline/mixin/data_struct_helper.rb
 - lib/rubocop/cop/style/rbs_inline/mixin/file_filter.rb
 - lib/rubocop/cop/style/rbs_inline/mixin/missing_class_annotation.rb
+- lib/rubocop/cop/style/rbs_inline/mixin/mode_config.rb
 - lib/rubocop/cop/style/rbs_inline/mixin/source_code_helper.rb
 - lib/rubocop/cop/style/rbs_inline/mixin/struct_class_matcher.rb
 - lib/rubocop/cop/style/rbs_inline/parameters_separator.rb
@@ -140,6 +142,7 @@ files:
 - sig/rubocop/cop/style/rbs_inline/mixin/data_struct_helper.rbs
 - sig/rubocop/cop/style/rbs_inline/mixin/file_filter.rbs
 - sig/rubocop/cop/style/rbs_inline/mixin/missing_class_annotation.rbs
+- sig/rubocop/cop/style/rbs_inline/mixin/mode_config.rbs
 - sig/rubocop/cop/style/rbs_inline/mixin/source_code_helper.rbs
 - sig/rubocop/cop/style/rbs_inline/mixin/struct_class_matcher.rbs
 - sig/rubocop/cop/style/rbs_inline/parameters_separator.rbs