rubocop-on-rbs 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 501f65e78ff030f4d111a08793afa70a614c28715e9d9fa4caa95e24bbcc48dd
-  data.tar.gz: 5600ce340c99239465721d201d75881e3bcd8343787659bbf18faaaf8f51f58f
+  metadata.gz: 22a2658fe60905c8ede887f40b3bf114cd42c945194d0a968804b2f30069af9c
+  data.tar.gz: 3922f3dd22bf0f1b2afd66c0bbf0b8f5449424c3e64dcaa976def99ecdcd47d9
 SHA512:
-  metadata.gz: 9506a4022805eeaabedd6de962bc91812f34176e40251cb902b4abaee2a5b7fc45dd962946032dcf5cedea397f88daec6d46cae9e54ccc8d9c3f35a6b9941b15
-  data.tar.gz: 3b0176a6d2aa9fc2a85c21445720b9571e8881d6cd742c9b1b534ca76ff5103bc340e38a417e0bf6aec32259b5818aa24872553bdff3e6e47096eba19291cc9f
+  metadata.gz: a690a213a8654d2a9dd28822d6b112848348340956fa7e533d727203b28db67ed8233adb997b728e9fca9bd820bc0688ab1f984eb0498b6dfa645a9165b2e575
+  data.tar.gz: 1ffdd5f0b4305ff3158187a052cb4cd5fcce2ddf3e0629e3847699e7094741c5db66ee9962f9fc252e34d7a7f6f7a514bc32736cd4003e0377911b725b5a4a1a

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 ## [Unreleased]
 
+## [1.3.0] - 2024-12-24
+
+* Add RBS/Lint/AmbiguousKeywordArgumentKey by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/51
+* Fix false positive for TopLevel* by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/52
+* Support `RBS::AST::Members::Var` by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/53
+* [RBS/Layout/SpaceAroundOperators] Support other declarations by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/54
+* Support other declarations by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/55
+* Use 3.4.0-rc1 by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/56
+* Add RBS/Lint/UselessTypeAliasTypeParams by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/57
+* Use "Unused" instead of "Useless" as much as possible. by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/58
+* Check config/default.yml on CI by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/59
+* Use "Unused" instead of "Useless" as much as possible. by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/60
+* Add RBS/Layout/SpaceAfterComma by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/61
+* Add RBS/Style/InstanceWithInstance by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/62
+* Introduce rbs-inline by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/63
+* Reimplement RBS/Style/InstanceWithInstance  by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/64
+* Add RBS/Style/ClassWithSingleton by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/65
+
+## [1.2.0] - 2024-11-18
+
+* Fix false positive when oneline class by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/41
+* Add RBS/Lint/TopLevelTypeAlias by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/46
+* Add RBS/Lint/TopLevelInterface by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/47
+* [RBS/Lint/TopLevelTypeAlias] Fix false positive by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/48
+* Bundle update by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/49
+
 ## [1.1.0] - 2024-10-01
 
 * Add RBS/Layout/EmptyLinesAroundAccessModifier by @ksss in https://github.com/ksss/rubocop-on-rbs/pull/39

data/config/default.yml

@@ -71,6 +71,10 @@ RBS/Layout/OverloadIndentation:
   Description: 'Indent overload method'
   Enabled: true
 
+RBS/Layout/SpaceAfterComma:
+  Description: 'Use space after `,`'
+  Enabled: true
+
 RBS/Layout/SpaceAroundArrow:
   Description: 'Use space around `->`'
   Enabled: true
@@ -101,6 +105,10 @@ RBS/Lint:
   Severity: warning
   Enabled: true
 
+RBS/Lint/AmbiguousKeywordArgumentKey:
+  Description: 'Check ambiguous keyword argument key'
+  Enabled: true
+
 RBS/Lint/AmbiguousOperatorPrecedence:
   Description: 'Check ambiguous operator precedence'
   Enabled: true
@@ -113,6 +121,10 @@ RBS/Lint/LiteralIntersection:
   Description: 'Check literal intersection'
   Enabled: true
 
