rubocop-rbs_inline 1.7.0 → 1.8.0

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

@@ -23,24 +23,18 @@ module RuboCop
         #     :y   #: Integer
         #   )
         class StructClassCommentAlignment < Base
+          prepend FileFilter
+
           include ClassCommentAlignment
 
+          include StructClassMatcher
+
           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

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

@@ -24,15 +24,14 @@ module RuboCop
         #     def admin? = role == :admin #: bool
         #   end
         class StructNewWithBlock < Base
-          MSG: ::String
+          prepend FileFilter
 
-          # @rbs node: RuboCop::AST::SendNode
-          def on_send: (RuboCop::AST::SendNode node) -> void
+          include StructClassMatcher
 
-          private
+          MSG: ::String
 
           # @rbs node: RuboCop::AST::SendNode
-          def struct_like_class?: (RuboCop::AST::SendNode node) -> bool
+          def on_send: (RuboCop::AST::SendNode node) -> void
         end
       end
     end

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

@@ -15,6 +15,8 @@ module RuboCop
         #   # @rbs arg: String
         #   def method(arg); end
         class UnmatchedAnnotations < Base
+          prepend FileFilter
+
           include CommentParser
 
           include RangeHelp
@@ -23,6 +25,8 @@ module RuboCop
 
           MSG: ::String
 
+          attr_reader processed_comments: Set[RBS::Inline::AnnotationParser::ParsingResult]
+
           def on_new_investigation: () -> void
 
           # @rbs node: RuboCop::AST::DefNode
@@ -38,6 +42,15 @@ module RuboCop
           # @rbs node: RuboCop::AST::DefNode
           def process: (RuboCop::AST::DefNode node) -> void
 
+          # @rbs node: RuboCop::AST::DefNode
+          def leading_comment_for: (RuboCop::AST::DefNode node) -> RBS::Inline::AnnotationParser::ParsingResult?
+
+          # @rbs comment: RBS::Inline::AnnotationParser::ParsingResult
+          def mark_processed: (RBS::Inline::AnnotationParser::ParsingResult comment) -> void
+
+          # @rbs comment: RBS::Inline::AnnotationParser::ParsingResult
+          def processed?: (RBS::Inline::AnnotationParser::ParsingResult comment) -> bool
+
           # @rbs node: RuboCop::AST::DefNode
           def arguments_for: (RuboCop::AST::DefNode node) -> Array[String]
 

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

@@ -56,6 +56,8 @@ module RuboCop
         #     end
         #   end
         class UntypedInstanceVariable < Base
+          prepend FileFilter
+
           include ASTUtils
 
           include CommentParser
@@ -125,6 +127,14 @@ module RuboCop
           # @rbs node: RuboCop::AST::Node
           def collect_typed_ivars_for_scope: (RuboCop::AST::Node node) -> void
 
+          # Moves the annotations placed within +lines+ from +annotations+ into +typed+
+          # so that outer scopes no longer see them.
+          #
+          # @rbs annotations: Hash[Integer, Symbol]
+          # @rbs typed: Set[Symbol]
+          # @rbs lines: Range[Integer]
+          def move_annotations: (Hash[Integer, Symbol] annotations, Set[Symbol] typed, Range[Integer] lines) -> void
+
           def collect_ivar_type_annotations: () -> [ Hash[Integer, Symbol], Hash[Integer, Symbol] ]
 
           # @rbs ann: RBS::Inline::AST::Annotations::IvarType

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

@@ -27,6 +27,8 @@ module RuboCop
         #   def method
         #   end
         class VariableCommentSpacing < Base
+          prepend FileFilter
+
           extend AutoCorrector
 
           include SourceCodeHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rbs_inline
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-20 00:00:00.000000000 Z
+date: 2026-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller
@@ -67,6 +67,7 @@ extra_rdoc_files: []
 files:
 - ".claude/hooks/pre-commit-check.sh"
 - ".claude/hooks/rbs-inline.sh"
+- ".claude/hooks/self-review.sh"
 - ".claude/hooks/setup.sh"
 - ".claude/settings.json"
 - ".rspec"
@@ -83,27 +84,31 @@ files:
 - config/default.yml
 - 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/mixin/annotation_keywords.rb
