rubocop-rbs_inline 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 887dbca0ede20b0bc2f948c4468a1795bdd59a22e377602769c6b96cdefa628a
-  data.tar.gz: b12ec5654d6a54b2dd5389a67c47a8b4adcc8a6ff6784b6426b413fad8a8c0b0
+  metadata.gz: 13356ee2ff7161f55fabd910db6c5baf0e49a9c45baf4f45cb056c0dd530d1bc
+  data.tar.gz: 02fa848f90ced8e1262cdb7fca6fc17f62472594f374b03ce103ebfb978aac15
 SHA512:
-  metadata.gz: c490a7ed73c4ca80d535ab4bff1e7399a26e414c5d72d86779e6def4d414194635bed3c4ce2e6c7432da78db5d19c32ce745502721d2c7b26b4426553703c9b8
-  data.tar.gz: bead6840e55e119ba47a58210ba622cd4874131477465790c06621080deb34bd02baa1c60e9029cecf3931211bd2f0ca57242dc2c389a953dff01120d054f080
+  metadata.gz: 60d860bb7082c040502b9bbba4cdf00ca265f9cc2cb5a7df9a71b597f50241fb722f9c0e234db67eecccf0e9f75611fbc92099fbd76eb063372953b79ac9a259
+  data.tar.gz: ffa3593debf4c47cfb605f4da9f6e23615d628253044eb05da335cdf4019535e1f3bf676c55de6ed4290c49c58b17f2fd50a6056c99d6eba4165fcd4ed5a58f4

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 1.6.0 (2026-07-05)
+
+### Changes
+
+- All cops now exclude `spec/**/*` and `test/**/*` by default. Override with `Exclude: []` per cop to lint annotations in test code.
+
+### Bug Fixes
+
+- **Style/RbsInline/UntypedInstanceVariable**: No longer reports a false positive for class instance variables (assigned inside `class << self` or `def self.foo`) that have a `# @rbs self.@name: Type` annotation.
+
+## 1.5.5 (2026-05-19)
+
+### Bug Fixes
+
+- **Style/RbsInline/ParametersSeparator**: No longer reports false positives for `# @rbs` method type signature annotations such as `# @rbs (Type) -> ReturnType` or `# @rbs [T] (T) -> T`.
+- **Style/RbsInline/MissingTypeAnnotation**: Recognizes `# @rbs` method type signature annotations (e.g. `# @rbs (Type) -> ReturnType`) as satisfying the `method_type_signature` and `method_type_signature_or_return_annotation` styles.
+
 ## 1.5.4 (2026-03-30)
 
 ### Internal

data/CLAUDE.md

@@ -20,7 +20,8 @@ bundle exec rake rubocop:autocorrect       # safe autocorrect
 bundle exec rake rubocop:autocorrect_all   # all autocorrect
 
 # Type check
-bundle exec rake rbs:check                 # runs steep check
+bundle exec rake steep                     # runs steep check
+bundle exec rake rbs:validate              # validates RBS signatures
 
 # Default rake task (runs specs, rubocop, and type check)
 bundle exec rake

data/Rakefile

@@ -5,7 +5,9 @@ require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
 
-task default: %i[spec rubocop rbs:check]
+task default: :ci
+
+task ci: %i[rubocop spec steep rbs:validate]
 
 require 'rspec/core/rake_task'
 
@@ -33,9 +35,23 @@ task :new_cop, [:cop] do |_task, args|
 end
 
 namespace :rbs do
-  desc 'Do type check using Steep'
-  task :check do
+  desc 'Install RBS signatures'
+  task :install do
+    sh 'bundle', 'exec', 'rbs', 'collection', 'install', '--frozen'
+  end
+
+  desc 'Generate RBS files'
+  task :generate do
+    sh 'rbs-inline', '--opt-out', '--output=sig', 'lib'
+  end
+
+  desc 'Validate RBS files'
+  task validate: 'rbs:install' do
     sh 'rbs', '-Isig', 'validate'
-    sh 'bundle', 'exec', 'steep', 'check'
   end
 end
+
+desc 'Run Steep type checker'
+task steep: 'rbs:install' do
+  sh 'bundle', 'exec', 'steep', 'check'
+end

data/config/default.yml