+RBS/Lint/NewReturnsVoid:
+  Description: 'sigleton `new` method should not returns `void` type'
+  Enabled: true
+
 RBS/Lint/Syntax:
   Severity: fatal
   Description: 'Check RBS syntax'
@@ -120,12 +132,12 @@ RBS/Lint/Syntax:
 
 RBS/Lint/TopLevelInterface:
   Description: 'Check top level interface'
-  Enabled: pending
+  Enabled: true
   VersionAdded: '1.2.0'
 
 RBS/Lint/TopLevelTypeAlias:
   Description: 'Check top level type alias'
-  Enabled: pending
+  Enabled: true
   VersionAdded: '1.2.0'
 
 RBS/Lint/UselessAccessModifier:
@@ -133,10 +145,14 @@ RBS/Lint/UselessAccessModifier:
   Description: 'Check useless access modifier'
   Enabled: true
 
-RBS/Lint/UselessOverloadTypeParams:
+RBS/Lint/UnusedOverloadTypeParams:
   Description: 'Check redundant overload type params'
   Enabled: true
 
+RBS/Lint/UnusedTypeAliasTypeParams:
+  Description: 'Check redundant type alias type params'
+  Enabled: true
+
 RBS/Lint/WillSyntaxError:
   Description: 'Check RBS will syntax error'
   Enabled: true
@@ -150,6 +166,10 @@ RBS/Style/BlockReturnBoolish:
   Description: 'Use `bool` for block return type'
   Enabled: true
 
+RBS/Style/ClassWithSingleton:
+  Description: 'Check `class` with singleton context'
+  Enabled: true
+
 RBS/Style/ClassicType:
   Description: 'Use simple type'
   Enabled: true
@@ -166,6 +186,10 @@ RBS/Style/InitializeReturnType:
   Description: 'Use `void` for initialize method'
   Enabled: true
 
+RBS/Style/InstanceWithInstance:
+  Description: 'Check `instance` with instance context'
+  Enabled: true
+
 RBS/Style/OptionalNil:
   Description: 'Use nil instead of nil?'
   Enabled: true

data/lib/rubocop/cop/rbs/layout/comment_indentation.rb

@@ -58,10 +58,6 @@ module RuboCop
               decl.members.each { |member| walk_decl(member, &block) }
             end
           end
-
-          def tokenize(source)
-            ::RBS::Parser.lex(source).value
-          end
         end
       end
     end

data/lib/rubocop/cop/rbs/layout/space_after_comma.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RBS
+      module Layout
+        # @example default
+        #   # bad
+        #   def foo: (Integer,String) -> void
+        #
+        #   # good
+        #   def foo: (Integer, String) -> void
+        class SpaceAfterComma < RuboCop::RBS::CopBase
+          extend AutoCorrector
+
+          MSG = 'Space missing after comma.'
+
+          def on_rbs_new_investigation
+            processed_rbs_source.tokens.each_cons(2) do |comma, after|
+              next unless comma.type == :pCOMMA
+              next unless comma.location
+              next unless comma.location.end_line == after.location.start_line
+              next unless after.type != :tTRIVIA
+
+              range = location_to_range(comma.location)
+              add_offense(range) do |corrector|
+                corrector.insert_after(range, ' ')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rbs/layout/space_around_arrow.rb

@@ -33,6 +33,8 @@ module RuboCop
               next unless loc
 
               if before && (before.location.end_pos + 1 != loc.start_pos)
+                next unless before.location.end_line == loc.start_line
+
                 arrow = location_to_range(loc).adjust(begin_pos: base, end_pos: base)
                 add_offense(arrow, message: MSG_BEFORE) do |corrector|
                   range = range_between(before.location.end_pos, loc.start_pos)
@@ -41,6 +43,8 @@ module RuboCop
               end
 
               if loc.end_pos + 1 != after.location.start_pos
+                next unless loc.end_line == after.location.start_line
+
                 arrow = location_to_range(loc).adjust(begin_pos: base, end_pos: base)
                 add_offense(arrow, message: MSG_AFTER) do |corrector|
                   range = range_between(loc.end_pos, after.location.start_pos)