+- lib/rubocop/cop/style/rbs_inline/mixin/ast_utils.rb
+- lib/rubocop/cop/style/rbs_inline/mixin/class_comment_alignment.rb
+- lib/rubocop/cop/style/rbs_inline/mixin/comment_parser.rb
+- lib/rubocop/cop/style/rbs_inline/mixin/data_class_matcher.rb
+- 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/source_code_helper.rb
+- lib/rubocop/cop/style/rbs_inline/mixin/struct_class_matcher.rb
 - lib/rubocop/cop/style/rbs_inline/parameters_separator.rb
 - lib/rubocop/cop/style/rbs_inline/redundant_annotation_with_skip.rb
 - lib/rubocop/cop/style/rbs_inline/redundant_instance_variable_annotation.rb
 - 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
@@ -117,29 +122,31 @@ files:
 - sig/gems/rubocop/rubocop.rbs
 - 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/mixin/annotation_keywords.rbs
+- sig/rubocop/cop/style/rbs_inline/mixin/ast_utils.rbs
+- sig/rubocop/cop/style/rbs_inline/mixin/class_comment_alignment.rbs
+- sig/rubocop/cop/style/rbs_inline/mixin/comment_parser.rbs
+- sig/rubocop/cop/style/rbs_inline/mixin/data_class_matcher.rbs
+- 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/source_code_helper.rbs
+- sig/rubocop/cop/style/rbs_inline/mixin/struct_class_matcher.rbs
 - sig/rubocop/cop/style/rbs_inline/parameters_separator.rbs
 - sig/rubocop/cop/style/rbs_inline/redundant_annotation_with_skip.rbs
-- sig/rubocop/cop/style/rbs_inline/redundant_argument_type.rbs
 - sig/rubocop/cop/style/rbs_inline/redundant_instance_variable_annotation.rbs
-- sig/rubocop/cop/style/rbs_inline/redundant_return_type.rbs
 - 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
@@ -154,7 +161,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/tk0miya/rubocop-rbs_inline
   source_code_uri: https://github.com/tk0miya/rubocop-rbs_inline
-  changelog_uri: https://github.com/tk0miya/rubocop-rbs_inline
+  changelog_uri: https://github.com/tk0miya/rubocop-rbs_inline/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
   default_lint_roller_plugin: RuboCop::RbsInline::Plugin
 post_install_message:

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

@@ -1,85 +0,0 @@
-# Generated from lib/rubocop/cop/style/rbs_inline/redundant_argument_type.rb with RBS::Inline
-
-module RuboCop
-  module Cop
-    module Style
-      module RbsInline
-        # Checks for redundant argument type annotations when both
-        # annotation comments (`#:`) and `@rbs` parameter comments
-        # specify argument types for the same method.
-        #
-        # Supports two styles:
-        # - `method_type_signature`: Prefers `#:` annotation comments with parameter types
-        # - `doc_style`: Prefers `# @rbs param:` annotations for parameter types
-        #
-        # @example EnforcedStyle: method_type_signature
-        #   # bad
-        #   # @rbs a: Integer
-        #   #: (Integer) -> void
-        #   def method(a)
-        #   end
-        #
-        #   # good
-        #   #: (Integer) -> void
-        #   def method(a)
-        #   end
-        #
-        #   # good
-        #   # @rbs a: Integer
-        #   def method(a) #: void
-        #   end
-        #
-        # @example EnforcedStyle: doc_style (default)
-        #   # bad
-        #   # @rbs a: Integer
-        #   #: (Integer) -> void
-        #   def method(a)
-        #   end
-        #
-        #   # good
-        #   # @rbs a: Integer
-        #   def method(a) #: void
-        #   end
-        #
-        #   # good
-        #   #: (Integer) -> void
-        #   def method(a)
-        #   end
-        class RedundantArgumentType < Base
-          extend AutoCorrector
-
-          include CommentParser
-
-          include ConfigurableEnforcedStyle
-
-          include RangeHelp
-
-          MSG_RBS_PARAM: ::String
-
-          MSG_ANNOTATION: ::String
-
-          def on_new_investigation: () -> void
-
-          # @rbs node: RuboCop::AST::DefNode
-          def on_def: (RuboCop::AST::DefNode node) -> void
-
-          alias on_defs on_def
-
-          private
-
-          # @rbs node: RuboCop::AST::DefNode
-          def process: (RuboCop::AST::DefNode node) -> void
-
-          # @rbs comments: Array[Parser::Source::Comment]
-          def add_offense_for_annotation: (Array[Parser::Source::Comment] comments) -> void
-
-          # @rbs annotation: RBS::Inline::AST::Annotations::VarType | RBS::Inline::AST::Annotations::BlockType
-          def add_offense_for_rbs_param: (RBS::Inline::AST::Annotations::VarType | RBS::Inline::AST::Annotations::BlockType annotation) -> void
-
-          # @rbs def_line: Integer
-          def find_param_annotations: (Integer def_line) -> Array[RBS::Inline::AST::Annotations::VarType | RBS::Inline::AST::Annotations::BlockType]?
-        end
-      end
-    end
-  end
-end

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

