rubocop-rbs_inline 1.6.0 → 1.7.0

data/rbs_collection.lock.yaml

@@ -6,7 +6,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     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: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: fileutils
@@ -25,12 +25,16 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: language_server-protocol
+  version: 3.17.0.6
+  source:
+    type: rubygems
 - name: lint_roller
   version: '1.1'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: logger
@@ -38,7 +42,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: monitor
@@ -54,7 +58,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: parser
@@ -62,7 +66,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: prism
@@ -74,7 +78,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -82,7 +86,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
@@ -102,7 +106,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop
@@ -110,7 +114,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop-ast
@@ -118,9 +122,13 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    revision: ea56a88d1c0ac98e79f8ea5bb19a139da768ba10
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: rubocop-numbered-params
+  version: 1.0.1
+  source:
+    type: rubygems
 - name: strscan
   version: '0'
   source:

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

@@ -0,0 +1,34 @@
+# Generated from lib/rubocop/cop/style/rbs_inline/class_comment_alignment.rb with RBS::Inline
+
+module RuboCop
+  module Cop
+    module Style
+      module RbsInline
+        # Shared behavior for cops that ensure `#:` inline type annotations on
+        # struct-like class attributes (`Data.define` / `Struct.new`) are aligned.
+        #
+        # The including cop matches the definition node (e.g. via `struct_like_class?`)
+        # and calls {#check_comment_alignment}.
+        #
+        # @rbs module-self RuboCop::Cop::Base
+        module ClassCommentAlignment : RuboCop::Cop::Base
+          include DataStructHelper
+
+          # @rbs node: RuboCop::AST::SendNode
+          def check_comment_alignment: (RuboCop::AST::SendNode node) -> void
+
+          private
+
+          # @rbs node: RuboCop::AST::SendNode
+          def check_annotation_alignment: (RuboCop::AST::SendNode node) -> void
+
+          # @rbs corrector: RuboCop::Cop::Corrector
+          # @rbs arg: RuboCop::AST::Node
+          # @rbs comment: Parser::Source::Comment
+          # @rbs expected_col: Integer
+          def correct_alignment: (RuboCop::Cop::Corrector corrector, RuboCop::AST::Node arg, Parser::Source::Comment comment, Integer expected_col) -> void
+        end
+      end
+    end
+  end
+end

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

@@ -25,11 +25,7 @@ module RuboCop
         #     :visibility  #: Symbol
         #   )
         class DataClassCommentAlignment < Base
-          include ASTUtils
-
-          include RangeHelp
-
-          include SourceCodeHelper
+          include ClassCommentAlignment
 
           extend AutoCorrector
 
@@ -41,31 +37,7 @@ module RuboCop
           private
 
           # @rbs node: RuboCop::AST::SendNode
-          def data_define?: (RuboCop::AST::SendNode node) -> bool
-
-          # @rbs arg: RuboCop::AST::Node
-          def data_attribute?: (RuboCop::AST::Node arg) -> bool
-
-          # @rbs node: RuboCop::AST::SendNode
-          def data_attributes: (RuboCop::AST::SendNode node) -> Array[RuboCop::AST::Node]
-
-          # @rbs node: RuboCop::AST::SendNode
-          def folded_data_class?: (RuboCop::AST::SendNode node) -> bool
-
-          # @rbs node: RuboCop::AST::SendNode
-          def check_annotation_alignment: (RuboCop::AST::SendNode node) -> void
-
-          # @rbs line: Integer
-          def inline_type_comment: (Integer line) -> Parser::Source::Comment?
-
-          # @rbs node: RuboCop::AST::SendNode
-          def annotation_column: (RuboCop::AST::SendNode node) -> Integer
-
-          # @rbs corrector: RuboCop::Cop::Corrector
-          # @rbs arg: RuboCop::AST::Node
-          # @rbs comment: Parser::Source::Comment
-          # @rbs expected_col: Integer
-          def correct_alignment: (RuboCop::Cop::Corrector corrector, RuboCop::AST::Node arg, Parser::Source::Comment comment, Integer expected_col) -> void
+          def struct_like_class?: (RuboCop::AST::SendNode node) -> bool
         end
       end
     end

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