@@ -49,6 +53,11 @@ module RuboCop
               end
             end
           end
+          alias on_rbs_constant on_rbs_def
+          alias on_rbs_global on_rbs_def
+          alias on_rbs_type_alias on_rbs_def
+          alias on_rbs_attribute on_rbs_def
+          alias on_rbs_var on_rbs_def
         end
       end
     end

data/lib/rubocop/cop/rbs/layout/space_around_operators.rb

@@ -16,12 +16,20 @@ module RuboCop
           def on_rbs_def(decl)
             decl.overloads.each do |overload|
               overload.method_type.each_type do |type|
-                on_type(type)
+                check_type(type)
               end
             end
           end
 
-          def on_type(type)
+          def on_rbs_constant(decl)
+            check_type(decl.type)
+          end
+          alias on_rbs_global on_rbs_constant
+          alias on_rbs_type_alias on_rbs_constant
+          alias on_rbs_attribute on_rbs_constant
+          alias on_rbs_var on_rbs_constant
+
+          def check_type(type)
             case type
             when ::RBS::Types::Union
               check_operator(type, '|')
@@ -29,7 +37,7 @@ module RuboCop
               check_operator(type, '&')
             end
             type.each_type do |t|
-              on_type(t)
+              check_type(t)
             end
           end
 

data/lib/rubocop/cop/rbs/lint/ambiguous_keyword_argument_key.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RBS
+      module Lint
+        # Checks keyword argument keys that are not local variable names.
+        #
+        # @example default
+        #   # bad
+        #   def foo: (option?: bool, option!: bool, Option: bool) -> void
+        #
+        class AmbiguousKeywordArgumentKey < RuboCop::RBS::CopBase
+          extend AutoCorrector
+
+          # @rbs decl: ::RBS::AST::Members::MethodDefinition
+          def on_rbs_def(decl)
+            decl.overloads.each do |overload|
+              func = overload.method_type.type
+              next unless func.kind_of?(::RBS::Types::Function)
+              next unless !func.required_keywords.empty? || !func.optional_keywords.empty?
+
+              base_pos = overload.method_type.location.start_pos
+              lex_result = ::RBS::Parser.lex(overload.method_type.location.source)
+              buf = []
+              lex_result.value.each do |token|
+                case token.type
+                when :pLPAREN, :pRPAREN, :tTRIVIA
+                  # skip
+                when :pCOLON
+                  next if buf.empty?
+
+                  case buf.last.type
+                  when :pQUESTION
+                    buf.shift if buf.first.type == :pQUESTION
+                    actual = buf.map { |t| t.location.source }.join
+                    did_you_mean = buf.reject { |t| t.location.source == '?' }.map { |t| t.location.source }.join
+                    message = +"`#{actual}` is not local variable name."
+                    if did_you_mean.length > 0
+                      message << " Did you mean `?#{did_you_mean}` for optional keyword argument?"
+                    end
+                    range = range_between(buf.first.location.start_pos + base_pos, buf.last.location.end_pos + base_pos)
+                    add_offense(range, message: message)
+                  when :tBANGIDENT, :tUIDENT
+                    buf.shift if buf.first.type == :pQUESTION
+                    actual = buf.map { |t| t.location.source }.join
+                    range = range_between(buf.first.location.start_pos + base_pos, buf.last.location.end_pos + base_pos)
+                    add_offense(range, message: "`#{actual}` is not local variable name.")
+                  end
+                when :pCOMMA
+                  buf.clear
+                else
+                  buf << token
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rbs/lint/ambiguous_operator_precedence.rb

@@ -32,6 +32,7 @@ module RuboCop
           alias on_rbs_global on_rbs_constant
           alias on_rbs_type_alias on_rbs_constant
           alias on_rbs_attribute on_rbs_constant
+          alias on_rbs_var on_rbs_constant
 
           def check_type(type)
             on_type([::RBS::Types::Union], type) do |union|

