rubocop-rbs_inline 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f1bf0f9d17e73042a1c33ae69ffe0cf079bedb1423119b36a524d085cfe6f6a
-  data.tar.gz: '0797210c998bb891bcd07b68f3d4cc9e779cf775ea051e6529c8b052ed58642a'
+  metadata.gz: 6bb68dac2a82e53e5c2b8640e5feab967ca592c9a91927ed91f921c705629c1e
+  data.tar.gz: c35f3396438d8776982b2907e5d7cfe8d72f902b20e041158ba985a05f43aa41
 SHA512:
-  metadata.gz: bb484322f4605db7c86dddf047de1ad1dbe477faf11b7d736edaa544132b87c1b7c0481cd13a6154662a0e318daeaf4880102882288cf02b84ba88eb8d3372f5
-  data.tar.gz: 141d659c28c9c9b2bef362b7f5b57bccf68aaec436b553e19785d97d162a0293c94d0d79ad7d29b7300f0b2583cce353c3152503ec965ab521eeff6fe3bb1127
+  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/hooks/self-review.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+#
+# PreToolUse hook: review code before `git commit`.
+#
+# Fires before a Bash `git commit` command and blocks the first commit attempt
+# for a given change-set, asking Claude to review the code before committing.
+# The review uses the `self-review` skill when available, and falls back to the
+# bundled `code-review` skill otherwise — so the hook works even in projects
+# that don't ship the custom self-review skill.
+#
+# A per-change-set marker (keyed by a hash of the diff, stored under .git/)
+# prevents an infinite block loop: once a change-set has been surfaced for
+# review, the matching commit is allowed through. If the review leads to fixes,
+# the diff changes, so the new state is reviewed once more before it commits.
+#
+
+set -euo pipefail
+
+# Read JSON input from stdin
+input=$(cat)
+
+tool_name=$(echo "$input" | jq -r '.tool_name // empty')
+command=$(echo "$input" | jq -r '.tool_input.command // empty')
+
+# Only gate the Bash tool running a git commit.
+if [[ "$tool_name" != "Bash" ]]; then
+  exit 0
+fi
+# Match `git commit`, or `git -C <path> commit`.
+commit_re='git[[:space:]]+(-C[[:space:]]+[^[:space:]]+[[:space:]]+)?commit'
+if [[ ! "$command" =~ $commit_re ]]; then
+  exit 0
+fi
+
+# If the command targets a specific repo via `git -C <path>`, operate there too.
+work_dir="."
+if [[ "$command" =~ git[[:space:]]+-C[[:space:]]+([^[:space:]]+) ]]; then
+  work_dir="${BASH_REMATCH[1]}"
+fi
+
+# Not a git repo → nothing to do.
+git_dir=$(git -C "$work_dir" rev-parse --absolute-git-dir 2>/dev/null || true)
+if [[ -z "$git_dir" ]]; then
+  exit 0
+fi
+
+# Hash what will be committed. `git status --porcelain` is included so a commit
+# that only adds untracked files isn't mistaken for empty; `git diff HEAD` adds
+# tracked content. On the first commit there is no HEAD, so use the working state.
+if git -C "$work_dir" rev-parse --verify HEAD >/dev/null 2>&1; then
+  changeset=$(git -C "$work_dir" status --porcelain; git -C "$work_dir" diff HEAD)
+else
+  changeset=$(git -C "$work_dir" status --porcelain; git -C "$work_dir" diff; git -C "$work_dir" diff --cached)
+fi
+
+# Nothing to review (e.g. a message-only `--amend`) → let it proceed.
+if [[ -z "$changeset" ]]; then
+  exit 0
+fi
+
+hash=$(printf '%s' "$changeset" | git hash-object --stdin)
+state_file="$git_dir/self-review-reviewed"
+
+# Already surfaced for review → allow the commit.
+if [[ -f "$state_file" ]] && grep -qxF "$hash" "$state_file"; then
+  exit 0
+fi
+
+# Record this change-set and block once to force a review first.
+echo "$hash" >> "$state_file"
+
+review_prompt='SELF-REVIEW REQUIRED before committing. Review the changes that are
+about to be committed BEFORE running git commit again:
+
+- If the `self-review` skill is available, invoke it (Skill tool, skill "self-review").
+- Otherwise, run the bundled `/code-review` skill on the working diff.
+
+If the review finds issues, fix them and review again. Once it is clean, run the same
+git commit command again to proceed — it will be allowed through.'
+
+jq -n --arg reason "$review_prompt" '{
+  "hookSpecificOutput": {
+    "hookEventName": "PreToolUse",
+    "permissionDecision": "deny",
+    "permissionDecisionReason": $reason
+  }
+}'
+
+exit 0