@@ -2,41 +2,65 @@ Style/RbsInline/DataClassCommentAlignment:
   Description: "Checks that `#:` inline type annotations in `Data.define` blocks are aligned."
   Enabled: true
   VersionAdded: '1.5.0'
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/DataDefineWithBlock:
   Description: "Checks for `Data.define` calls with a block, which RBS::Inline does not parse."
   Enabled: true
   VersionAdded: '1.5.0'
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/EmbeddedRbsSpacing:
   Description: 'Checks that `@rbs!` comments (embedded RBS) are followed by a blank line.'
   Enabled: true
   VersionAdded: '1.5.0'
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/InvalidComment:
   Description: "Checks the rbs-inline annotation comment is valid."
   Enabled: true
   VersionAdded: "1.0.0"
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/InvalidTypes:
   Description: "Checks the rbs-inline annotation comment uses valid types."
   Enabled: true
   VersionAdded: "1.0.0"
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/KeywordSeparator:
   Description: "Checks the rbs-inline annotation comment does not use a separator after the keywords."
   Enabled: true
   VersionAdded: "1.0.0"
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/MethodCommentSpacing:
   Description: 'Checks that method-related `@rbs` annotations are placed immediately before method definitions.'
   Enabled: true
   VersionAdded: '1.5.0'
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/MissingDataClassAnnotation:
   Description: "Checks that `Data.define` attributes have inline type annotations."
   Enabled: true
   VersionAdded: '1.5.0'
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/MissingTypeAnnotation:
   Description: "Checks that method definitions and attr_* declarations have RBS inline type annotations."
@@ -49,22 +73,34 @@ Style/RbsInline/MissingTypeAnnotation:
     - method_type_signature
     - method_type_signature_or_return_annotation
   Visibility: all
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/ParametersSeparator:
   Description: "Checks the rbs-inline annotation comment uses a separator to parameters"
   Enabled: true
   VersionAdded: "1.0.0"
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/RedundantAnnotationWithSkip:
   Description: "Checks for redundant type annotations when `@rbs skip` or `@rbs override` is present."
   Enabled: true
   SafeAutoCorrect: false
   VersionAdded: '1.5.0'
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/RedundantInstanceVariableAnnotation:
   Description: "Checks for redundant `@rbs` instance variable type annotation when `attr_*` with an inline type annotation is already defined."
   Enabled: true
   VersionAdded: '1.5.0'
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/RedundantTypeAnnotation:
   Description: "Checks for redundant type annotations when multiple type specifications exist for the same method definition."
@@ -76,6 +112,9 @@ Style/RbsInline/RedundantTypeAnnotation:
     - method_type_signature
     - doc_style
     - doc_style_and_return_annotation
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/RequireRbsInlineComment:
   Description: "Checks the presence or absence of `# rbs_inline: enabled` magic comment."
@@ -85,18 +124,30 @@ Style/RbsInline/RequireRbsInlineComment:
   SupportedStyles:
     - always
     - never
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/UnmatchedAnnotations:
   Description: "Checks the rbs-inline annotation comment is surely matched."
   Enabled: true
   VersionAdded: "1.0.0"
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/UntypedInstanceVariable:
   Description: "Checks that instance variables in classes/modules have RBS type annotations."
   Enabled: true
   VersionAdded: '1.5.0'
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/RbsInline/VariableCommentSpacing:
   Description: 'Checks that `@rbs` variable comments are followed by a blank line.'
   Enabled: true
   VersionAdded: '1.5.0'
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'

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

@@ -105,7 +105,7 @@ module RuboCop
             max_end_col = node.arguments.map do |arg|
               comma_length = arg.equal?(last_arg) ? 0 : 1
               arg.location.column + source!(arg).length + comma_length
-            end.max || 0 # steep:ignore
+            end.max || 0
 
             max_end_col + 2
           end

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

@@ -161,7 +161,7 @@ module RuboCop
             max_end_col = node.arguments.map do |arg|
               comma_length = arg.equal?(last_arg) ? 0 : 1
               arg.location.column + source!(arg).length + comma_length
-            end.max || 0 # steep:ignore
+            end.max || 0
 
             max_end_col + 2
           end

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

@@ -281,6 +281,7 @@ module RuboCop
           # @rbs node: RuboCop::AST::DefNode
           def check_method_type_signature(node) #: void
             return if find_method_type_signature_comments(node.location.line)
+            return if rbs_method_type_annotation?(node.location.line)
 
             add_offense(offense_range_for_def(node), message: METHOD_TYPE_SIGNATURE_MESSAGE)
           end
@@ -298,6 +299,7 @@ module RuboCop
           def check_method_type_signature_or_return_annotation(node) #: void
             return if find_method_type_signature_comments(node.location.line)
             return if find_trailing_comment(method_parameter_list_end_line(node))
+            return if rbs_method_type_annotation?(node.location.line)
 
             add_offense(offense_range_for_def(node), message: METHOD_TYPE_SIGNATURE_OR_RETURN_ANNOTATION_MESSAGE)
           end