data/lib/rubocop/cop/rbs/lint/literal_intersection.rb

@@ -36,6 +36,7 @@ module RuboCop
           alias on_rbs_global on_rbs_constant
           alias on_rbs_type_alias on_rbs_constant
           alias on_rbs_attribute on_rbs_constant
+          alias on_rbs_var on_rbs_constant
 
           def check_intersection(intersection)
             intersection.types.each do |type|

data/lib/rubocop/cop/rbs/lint/new_returns_void.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# rbs_inline: enabled
+
+module RuboCop
+  module Cop
+    module RBS
+      module Lint
+        # Checks that there are void types in the return type of `.new` method
+        # `self.new` is a special and fundamental method, and extra care should be taken regarding its return value.
+        # In most cases, assigning it `void` is an unintended mistake.
+        #
+        # @example default
+        #   # bad
+        #   def self.new: () -> void
+        #
+        #   # good
+        #   def self.new: () -> instance
+        #
+        class NewReturnsVoid < RuboCop::RBS::CopBase
+          MSG = "Don't use `void` in self.new method. Did you mean `instance`?"
+
+          # @rbs decl: RBS::AST::Members::MethodDefinition
+          def on_rbs_def(decl)
+            return unless decl.kind == :singleton
+            return unless decl.name == :new
+
+            decl.overloads.each do |overload|
+              return_type = overload.method_type.type.return_type
+              case return_type
+              when ::RBS::Types::Bases::Void
+                next unless return_type.location
+
+                range = location_to_range(return_type.location)
+                add_offense(range)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rbs/lint/top_level_interface.rb

@@ -35,6 +35,7 @@ module RuboCop
 
           def on_rbs_interface(decl)
             return unless @last_end_pos.nil? || (@last_end_pos < decl.location.start_pos)
+            return unless decl.name.namespace.path.empty?
 
             range = location_to_range(decl.location)
             add_offense(range)

data/lib/rubocop/cop/rbs/lint/top_level_type_alias.rb

@@ -32,6 +32,7 @@ module RuboCop
 
           def on_rbs_type_alias(decl)
             return unless @last_end_pos.nil? || (@last_end_pos < decl.location.start_pos)
+            return unless decl.name.namespace.path.empty?
 
             range = location_to_range(decl.location)
             add_offense(range)

data/lib/rubocop/cop/rbs/lint/{useless_overload_type_params.rb → unused_overload_type_params.rb}

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module RBS
       module Lint
-        # Notice useless overload type parameters.
+        # Notice unused overload type parameters.
         #
         # @example default
         #   # bad
@@ -12,8 +12,8 @@ module RuboCop
         #
         #   # good
         #   def foo: [T] (T) -> T
-        class UselessOverloadTypeParams < RuboCop::RBS::CopBase
-          MSG = 'Useless overload type variable - `%<variable>s`.'
+        class UnusedOverloadTypeParams < RuboCop::RBS::CopBase
+          MSG = 'Unused overload type variable - `%<variable>s`.'
 
           def on_rbs_def(decl)
             decl.overloads.each do |overload|

data/lib/rubocop/cop/rbs/lint/unused_type_alias_type_params.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RBS
+      module Lint
+        # Notice unused type parameters.
+        #
+        # @example default
+        #   # bad
+        #   type ary[T] = Array[Integer]
+        #
+        #   # good
+        #   type ary[T] = Array[T]
+        class UnusedTypeAliasTypeParams < RuboCop::RBS::CopBase
+          MSG = 'Unused type variable - `%<variable>s`.'
+
+          def on_rbs_type_alias(decl)
+            return if decl.type_params.empty?
+
+            type_params = decl.type_params.dup
+
+            map = type_params.to_h { |param| [param.name, param] }
+            type_params.each do |type_param|
+              if type_param.upper_bound
+                used_variable_in_type(type_param.upper_bound) do |var|
+                  map.delete(var.name)
+                end
+              end
+            end
+
+            used_variable_in_type(decl.type) do |var|
+              map.delete(var.name)
+            end
+            return if map.empty?
+
+            map.each do |name, type_param|
+              next unless type_param.location
+
+              t = location_to_range(type_param.location[:name])
+              add_offense(t, message: format(MSG, variable: name))
+            end
+          end
+
+          def used_variable_in_type(type, &block)
+            case type
+            when ::RBS::Types::Variable
+              yield type
+            else
+              type.each_type do |t|
+                used_variable_in_type(t, &block)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rbs/lint/will_syntax_error.rb