data/.claude/settings.json

@@ -6,19 +6,34 @@
         "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": [
           {
             "type": "command",
             "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/pre-commit-check.sh"
+          },
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/self-review.sh",
+            "timeout": 10000
           }
         ]
       }

data/.rubocop.yml

@@ -44,27 +44,23 @@ Naming/FileName:
 RSpec/ExampleLength:
   Enabled: false
 
-RSpec/MultipleMemoizedHelpers:
-  Max: 10
-
 RSpec/MultipleExpectations:
   Enabled: false
 
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
+
 RSpec/NamedSubject:
   Enabled: false
 
 RSpec/NestedGroups:
   Max: 5
 
-# RbsInline
-Style/RbsInline/MissingTypeAnnotation:
-  EnforcedStyle: doc_style_and_return_annotation
-
-Style/RbsInline/RedundantTypeAnnotation:
-  EnforcedStyle: doc_style_and_return_annotation
-
-Style/RbsInline/RequireRbsInlineComment:
-  EnforcedStyle: never
+# Mixin specs mirror `lib/.../rbs_inline/mixin/`, but the modules keep the
+# `RuboCop::Cop::Style::RbsInline` namespace, so the path never matches the constant.
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - "spec/rubocop/cop/style/rbs_inline/mixin/**/*_spec.rb"
 
 # Style
 Style/AccessorGrouping:
@@ -79,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,35 @@
 # 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
+
+- **Style/RbsInline**: Added a shared `Mode` setting (`opt_in` / `opt_out`) at the department level to filter which files each cop checks based on the `# rbs_inline: enabled` / `disabled` magic comment.
+- **Style/RbsInline/RequireRbsInlineComment**: Added the `AllowMissingComment` option, which lets projects use rbs-inline on only some of their files while keeping the opt-in filter for the rest.
+
+### Bug Fixes
+
+- **Style/RbsInline/DataClassCommentAlignment**, **Style/RbsInline/StructClassCommentAlignment**: Fixed the expected annotation column being derived from arguments that cannot carry an annotation (a splat, or for `Struct.new` a leading struct name or `keyword_init:`), which reported false positives on already aligned code and made autocorrect over-pad the annotations.
+- **Style/RbsInline/MissingDataClassAnnotation**, **Style/RbsInline/MissingStructClassAnnotation**: Fixed autocorrect padding the inserted annotations to the width of an argument that cannot carry one (a splat, or for `Struct.new` a leading struct name or `keyword_init:`).
+- **Style/RbsInline/UnmatchedAnnotations**: Fixed a crash on method definitions taking a destructuring argument (ex. `def foo((a, b))`). The crash also aborted the inspection of the method definition, causing false positives on its valid annotations.
+- **Style/RbsInline/RequireRbsInlineComment**: Fixed a crash (`IndexError`) on a file whose leading comment block ends without a trailing newline. The offense is now reported and the magic comment is inserted on its own line.
+- **Style/RbsInline/RedundantTypeAnnotation**: Fixed `--auto-gen-config` generating an `EnforcedStyle` that does not resolve the offenses (including the unsupported `return_type_annotation`, which made RuboCop fail to start on the generated `.rubocop_todo.yml`). No style can make redundant annotations offense-free, so the offending files are now excluded instead.
+
+### Deprecations
+
+- **Style/RbsInline/RequireRbsInlineComment**: `EnforcedStyle` is deprecated in favor of the department-level `Mode`. Migrate `always` → `Style/RbsInline: Mode: opt_in`, `never` → `Style/RbsInline: Mode: opt_out`. Will be removed in the next major version.
+
 ## 1.7.0 (2026-07-20)
 
 ### New Features