@@ -35,7 +35,7 @@ module RuboCop
           private
 
           # @rbs node: RuboCop::AST::SendNode
-          def data_define?: (RuboCop::AST::SendNode node) -> bool
+          def struct_like_class?: (RuboCop::AST::SendNode node) -> bool
         end
       end
     end

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

@@ -0,0 +1,55 @@
+# Generated from lib/rubocop/cop/style/rbs_inline/data_struct_helper.rb with RBS::Inline
+
+module RuboCop
+  module Cop
+    module Style
+      module RbsInline
+        # Shared logic for cops that check inline type annotations on struct-like
+        # class definitions such as `Data.define` and `Struct.new`.
+        #
+        # Including cops decide which nodes to check by defining their own matcher
+        # (e.g. `struct_like_class?`); this module only provides helpers that operate
+        # on an already-matched definition node. Cops may override {#attr_argument?}
+        # when the set of attribute arguments differs from the default (e.g.
+        # `Struct.new` treats a leading string argument as the struct name rather than
+        # an attribute).
+        #
+        # @rbs module-self RuboCop::Cop::Base
+        module DataStructHelper : RuboCop::Cop::Base
+          include ASTUtils
+
+          include SourceCodeHelper
+
+          include RangeHelp
+
+          # @rbs arg: RuboCop::AST::Node
+          def attr_argument?: (RuboCop::AST::Node arg) -> bool
+
+          # @rbs node: RuboCop::AST::SendNode
+          def attr_arguments: (RuboCop::AST::SendNode node) -> Array[RuboCop::AST::Node]
+
+          # @rbs node: RuboCop::AST::SendNode
+          def folded?: (RuboCop::AST::SendNode node) -> bool
+
+          # @rbs line: Integer
+          def inline_type_annotation?: (Integer line) -> boolish
+
+          # @rbs line: Integer
+          def inline_type_comment: (Integer line) -> Parser::Source::Comment?
+
+          # @rbs line: Integer
+          def find_regular_comment: (Integer line) -> Parser::Source::Comment?
+
+          # @rbs node: RuboCop::AST::SendNode
+          def annotation_column: (RuboCop::AST::SendNode node) -> Integer
+
+          # @rbs node: RuboCop::AST::SendNode
+          def longest_argname: (RuboCop::AST::SendNode node) -> String
+
+          # @rbs node: RuboCop::AST::SendNode
+          def build_multiline_replacement: (RuboCop::AST::SendNode node) -> String
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# Generated from lib/rubocop/cop/style/rbs_inline/missing_class_annotation.rb with RBS::Inline
+
+module RuboCop
+  module Cop
+    module Style
+      module RbsInline
+        # Shared behavior for cops that ensure struct-like class attributes have
+        # inline type annotations (`Data.define` / `Struct.new`).
+        #
+        # The including cop matches the definition node (e.g. via `struct_like_class?`)
+        # and calls {#check_missing_annotations}.
+        #
+        # @rbs module-self RuboCop::Cop::Base
+        module MissingClassAnnotation : RuboCop::Cop::Base
+          include DataStructHelper
+
+          # @rbs node: RuboCop::AST::SendNode
+          def check_missing_annotations: (RuboCop::AST::SendNode node) -> void
+
+          private
+
+          # @rbs node: RuboCop::AST::SendNode
+          def add_offenses_for_folded: (RuboCop::AST::SendNode node) -> void
+
+          # @rbs node: RuboCop::AST::SendNode
+          def check_multiline: (RuboCop::AST::SendNode node) -> void
+
+          # @rbs corrector: RuboCop::Cop::Corrector
+          # @rbs node: RuboCop::AST::SendNode
+          # @rbs arg: RuboCop::AST::Node
+          def correct_multiline: (RuboCop::Cop::Corrector corrector, RuboCop::AST::SendNode node, RuboCop::AST::Node arg) -> void
+
+          # @rbs corrector: RuboCop::Cop::Corrector
+          # @rbs node: RuboCop::AST::SendNode
+          # @rbs arg: RuboCop::AST::Node
+          def insert_annotation: (RuboCop::Cop::Corrector corrector, RuboCop::AST::SendNode node, RuboCop::AST::Node arg) -> void
+        end
+      end
+    end
+  end
+end

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