@@ -1,109 +0,0 @@
-# Generated from lib/rubocop/cop/style/rbs_inline/redundant_return_type.rb with RBS::Inline
-
-module RuboCop
-  module Cop
-    module Style
-      module RbsInline
-        # Checks for redundant return type annotations when multiple
-        # return type specifications exist on the same method definition.
-        #
-        # Supports three styles:
-        # - `method_type_signature`: Prefers `#:` annotation comments before the method
-        # - `return_type_annotation`: Prefers inline `#:` return type on the def line
-        # - `doc_style`: Prefers `# @rbs return` annotations
-        #
-        # @example EnforcedStyle: method_type_signature
-        #   # bad
-        #   #: () -> String
-        #   def method(arg) #: String
-        #   end
-        #
-        #   # bad
-        #   # @rbs return: String
-        #   #: () -> String
-        #   def method(arg)
-        #   end
-        #
-        #   # good
-        #   #: () -> String
-        #   def method(arg)
-        #   end
-        #
-        # @example EnforcedStyle: return_type_annotation (default)
-        #   # bad
-        #   # @rbs return: String
-        #   def method(arg) #: String
-        #   end
-        #
-        #   # bad
-        #   #: () -> String
-        #   def method(arg) #: String
-        #   end
-        #
-        #   # good
-        #   def method(arg) #: String
-        #   end
-        #
-        # @example EnforcedStyle: doc_style
-        #   # bad
-        #   # @rbs return: String
-        #   def method(arg) #: String
-        #   end
-        #
-        #   # bad
-        #   # @rbs return: String
-        #   #: () -> String
-        #   def method(arg)
-        #   end
-        #
-        #   # good
-        #   # @rbs return: String
-        #   def method(arg)
-        #   end
-        class RedundantReturnType < Base
-          extend AutoCorrector
-
-          include CommentParser
-
-          include ConfigurableEnforcedStyle
-
-          include RangeHelp
-
-          MSG_RBS_RETURN: ::String
-
-          MSG_INLINE: ::String
-
-          MSG_ANNOTATION: ::String
-
-          def on_new_investigation: () -> void
-
-          # @rbs node: RuboCop::AST::DefNode
-          def on_def: (RuboCop::AST::DefNode node) -> void
-
-          alias on_defs on_def
-
-          private
-
-          # @rbs node: RuboCop::AST::DefNode
-          def process: (RuboCop::AST::DefNode node) -> void
-
-          # @rbs type: Symbol
-          # @rbs value: Object
-          # @rbs correctable: bool
-          def add_offense_for: (Symbol type, Object value, correctable: bool) -> void
-
-          # @rbs comments: Array[Parser::Source::Comment]
-          def add_offense_for_annotation: (Array[Parser::Source::Comment] comments) -> void
-
-          # @rbs comment: Parser::Source::Comment
-          # @rbs correctable: bool
-          def add_offense_for_inline: (Parser::Source::Comment comment, correctable: bool) -> void
-
-          # @rbs annotation: RBS::Inline::AST::Annotations::ReturnType
-          # @rbs correctable: bool
-          def add_offense_for_rbs_return: (RBS::Inline::AST::Annotations::ReturnType annotation, correctable: bool) -> void
-        end
-      end
-    end
-  end
-end