data/CLAUDE.md

@@ -23,7 +23,7 @@ bundle exec rake rubocop:autocorrect_all   # all autocorrect
 bundle exec rake steep                     # runs steep check
 bundle exec rake rbs:validate              # validates RBS signatures
 
-# Default rake task (runs specs, rubocop, and type check)
+# Default rake task (rubocop, specs, steep, rbs:validate)
 bundle exec rake
 
 # Generate a new cop
@@ -34,32 +34,29 @@ bundle exec rake 'new_cop[Style/RbsInline/CopName]'
 
 ### Cop Structure
 
-All cops live under `RuboCop::Cop::Style::RbsInline` namespace in `lib/rubocop/cop/style/rbs_inline/`. Each cop validates a different aspect of RBS::Inline annotations:
+Cops live in `lib/rubocop/cop/style/rbs_inline/`, one per file; the shared modules they mix in live in `lib/rubocop/cop/style/rbs_inline/mixin/`. Both are under the `RuboCop::Cop::Style::RbsInline` namespace — only the directory separates them, as in `rubocop`'s `cop/mixin/`. `config/default.yml` lists every cop and its options; read it instead of a list kept here.
 
-- **InvalidComment** - Validates `#:` and `# @rbs` comment syntax
-- **InvalidTypes** - Validates RBS type syntax in annotations
-- **KeywordSeparator** - Ensures keywords like `module-self` aren't followed by `:`
-- **ParametersSeparator** - Ensures parameter annotations use `:` separator
-- **RedundantArgumentType** - Detects redundant argument type specs (configurable style)
-- **RedundantReturnType** - Detects redundant return type specs (3 style options)
-- **UnmatchedAnnotations** - Ensures annotation parameters match actual method parameters
+Conventions:
 
-### Shared CommentParser Module
-
-`comment_parser.rb` is a module mixed into cops that need to parse RBS::Inline annotations. It uses `RBS::Inline::AnnotationParser` and Prism to parse comments, and provides helpers for finding leading annotations, inline comments, and return annotations relative to method definitions.
+- 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
 
-The gem integrates with RuboCop via LintRoller (`lib/rubocop/rbs_inline/plugin.rb`). Default cop configuration is in `config/default.yml`.
+The gem integrates with RuboCop via LintRoller (`lib/rubocop/rbs_inline/plugin.rb`), which points RuboCop at `config/default.yml`.
 
 ### Type Signatures
 
-RBS type signatures for all source files are maintained in `sig/` directory. The project uses Steep for static type checking, configured via `Steepfile`.
+`sig/rubocop/` is generated from `lib/` by the hooks in `.claude/hooks/`. Never write anything there. `sig/gems/` is hand-written stubs for third-party gems and is *not* regenerated — do not delete it when refreshing signatures.
 
 ### Testing Pattern
 
 Tests use RuboCop's RSpec support helpers (`expect_offense` / `expect_no_offenses`). Test files mirror the cop file structure under `spec/rubocop/cop/style/rbs_inline/`.
 