@@ -20,11 +20,7 @@ module RuboCop
         #     :visibility  #: Symbol
         #   )
         class MissingDataClassAnnotation < Base
-          include ASTUtils
-
-          include RangeHelp
-
-          include SourceCodeHelper
+          include MissingClassAnnotation
 
           extend AutoCorrector
 
@@ -36,47 +32,7 @@ module RuboCop
           private
 
           # @rbs node: RuboCop::AST::SendNode
-          def data_define?: (RuboCop::AST::SendNode node) -> bool
-
-          # @rbs arg: RuboCop::AST::Node
-          def data_attribute?: (RuboCop::AST::Node arg) -> bool
-
-          # @rbs node: RuboCop::AST::SendNode
-          def data_attributes: (RuboCop::AST::SendNode node) -> Array[RuboCop::AST::Node]
-
-          # @rbs line: Integer
-          def inline_type_annotation?: (Integer line) -> boolish
-
-          # @rbs node: RuboCop::AST::SendNode
-          def folded_data_class?: (RuboCop::AST::SendNode node) -> bool
-
-          # @rbs node: RuboCop::AST::SendNode
-          def add_offenses_for_folded_data_class: (RuboCop::AST::SendNode node) -> void
-
-          # @rbs node: RuboCop::AST::SendNode
-          def longest_argname: (RuboCop::AST::SendNode node) -> String
-
-          # @rbs node: RuboCop::AST::SendNode
-          def build_multiline_replacement: (RuboCop::AST::SendNode node) -> String
-
-          # @rbs node: RuboCop::AST::SendNode
-          def check_multiline_data_class: (RuboCop::AST::SendNode node) -> void
-
-          # @rbs corrector: RuboCop::Cop::Corrector
-          # @rbs node: RuboCop::AST::SendNode
-          # @rbs arg: RuboCop::AST::Node
-          def correct_multiline: (RuboCop::Cop::Corrector corrector, RuboCop::AST::SendNode node, RuboCop::AST::Node arg) -> void
-
-          # @rbs corrector: RuboCop::Cop::Corrector
-          # @rbs node: RuboCop::AST::SendNode
-          # @rbs arg: RuboCop::AST::Node
-          def insert_annotation: (RuboCop::Cop::Corrector corrector, RuboCop::AST::SendNode node, RuboCop::AST::Node arg) -> void
-
-          # @rbs node: RuboCop::AST::SendNode
-          def annotation_column: (RuboCop::AST::SendNode node) -> Integer
-
-          # @rbs line: Integer
-          def find_regular_comment: (Integer line) -> Parser::Source::Comment?
+          def struct_like_class?: (RuboCop::AST::SendNode node) -> bool
         end
       end
     end

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