@@ -45,14 +45,26 @@ module RuboCop
             check_module_or_class(decl)
           end
 
-          def check_module_or_class(decl)
+          def check_type_params(decl)
             decl.type_params.each do |param|
               if ub = param.upper_bound
                 void_type_context_validator(ub)
                 no_self_type_validator(ub)
                 no_classish_type_validator(ub)
               end
+
+              if param.respond_to?(:default_type)
+                if dt = param.default_type
+                  void_type_context_validator(dt)
+                  no_self_type_validator(dt)
+                  no_classish_type_validator(dt)
+                end
+              end
             end
+          end
+
+          def check_module_or_class(decl)
+            check_type_params(decl)
 
             decl.each_member do |member|
               case member
@@ -79,6 +91,8 @@ module RuboCop
           end
 
           def on_rbs_interface(decl)
+            check_type_params(decl)
+
             decl.members.each do |member|
               case member
               when AST::Members::MethodDefinition
@@ -96,7 +110,14 @@ module RuboCop
             void_type_context_validator(decl.type)
           end
           alias on_rbs_global on_rbs_constant
-          alias on_rbs_type_alias on_rbs_constant
+
+          def on_rbs_type_alias(decl)
+            no_self_type_validator(decl.type)
+            no_classish_type_validator(decl.type)
+            void_type_context_validator(decl.type)
+
+            check_type_params(decl)
+          end
 
           private
 
@@ -166,6 +187,7 @@ module RuboCop
               end
             when Types::Proc
               void_type_context_validator(type.type)
+              void_type_context_validator(type.self_type) if type.self_type
               if type.block
                 void_type_context_validator(type.block.type)
                 void_type_context_validator(type.block.self_type) if type.block.self_type

data/lib/rubocop/cop/rbs/style/class_with_singleton.rb

@@ -0,0 +1,48 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RBS
+      module Style
+        # Checks that `class` in singleton context.
+        #
+        # @example (default)
+        #   # bad
+        #   def self.foo: (class) -> class
+        #
+        #   # good
+        #   def self.foo: (self) -> self
+        #
+        class ClassWithSingleton < RuboCop::RBS::CopBase
+          extend AutoCorrector
+          MSG = 'Use `self` instead of `class`.'
+
+          # @rbs decl: RBS::AST::Members::MethodDefinition
+          def on_rbs_def(decl)
+            return unless decl.kind == :singleton
+
+            decl.overloads.each do |overload|
+              overload.method_type.each_type do |type|
+                check_type(type)
+              end
+            end
+          end
+
+          # @rbs type: RBS::Types::t
+          def check_type(type)
+            case type
+            when ::RBS::Types::Bases::Class
+              return unless type.location
+
+              range = location_to_range(type.location)
+              add_offense(range) do |corrector|
+                corrector.replace(range, 'self')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rbs/style/classic_type.rb

@@ -29,6 +29,14 @@ module RuboCop
             end
           end
 
+          def on_rbs_constant(decl)
+            check_type(decl.type)
+          end
+          alias on_rbs_global on_rbs_constant
+          alias on_rbs_type_alias on_rbs_constant
+          alias on_rbs_attribute on_rbs_constant
+          alias on_rbs_var on_rbs_constant
+
           # @rbs type: ::RBS::Types::t
           def check_type(type)
             find_replacement(type) do |t, replaced|

data/lib/rubocop/cop/rbs/style/empty_argument.rb