+`: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

@@ -27,6 +27,22 @@ plugins:
 
 rubocop-rbs_inline provides the following cops to validate [RBS::Inline](https://github.com/soutaro/rbs-inline) annotations:
 
+### Style/RbsInline (shared configuration)
+
+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` (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.
+
+Declare it once at the department level in your `.rubocop.yml`:
+
+```yaml
+Style/RbsInline:
+  Mode: opt_out
+```
+
+Any other value (e.g. `Mode: opt-in`) fails the run with a configuration error.
+
 ### Style/RbsInline/DataClassCommentAlignment
 
 Checks that `#:` inline type annotations in a multiline `Data.define` call are aligned to the same column. The expected column is determined by the longest attribute name (plus its trailing comma). Folded `Data.define` calls (where multiple attributes share a line) are excluded.
@@ -238,7 +254,11 @@ Enforces that method definitions and `attr_*` declarations have RBS inline type
   - `all`: Checks all methods regardless of visibility
   - `public`: Only checks public methods and `attr_*` declarations
 
-Methods annotated with `# @rbs skip` are always excluded.
+Always excluded, regardless of `EnforcedStyle`:
+
+- Methods annotated with `# @rbs skip` or `# @rbs override`.
+- Parameters whose name starts with `_`.
+- The `...` forward-all parameter.
 
 **Examples (EnforcedStyle: doc_style):**
 ```ruby
@@ -466,13 +486,24 @@ end
 
 ### Style/RbsInline/RequireRbsInlineComment
 
-Enforces presence or absence of `# rbs_inline:` magic comment for consistency.
+Enforces the presence or absence of the `# rbs_inline:` magic comment, based on the shared [`Mode`](#stylerbsinline-shared-configuration) setting:
 
-**Configuration:** `EnforcedStyle` (default: `always`)
-- `always`: Requires `# rbs_inline: enabled` or `# rbs_inline: disabled`
-- `never`: Forbids `# rbs_inline: enabled` (allows `# rbs_inline: disabled`)
+- Under `Mode: opt_in`, files must carry `# rbs_inline: enabled` (or `# rbs_inline: disabled`).
+- Under `Mode: opt_out`, files must not carry `# rbs_inline: enabled`.
+
+**Configuration:**
+
+- `AllowMissingComment` (default: `false`) — under `Mode: opt_in`, set to `true` to skip enforcement of the magic comment on individual files. Useful when only part of the project uses rbs-inline: the shared `Mode: opt_in` filter still applies to every other cop (they only report on files that opt in), but this cop stops requiring the magic comment on files that intentionally do not use rbs-inline.
+
+```yaml
+Style/RbsInline:
+  Mode: opt_in
 
-**Examples (EnforcedStyle: always):**
+Style/RbsInline/RequireRbsInlineComment:
+  AllowMissingComment: true
+```
+
+**Examples (Mode: opt_in):**
 ```ruby
 # bad
 class Foo
@@ -484,6 +515,18 @@ class Foo
 end
 ```
 
+**Examples (Mode: opt_in, AllowMissingComment: true):**
+```ruby
+# good - the magic comment is not enforced per file
+class Foo
+end
+
+# good
+# rbs_inline: enabled
+class Foo
+end
+```
+
 ### Style/RbsInline/StructClassCommentAlignment
 
 Checks that `#:` inline type annotations in a multiline `Struct.new` call are aligned to the same column. The expected column is determined by the longest attribute name (plus its trailing comma). Folded `Struct.new` calls (where multiple attributes share a line) are excluded.
@@ -613,6 +656,8 @@ Style/RbsInline/MissingTypeAnnotation:
   Visibility: public
 ```
 
+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.
 
 ## Development

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,6 +5,7 @@ Style/RbsInline:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
+  Mode: opt_in
 
 Style/RbsInline/DataClassCommentAlignment:
   Description: "Checks that `#:` inline type annotations in `Data.define` blocks are aligned."
@@ -94,10 +95,7 @@ Style/RbsInline/RequireRbsInlineComment:
   Description: "Checks the presence or absence of `# rbs_inline: enabled` magic comment."
   Enabled: true
   VersionAdded: "1.5.0"
-  EnforcedStyle: always
-  SupportedStyles:
-    - always
-    - never
+  AllowMissingComment: false
 
 Style/RbsInline/StructClassCommentAlignment:
   Description: "Checks that `#:` inline type annotations in `Struct.new` blocks are aligned."

data/lib/rubocop/cop/rbs_inline_cops.rb

@@ -1,11 +1,20 @@
 # frozen_string_literal: true
 
-require_relative "style/rbs_inline/ast_utils"
-require_relative "style/rbs_inline/source_code_helper"
-require_relative "style/rbs_inline/comment_parser"
-require_relative "style/rbs_inline/data_struct_helper"
-require_relative "style/rbs_inline/missing_class_annotation"
-require_relative "style/rbs_inline/class_comment_alignment"
+# Mixins first, in dependency order. Cops follow, alphabetically: `rake new_cop` sorts a
+# generated require only against the others in the same directory, so the two blocks have
+# to stay apart for it to land in the right place.
+require_relative "style/rbs_inline/mixin/annotation_keywords"
+require_relative "style/rbs_inline/mixin/ast_utils"
+require_relative "style/rbs_inline/mixin/source_code_helper"
+require_relative "style/rbs_inline/mixin/comment_parser"
+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"
+
 require_relative "style/rbs_inline/data_class_comment_alignment"
 require_relative "style/rbs_inline/data_define_with_block"
 require_relative "style/rbs_inline/embedded_rbs_spacing"
@@ -14,6 +23,7 @@ require_relative "style/rbs_inline/invalid_types"
 require_relative "style/rbs_inline/keyword_separator"
 require_relative "style/rbs_inline/method_comment_spacing"
 require_relative "style/rbs_inline/missing_data_class_annotation"
+require_relative "style/rbs_inline/missing_struct_class_annotation"
 require_relative "style/rbs_inline/missing_type_annotation"
 require_relative "style/rbs_inline/parameters_separator"
 require_relative "style/rbs_inline/redundant_annotation_with_skip"
@@ -22,7 +32,6 @@ require_relative "style/rbs_inline/redundant_type_annotation"
 require_relative "style/rbs_inline/require_rbs_inline_comment"
 require_relative "style/rbs_inline/struct_class_comment_alignment"
 require_relative "style/rbs_inline/struct_new_with_block"
-require_relative "style/rbs_inline/missing_struct_class_annotation"
 require_relative "style/rbs_inline/unmatched_annotations"
 require_relative "style/rbs_inline/untyped_instance_variable"
 require_relative "style/rbs_inline/variable_comment_spacing"

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

@@ -26,7 +26,9 @@ module RuboCop
         #   )
         #
         class DataClassCommentAlignment < Base
+          prepend FileFilter
           include ClassCommentAlignment
+          include DataClassMatcher
           extend AutoCorrector
 
           MSG = "Misaligned inline type annotation for Data attribute."
@@ -37,15 +39,6 @@ module RuboCop
 
             check_comment_alignment(node)
           end
-
-          private
-
-          # @rbs node: RuboCop::AST::SendNode
-          def struct_like_class?(node) #: bool
-            return false unless node.method_name == :define
-
-            (r = node.receiver).is_a?(RuboCop::AST::ConstNode) && r.short_name == :Data
-          end
         end
       end
     end

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

@@ -28,9 +28,13 @@ module RuboCop
         #   end
         #
         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
@@ -39,16 +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
 
-          # @rbs node: RuboCop::AST::SendNode
-          def struct_like_class?(node) #: bool
-            return false unless node.method_name == :define
+          # 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
 
-            (r = node.receiver).is_a?(RuboCop::AST::ConstNode) && r.short_name == :Data
+            "`class #{class_name} ... end` written after it"
           end
         end
       end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "source_code_helper"
-require_relative "comment_parser"
+require_relative "mixin/source_code_helper"
+require_relative "mixin/comment_parser"
 
 module RuboCop
   module Cop
@@ -26,6 +26,7 @@ module RuboCop
         #   end
         #
         class EmbeddedRbsSpacing < Base
+          prepend FileFilter
           extend AutoCorrector
           include SourceCodeHelper
           include CommentParser