@@ -0,0 +1,46 @@
+# Generated from lib/rubocop/cop/style/rbs_inline/missing_struct_class_annotation.rb with RBS::Inline
+
+module RuboCop
+  module Cop
+    module Style
+      module RbsInline
+        # Checks that `Struct.new` attributes have inline type annotations.
+        #
+        # Each attribute passed to `Struct.new` should have a trailing `#:` type
+        # annotation comment on the same line. A leading string argument (the struct
+        # name) and the `keyword_init:` keyword argument are not attributes and are
+        # ignored.
+        #
+        # @example
+        #   # bad
+        #   Point = Struct.new(:x, :y)
+        #
+        #   # good
+        #   Point = Struct.new(
+        #     :x,  #: Integer
+        #     :y   #: Integer
+        #   )
+        class MissingStructClassAnnotation < Base
+          include MissingClassAnnotation
+
+          extend AutoCorrector
+
+          MSG: ::String
+
+          # @rbs node: RuboCop::AST::SendNode
+          def on_send: (RuboCop::AST::SendNode node) -> void
+
+          private
+
+          # @rbs node: RuboCop::AST::SendNode
+          def struct_like_class?: (RuboCop::AST::SendNode node) -> bool
+
+          # `Struct.new` treats a leading string argument as the struct name, so only
+          # symbol arguments are attributes.
+          # @rbs arg: RuboCop::AST::Node
+          def attr_argument?: (RuboCop::AST::Node arg) -> bool
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# Generated from lib/rubocop/cop/style/rbs_inline/struct_class_comment_alignment.rb with RBS::Inline
+
+module RuboCop
+  module Cop
+    module Style
+      module RbsInline
+        # Checks that `#:` inline type annotations in `Struct.new` blocks are aligned.
+        #
+        # Each `#:` annotation comment should start at the same column, determined by
+        # the longest attribute name (plus trailing comma). Folded `Struct.new` calls
+        # (where attributes are not one per line) are excluded.
+        #
+        # @example
+        #   # bad
+        #   Point = Struct.new(
+        #     :x, #: Integer
+        #     :y   #: Integer
+        #   )
+        #
+        #   # good
+        #   Point = Struct.new(
+        #     :x,  #: Integer
+        #     :y   #: Integer
+        #   )
+        class StructClassCommentAlignment < Base
+          include ClassCommentAlignment
+
+          extend AutoCorrector
+
+          MSG: ::String
+
+          # @rbs node: RuboCop::AST::SendNode
+          def on_send: (RuboCop::AST::SendNode node) -> void
+
+          private
+
+          # @rbs node: RuboCop::AST::SendNode
+          def struct_like_class?: (RuboCop::AST::SendNode node) -> bool
+
+          # `Struct.new` treats a leading string argument as the struct name, so only
+          # symbol arguments are attributes.
+          # @rbs arg: RuboCop::AST::Node
+          def attr_argument?: (RuboCop::AST::Node arg) -> bool
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# Generated from lib/rubocop/cop/style/rbs_inline/struct_new_with_block.rb with RBS::Inline
+
+module RuboCop
+  module Cop
+    module Style
+      module RbsInline
+        # Checks for `Struct.new` calls with a block.
+        #
+        # RBS::Inline does not parse the contents of `Struct.new` blocks, so any
+        # methods defined inside will not be recognized for type checking. Instead,
+        # call `Struct.new` without a block and define additional methods by
+        # reopening the class separately.
+        #
+        # @example
+        #   # bad
+        #   User = Struct.new(:name, :role) do
+        #     def admin? = role == :admin #: bool
+        #   end
+        #
+        #   # good
+        #   User = Struct.new(:name, :role)
+        #
+        #   class User
+        #     def admin? = role == :admin #: bool
+        #   end
+        class StructNewWithBlock < Base
+          MSG: ::String
+
+          # @rbs node: RuboCop::AST::SendNode
+          def on_send: (RuboCop::AST::SendNode node) -> void
+
+          private
+
+          # @rbs node: RuboCop::AST::SendNode
+          def struct_like_class?: (RuboCop::AST::SendNode node) -> bool
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rbs_inline
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-05 00:00:00.000000000 Z
+date: 2026-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller
@@ -84,15 +84,19 @@ files:
 - lib/rubocop-rbs_inline.rb
 - lib/rubocop/cop/rbs_inline_cops.rb
 - lib/rubocop/cop/style/rbs_inline/ast_utils.rb
+- lib/rubocop/cop/style/rbs_inline/class_comment_alignment.rb
 - lib/rubocop/cop/style/rbs_inline/comment_parser.rb
 - lib/rubocop/cop/style/rbs_inline/data_class_comment_alignment.rb
 - lib/rubocop/cop/style/rbs_inline/data_define_with_block.rb
+- lib/rubocop/cop/style/rbs_inline/data_struct_helper.rb
 - lib/rubocop/cop/style/rbs_inline/embedded_rbs_spacing.rb
 - lib/rubocop/cop/style/rbs_inline/invalid_comment.rb
 - lib/rubocop/cop/style/rbs_inline/invalid_types.rb
 - lib/rubocop/cop/style/rbs_inline/keyword_separator.rb
 - lib/rubocop/cop/style/rbs_inline/method_comment_spacing.rb
+- lib/rubocop/cop/style/rbs_inline/missing_class_annotation.rb
 - lib/rubocop/cop/style/rbs_inline/missing_data_class_annotation.rb
+- lib/rubocop/cop/style/rbs_inline/missing_struct_class_annotation.rb
 - lib/rubocop/cop/style/rbs_inline/missing_type_annotation.rb
 - lib/rubocop/cop/style/rbs_inline/parameters_separator.rb
 - lib/rubocop/cop/style/rbs_inline/redundant_annotation_with_skip.rb
@@ -100,6 +104,8 @@ files:
 - lib/rubocop/cop/style/rbs_inline/redundant_type_annotation.rb
 - lib/rubocop/cop/style/rbs_inline/require_rbs_inline_comment.rb
 - lib/rubocop/cop/style/rbs_inline/source_code_helper.rb
+- lib/rubocop/cop/style/rbs_inline/struct_class_comment_alignment.rb
+- lib/rubocop/cop/style/rbs_inline/struct_new_with_block.rb
 - lib/rubocop/cop/style/rbs_inline/unmatched_annotations.rb
 - lib/rubocop/cop/style/rbs_inline/untyped_instance_variable.rb
 - lib/rubocop/cop/style/rbs_inline/variable_comment_spacing.rb
@@ -112,15 +118,19 @@ files:
 - sig/rubocop-rbs_inline.rbs
 - sig/rubocop/cop/rbs_inline_cops.rbs
 - sig/rubocop/cop/style/rbs_inline/ast_utils.rbs
+- sig/rubocop/cop/style/rbs_inline/class_comment_alignment.rbs
 - sig/rubocop/cop/style/rbs_inline/comment_parser.rbs
 - sig/rubocop/cop/style/rbs_inline/data_class_comment_alignment.rbs
 - sig/rubocop/cop/style/rbs_inline/data_define_with_block.rbs
+- sig/rubocop/cop/style/rbs_inline/data_struct_helper.rbs
 - sig/rubocop/cop/style/rbs_inline/embedded_rbs_spacing.rbs
 - sig/rubocop/cop/style/rbs_inline/invalid_comment.rbs
 - sig/rubocop/cop/style/rbs_inline/invalid_types.rbs
 - sig/rubocop/cop/style/rbs_inline/keyword_separator.rbs
 - sig/rubocop/cop/style/rbs_inline/method_comment_spacing.rbs
+- sig/rubocop/cop/style/rbs_inline/missing_class_annotation.rbs
 - sig/rubocop/cop/style/rbs_inline/missing_data_class_annotation.rbs
+- sig/rubocop/cop/style/rbs_inline/missing_struct_class_annotation.rbs
 - sig/rubocop/cop/style/rbs_inline/missing_type_annotation.rbs
 - sig/rubocop/cop/style/rbs_inline/parameters_separator.rbs
 - sig/rubocop/cop/style/rbs_inline/redundant_annotation_with_skip.rbs
@@ -130,6 +140,8 @@ files:
 - sig/rubocop/cop/style/rbs_inline/redundant_type_annotation.rbs
 - sig/rubocop/cop/style/rbs_inline/require_rbs_inline_comment.rbs
 - sig/rubocop/cop/style/rbs_inline/source_code_helper.rbs
+- sig/rubocop/cop/style/rbs_inline/struct_class_comment_alignment.rbs
+- sig/rubocop/cop/style/rbs_inline/struct_new_with_block.rbs
 - sig/rubocop/cop/style/rbs_inline/unmatched_annotations.rbs
 - sig/rubocop/cop/style/rbs_inline/untyped_instance_variable.rbs
 - sig/rubocop/cop/style/rbs_inline/variable_comment_spacing.rbs