@@ -163,6 +163,7 @@ module RuboCop
           alias on_rbs_global on_rbs_constant
           alias on_rbs_type_alias on_rbs_constant
           alias on_rbs_attribute on_rbs_constant
+          alias on_rbs_var on_rbs_constant
         end
       end
     end

data/lib/rubocop/cop/rbs/style/instance_with_instance.rb

@@ -0,0 +1,57 @@
+# rbs_inline: enabled
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RBS
+      module Style
+        # Checks that `instance` in instance context.
+        #
+        # @example (default)
+        #   # bad
+        #   def foo: (instance) -> instance
+        #
+        #   # good
+        #   def foo: (self) -> self
+        #
+        class InstanceWithInstance < RuboCop::RBS::CopBase
+          extend AutoCorrector
+          MSG = 'Use `self` instead of `instance`.'
+
+          # @rbs decl: RBS::AST::Declarations::Class
+          def on_rbs_class(decl)
+            # The meaning of `self` and `instance` changes in generic class.
+            return unless decl.type_params.empty?
+
+            decl.members.each do |member|
+              case member
+              when ::RBS::AST::Members::MethodDefinition
+                next unless member.kind == :instance
+
+                member.overloads.each do |overload|
+                  overload.method_type.each_type do |type|
+                    check_type(type)
+                  end
+                end
+              when ::RBS::AST::Members::InstanceVariable
+                check_type(member.type)
+              end
+            end
+          end
+
+          def check_type(type)
+            case type
+            when ::RBS::Types::Bases::Instance
+              return unless type.location
+
+              range = location_to_range(type.location)
+              add_offense(range) do |corrector|
+                corrector.replace(range, 'self')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rbs/style/redundant_parentheses.rb

@@ -156,6 +156,7 @@ module RuboCop
           alias on_rbs_global on_rbs_constant
           alias on_rbs_type_alias on_rbs_constant
           alias on_rbs_attribute on_rbs_constant
+          alias on_rbs_var on_rbs_constant
         end
       end
     end

data/lib/rubocop/cop/rbs_cops.rb

@@ -14,6 +14,7 @@ require_relative 'rbs/layout/end_alignment'
 require_relative 'rbs/layout/extra_spacing'
 require_relative 'rbs/layout/indentation_width'
 require_relative 'rbs/layout/overload_indentation'
+require_relative 'rbs/layout/space_after_comma'
 require_relative 'rbs/layout/space_around_arrow'
 require_relative 'rbs/layout/space_around_braces'
 require_relative 'rbs/layout/space_around_operators'
@@ -21,21 +22,26 @@ require_relative 'rbs/layout/space_before_colon'
 require_relative 'rbs/layout/space_before_overload'
 require_relative 'rbs/layout/trailing_whitespace'
 
+require_relative 'rbs/lint/ambiguous_keyword_argument_key'
 require_relative 'rbs/lint/ambiguous_operator_precedence'
 require_relative 'rbs/lint/duplicate_overload'
 require_relative 'rbs/lint/literal_intersection'
+require_relative 'rbs/lint/new_returns_void'
 require_relative 'rbs/lint/syntax'
 require_relative 'rbs/lint/top_level_interface'
 require_relative 'rbs/lint/top_level_type_alias'
+require_relative 'rbs/lint/unused_overload_type_params'
+require_relative 'rbs/lint/unused_type_alias_type_params'
 require_relative 'rbs/lint/useless_access_modifier'
-require_relative 'rbs/lint/useless_overload_type_params'
 require_relative 'rbs/lint/will_syntax_error'
 
 require_relative 'rbs/style/block_return_boolish'
+require_relative 'rbs/style/class_with_singleton'
 require_relative 'rbs/style/classic_type'
 require_relative 'rbs/style/duplicated_type'
 require_relative 'rbs/style/empty_argument'
 require_relative 'rbs/style/initialize_return_type'
+require_relative 'rbs/style/instance_with_instance'
 require_relative 'rbs/style/optional_nil'
 require_relative 'rbs/style/redundant_parentheses'
 require_relative 'rbs/style/true_false'

data/lib/rubocop/rbs/cop_base.rb

@@ -73,6 +73,7 @@ module RuboCop
       def on_rbs_attribute(member); end
       def on_rbs_public(member); end
       def on_rbs_private(member); end
+      def on_rbs_var(member); end
 
       def walk(decl)
         case decl
@@ -99,6 +100,8 @@ module RuboCop
           on_rbs_public(decl)
         when ::RBS::AST::Members::Private
           on_rbs_private(decl)
+        when ::RBS::AST::Members::Var
+          on_rbs_var(decl)
         end
       end
 

data/lib/rubocop/rbs/processed_rbs_source.rb

@@ -23,12 +23,8 @@ module RuboCop
         @error.nil?
       end
 
-      def tokens(with_trivia: false)
-        @tokens ||= begin
-          tokens = ::RBS::Parser.lex(buffer).value
-          tokens.reject! { |token| token.type == :tTRIVIA } unless with_trivia
-          tokens
-        end
+      def tokens
+        @tokens ||= ::RBS::Parser.lex(buffer).value
       end
     end
   end

data/lib/rubocop/rbs/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module RBS
-    VERSION = '1.2.0'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-on-rbs
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - ksss
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2025-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -77,26 +76,32 @@ files:
 - lib/rubocop/cop/rbs/layout/extra_spacing.rb
 - lib/rubocop/cop/rbs/layout/indentation_width.rb
 - lib/rubocop/cop/rbs/layout/overload_indentation.rb
+- lib/rubocop/cop/rbs/layout/space_after_comma.rb
 - lib/rubocop/cop/rbs/layout/space_around_arrow.rb
 - lib/rubocop/cop/rbs/layout/space_around_braces.rb
 - lib/rubocop/cop/rbs/layout/space_around_operators.rb
 - lib/rubocop/cop/rbs/layout/space_before_colon.rb
 - lib/rubocop/cop/rbs/layout/space_before_overload.rb
 - lib/rubocop/cop/rbs/layout/trailing_whitespace.rb
+- lib/rubocop/cop/rbs/lint/ambiguous_keyword_argument_key.rb
 - lib/rubocop/cop/rbs/lint/ambiguous_operator_precedence.rb
 - lib/rubocop/cop/rbs/lint/duplicate_overload.rb
 - lib/rubocop/cop/rbs/lint/literal_intersection.rb
+- lib/rubocop/cop/rbs/lint/new_returns_void.rb
 - lib/rubocop/cop/rbs/lint/syntax.rb
 - lib/rubocop/cop/rbs/lint/top_level_interface.rb
 - lib/rubocop/cop/rbs/lint/top_level_type_alias.rb
+- lib/rubocop/cop/rbs/lint/unused_overload_type_params.rb
+- lib/rubocop/cop/rbs/lint/unused_type_alias_type_params.rb
 - lib/rubocop/cop/rbs/lint/useless_access_modifier.rb
-- lib/rubocop/cop/rbs/lint/useless_overload_type_params.rb
 - lib/rubocop/cop/rbs/lint/will_syntax_error.rb
 - lib/rubocop/cop/rbs/style/block_return_boolish.rb
+- lib/rubocop/cop/rbs/style/class_with_singleton.rb
 - lib/rubocop/cop/rbs/style/classic_type.rb
 - lib/rubocop/cop/rbs/style/duplicated_type.rb
 - lib/rubocop/cop/rbs/style/empty_argument.rb
 - lib/rubocop/cop/rbs/style/initialize_return_type.rb
+- lib/rubocop/cop/rbs/style/instance_with_instance.rb
 - lib/rubocop/cop/rbs/style/optional_nil.rb
 - lib/rubocop/cop/rbs/style/redundant_parentheses.rb
 - lib/rubocop/cop/rbs/style/true_false.rb
@@ -115,7 +120,6 @@ metadata:
   source_code_uri: https://github.com/ksss/rubocop-on-rbs
   changelog_uri: https://github.com/ksss/rubocop-on-rbs
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: RuboCop extension for RBS file.
 test_files: []