@@ -393,6 +395,14 @@ module RuboCop
             annotation.comments.any? { |c| c.location.slice.match?(/\A#\s+@rbs\s+(skip|override)\b/) }
           end
 
+          # @rbs line: Integer
+          def rbs_method_type_annotation?(line) #: bool
+            annotation = find_leading_annotation(line)
+            return false unless annotation
+
+            annotation.each_annotation.any?(RBS::Inline::AST::Annotations::Method)
+          end
+
           # Returns acceptable annotation name variants for the parameter, or nil for unrecognized types.
           # @rbs argument: RuboCop::AST::Node
           # @rbs name: String

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

@@ -51,6 +51,8 @@ module RuboCop
             return true if RBS_INLINE_KEYWORDS.include?(matched)
             return true if RBS_INLINE_REGEXP_KEYWORDS.any? { |regexp| matched =~ regexp }
             return true if matched.end_with?(':')
+            # method type signature, e.g. `# @rbs (Integer) -> String` or `# @rbs [T] (T) -> T`
+            return true if matched.start_with?('(', '[')
 
             false
           end

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

@@ -10,6 +10,8 @@ module RuboCop
         #
         # Instance variables must either have a `# @rbs @ivar: Type` annotation
         # or be covered by a typed `attr_reader/writer/accessor` declaration.
+        # Class-level (singleton) instance variables, assigned inside `class << self`
+        # or `def self.x`, must be annotated with `# @rbs self.@ivar: Type` instead.
         #
         # Only instance variables that are **assigned** within the class/module are checked.
         # Read-only references are ignored because the variable may be defined in a parent class.
@@ -47,30 +49,49 @@ module RuboCop
         #     end
         #   end
         #
-        class UntypedInstanceVariable < Base
+        #   # good (class-level ivar annotated with `self.@`)
+        #   class Foo
+        #     # @rbs self.@instance: Foo
+        #
+        #     def self.instance
+        #       @instance ||= new
+        #     end
+        #   end
+        #
+        class UntypedInstanceVariable < Base # rubocop:disable Metrics/ClassLength
           include ASTUtils
           include CommentParser
           include RangeHelp
 
-          MSG = 'Instance variable `%<name>s` is not typed. ' \
-                'Add `# @rbs %<name>s: Type` or use `attr_* :%<bare_name>s #: Type`.'
+          MSG_IVAR = 'Instance variable `%<name>s` is not typed. ' \
+                     'Add `# @rbs %<name>s: Type` or use `attr_* :%<bare_name>s #: Type`.'
+          MSG_CIVAR = 'Class instance variable `%<name>s` is not typed. ' \
+                      'Add `# @rbs self.%<name>s: Type` or use `attr_* :%<bare_name>s #: Type`.'
 
           ATTR_METHODS = %i[attr_reader attr_writer attr_accessor].freeze
 
-          # @rbs! type scope = { typed_ivars: Set[Symbol], assigned_ivars: Hash[Symbol, RuboCop::AST::Node] }
+          # @rbs! type scope = {
+          #     typed_ivars: Set[Symbol],
+          #     typed_class_ivars: Set[Symbol],
+          #     assigned_ivars: Hash[Symbol, RuboCop::AST::Node],
+          #     assigned_class_ivars: Hash[Symbol, RuboCop::AST::Node],
+          #     singleton_depth: Integer
+          #   }
 
           attr_reader :scope_stack #: Array[scope]
           attr_reader :ivar_type_annotations #: Hash[Integer, Symbol]
+          attr_reader :civar_type_annotations #: Hash[Integer, Symbol]
 
           def on_new_investigation #: void
             parse_comments
             @scope_stack = []
-            @ivar_type_annotations = collect_ivar_type_annotations
+            @ivar_type_annotations, @civar_type_annotations = collect_ivar_type_annotations
             push_scope
           end
 
           def on_investigation_end #: void
             ivar_type_annotations.each_value { |name| current_scope[:typed_ivars] << name }
+            civar_type_annotations.each_value { |name| current_scope[:typed_class_ivars] << name }
             report_offenses
             pop_scope
           end
@@ -91,10 +112,26 @@ module RuboCop
 
           alias after_module after_class
 
+          # @rbs _node: RuboCop::AST::Node
+          def on_sclass(_node) #: void
+            current_scope[:singleton_depth] += 1
+          end
+          alias on_defs on_sclass
+
+          # @rbs _node: RuboCop::AST::Node
+          def after_sclass(_node) #: void
+            current_scope[:singleton_depth] -= 1
+          end
+          alias after_defs after_sclass
+
           # @rbs node: RuboCop::AST::Node
           def on_ivasgn(node) #: void
             name = node.children.first #: Symbol
-            current_scope[:assigned_ivars][name] ||= node
+            if singleton_context?
+              current_scope[:assigned_class_ivars][name] ||= node
+            else
+              current_scope[:assigned_ivars][name] ||= node
+            end
           end
 
           # @rbs node: RuboCop::AST::SendNode
@@ -113,16 +150,23 @@ module RuboCop
 
           # @rbs node: RuboCop::AST::SendNode
           def register_attr_ivars(node) #: void
+            typed = singleton_context? ? current_scope[:typed_class_ivars] : current_scope[:typed_ivars]
             node.arguments.each do |arg|
               case arg
               when RuboCop::AST::SymbolNode, RuboCop::AST::StrNode
-                current_scope[:typed_ivars] << :"@#{arg.value}"
+                typed << :"@#{arg.value}"
               end
             end
           end
 
           def push_scope #: void
-            scope_stack.push({ typed_ivars: Set.new, assigned_ivars: {} })
+            scope_stack.push({
+                               typed_ivars: Set.new,
+                               typed_class_ivars: Set.new,
+                               assigned_ivars: {},
+                               assigned_class_ivars: {},
+                               singleton_depth: 0
+                             })
           end
 
           def pop_scope #: void
@@ -133,6 +177,10 @@ module RuboCop
             scope_stack.last || raise
           end
 
+          def singleton_context? #: bool
+            current_scope[:singleton_depth].positive?
+          end
+
           # @rbs node: RuboCop::AST::Node
           def collect_typed_ivars_for_scope(node) #: void
             class_start = node.location.line
@@ -140,24 +188,45 @@ module RuboCop
             ivar_type_annotations.reject! do |line, name|
               current_scope[:typed_ivars] << name if line.between?(class_start, class_end)
             end
+            civar_type_annotations.reject! do |line, name|
+              current_scope[:typed_class_ivars] << name if line.between?(class_start, class_end)
+            end
           end
 
-          def collect_ivar_type_annotations #: Hash[Integer, Symbol] # rubocop:disable Metrics/CyclomaticComplexity
-            parsed_comments.flat_map { |r| r.each_annotation.to_a }.filter_map do |ann|
+          def collect_ivar_type_annotations #: [Hash[Integer, Symbol], Hash[Integer, Symbol]]
+            ivar = {} #: Hash[Integer, Symbol]
+            civar = {} #: Hash[Integer, Symbol]
+            parsed_comments.flat_map { |r| r.each_annotation.to_a }.each do |ann|
               next unless ann.is_a?(RBS::Inline::AST::Annotations::IvarType)
-              next if ann.class_instance
 
-              line = ann.source.comments.first&.location&.start_line || 0
-              [line, ann.name]
-            end.to_h
+              if ann.class_instance
+                civar[annotation_line(ann)] = ann.name
+              else
+                ivar[annotation_line(ann)] = ann.name
+              end
+            end
+            [ivar, civar]
+          end
+
+          # @rbs ann: RBS::Inline::AST::Annotations::IvarType
+          def annotation_line(ann) #: Integer
+            ann.source.comments.first&.location&.start_line || 0
           end
 
           def report_offenses #: void
-            current_scope[:assigned_ivars].each do |name, node|
-              next if current_scope[:typed_ivars].include?(name)
+            report_untyped(current_scope[:assigned_ivars], current_scope[:typed_ivars], MSG_IVAR)
+            report_untyped(current_scope[:assigned_class_ivars], current_scope[:typed_class_ivars], MSG_CIVAR)
+          end
+
+          # @rbs assigned: Hash[Symbol, RuboCop::AST::Node]
+          # @rbs typed: Set[Symbol]
+          # @rbs message_template: String
+          def report_untyped(assigned, typed, message_template) #: void
+            assigned.each do |name, node|
+              next if typed.include?(name)
 
               bare_name = name.to_s.delete_prefix('@')
-              add_offense(name_location(node), message: format(MSG, name:, bare_name:))
+              add_offense(name_location(node), message: format(message_template, name:, bare_name:))
             end
           end
         end

data/lib/rubocop/rbs_inline/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module RbsInline
-    VERSION = '1.5.4'
+    VERSION = '1.6.0'
   end
 end

data/rbs_collection.lock.yaml

@@ -6,7 +6,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     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: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: fileutils
@@ -30,13 +30,17 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: logger
-  version: '0'
+  version: '1.7'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: monitor
   version: '0'
   source:
@@ -50,7 +54,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: parser
@@ -58,7 +62,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: prism
@@ -70,7 +74,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -78,15 +82,15 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.10.3
+  version: 4.0.2
   source:
     type: rubygems
 - name: rbs-inline
-  version: 0.13.0
+  version: 0.14.0
   source:
     type: rubygems
 - name: rdoc
@@ -98,7 +102,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop
@@ -106,7 +110,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop-ast
@@ -114,7 +118,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d1139840c691d4d0e9231915d4f4ffb4a7a21838
+    revision: 5689759efdc7875d533e8e5b2376b4ab89472e36
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: strscan

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

@@ -246,6 +246,9 @@ module RuboCop
           # @rbs line: Integer
           def skip_annotation?: (Integer line) -> bool
 
+          # @rbs line: Integer
+          def rbs_method_type_annotation?: (Integer line) -> bool
+
           # Returns acceptable annotation name variants for the parameter, or nil for unrecognized types.
           # @rbs argument: RuboCop::AST::Node
           # @rbs name: String

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

@@ -8,6 +8,8 @@ module RuboCop
         #
         # Instance variables must either have a `# @rbs @ivar: Type` annotation
         # or be covered by a typed `attr_reader/writer/accessor` declaration.
+        # Class-level (singleton) instance variables, assigned inside `class << self`
+        # or `def self.x`, must be annotated with `# @rbs self.@ivar: Type` instead.
         #
         # Only instance variables that are **assigned** within the class/module are checked.
         # Read-only references are ignored because the variable may be defined in a parent class.
@@ -44,6 +46,15 @@ module RuboCop
         #       @baz
         #     end
         #   end
+        #
+        #   # good (class-level ivar annotated with `self.@`)
+        #   class Foo
+        #     # @rbs self.@instance: Foo
+        #
+        #     def self.instance
+        #       @instance ||= new
+        #     end
+        #   end
         class UntypedInstanceVariable < Base
           include ASTUtils
 
@@ -51,16 +62,20 @@ module RuboCop
 
           include RangeHelp
 
-          MSG: ::String
+          MSG_IVAR: ::String
+
+          MSG_CIVAR: ::String
 
           ATTR_METHODS: untyped
 
-          type scope = { typed_ivars: Set[Symbol], assigned_ivars: Hash[Symbol, RuboCop::AST::Node] }
+          type scope = { typed_ivars: Set[Symbol], typed_class_ivars: Set[Symbol], assigned_ivars: Hash[Symbol, RuboCop::AST::Node], assigned_class_ivars: Hash[Symbol, RuboCop::AST::Node], singleton_depth: Integer }
 
           attr_reader scope_stack: Array[scope]
 
           attr_reader ivar_type_annotations: Hash[Integer, Symbol]
 
+          attr_reader civar_type_annotations: Hash[Integer, Symbol]
+
           def on_new_investigation: () -> void
 
           def on_investigation_end: () -> void
@@ -75,6 +90,16 @@ module RuboCop
 
           alias after_module after_class
 
+          # @rbs _node: RuboCop::AST::Node
+          def on_sclass: (untyped _node) -> void
+
+          alias on_defs on_sclass
+
+          # @rbs _node: RuboCop::AST::Node
+          def after_sclass: (untyped _node) -> void
+
+          alias after_defs after_sclass
+
           # @rbs node: RuboCop::AST::Node
           def on_ivasgn: (RuboCop::AST::Node node) -> void
 
@@ -95,12 +120,22 @@ module RuboCop
 
           def current_scope: () -> scope
 
+          def singleton_context?: () -> bool
+
           # @rbs node: RuboCop::AST::Node
           def collect_typed_ivars_for_scope: (RuboCop::AST::Node node) -> void
 
-          def collect_ivar_type_annotations: () -> Hash[Integer, Symbol]
+          def collect_ivar_type_annotations: () -> [ Hash[Integer, Symbol], Hash[Integer, Symbol] ]
+
+          # @rbs ann: RBS::Inline::AST::Annotations::IvarType
+          def annotation_line: (RBS::Inline::AST::Annotations::IvarType ann) -> Integer
 
           def report_offenses: () -> void
+
+          # @rbs assigned: Hash[Symbol, RuboCop::AST::Node]
+          # @rbs typed: Set[Symbol]
+          # @rbs message_template: String
+          def report_untyped: (Hash[Symbol, RuboCop::AST::Node] assigned, Set[Symbol] typed, String message_template) -> void
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rbs_inline
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller