rubocop-rbs_inline 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cb89181193fb2e2b975ef100f2948fb1f89dc6dea644646855cc03a7950baf6
-  data.tar.gz: 133e570879c25b31253a51dea5915a9ea12c13727c761d78ec3e32556632eb88
+  metadata.gz: 330ffc2d84cf5c15d64d2922c93eb97017e4dd585cf52dea2e05ac2ec2ed60ab
+  data.tar.gz: 7c550b9d63d636cd52d8ddf285e1dd9220b2764425ef59784685777c38f82963
 SHA512:
-  metadata.gz: 56462bcc98368caba914397e84a540b06589050c8f5c442755f16558c158decd34705ba3aa236831976b70f2dc284cb49fb412f98beb3dafa5621bc3ec3f12a2
-  data.tar.gz: d555d249fb26f8e62979978e1737d9cf72511a60a25a843e8e427750f194f9955d5bdfb920f0ad56caf052a3dc9e72c9bb9f1a8ae352af07f9be6e8230b48139
+  metadata.gz: 1365b8c968cbd7341a8f685cdadc7334ac9d53ba78662af77522097df9440b8092821ef30c3445992809f71aedad50d45764a9a1a0e0baf54133d9cf029bc87b
+  data.tar.gz: abc24e1e6df83cb0c24ddac363ed1e7b7b623cd9d528c59cc9869715ecf7cb01430f25b3681b8f64d22ebd8c3b94ab2595cfe7710bad6be70897a2676aeea783

data/.rubocop.yml

@@ -23,6 +23,9 @@ Naming/FileName:
 RSpec/ExampleLength:
   Max: 20
 
+RSpec/NestedGroups:
+  Max: 5
+
 Style/Documentation:
   Enabled: false
 

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

@@ -17,7 +17,7 @@ module RuboCop
         #   # @rbs arg: String
         #   def method(arg); end
         #
-        class UnmatchedAnnotations < Base
+        class UnmatchedAnnotations < Base # rubocop:disable Metrics/ClassLength
           include RangeHelp
 
           MSG = 'target parameter not found.'
@@ -31,18 +31,12 @@ module RuboCop
 
           # @rbs node: Parser::AST::Node
           def on_def(node) #: void
-            arguments = arguments_for(node)
-
-            comment = result.find { |r| r.comments.map(&:location).map(&:start_line).include? node.location.line - 1 }
-            return unless comment
+            process(node)
+          end
 
-            result.delete(comment)
-            comment.each_annotation do |annotation|
-              case annotation
-              when RBS::Inline::AST::Annotations::VarType, RBS::Inline::AST::Annotations::BlockType
-                add_offense_for(annotation) unless arguments.include?(annotation_name(annotation))
-              end
-            end
+          # @rbs node: Parser::AST::Node
+          def on_defs(node) #: void
+            process(node)
           end
 
           def on_investigation_end #: void
@@ -62,9 +56,25 @@ module RuboCop
 
           private
 
+          # @rbs node: Parser::AST::Node
+          def process(node) #: void
+            arguments = arguments_for(node)
+
+            comment = result.find { |r| r.comments.map(&:location).map(&:start_line).include? node.location.line - 1 }
+            return unless comment
+
+            result.delete(comment)
+            comment.each_annotation do |annotation|
+              case annotation
+              when RBS::Inline::AST::Annotations::VarType, RBS::Inline::AST::Annotations::BlockType
+                add_offense_for(annotation) unless arguments.include?(annotation_name(annotation))
+              end
+            end
+          end
+
           # @rbs node: Parser::AST::Node
           def arguments_for(node) #: Array[String] # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-            node.children[1].children.flat_map do |argument|
+            args_for(node).children.flat_map do |argument|
               name = argument.children[0]&.to_s
               case argument.type
               when :arg, :optarg, :kwarg, :kwoptarg
@@ -87,10 +97,22 @@ module RuboCop
                 else
                   ['&', '&block']
                 end
+              else
+                raise
               end
             end
           end
 
+          # @rbs node: Parser::AST::Node
+          def args_for(node) #: Parser::AST::Node
+            case node.type
+            when :defs
+              node.children[2]
+            else
+              node.children[1]
+            end
+          end
+
           def parse_comments #: Array[RBS::Inline::AnnotationParser::ParsingResult]
             parsed_result = Prism.parse(processed_source.buffer.source)
             RBS::Inline::AnnotationParser.parse(parsed_result.comments)

data/lib/rubocop/rbs_inline/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module RbsInline
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

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

@@ -26,13 +26,22 @@ module RuboCop
           # @rbs node: Parser::AST::Node
           def on_def: (Parser::AST::Node node) -> void
 
+          # @rbs node: Parser::AST::Node
+          def on_defs: (Parser::AST::Node node) -> void
+
           def on_investigation_end: () -> void
 
           private
 
+          # @rbs node: Parser::AST::Node
+          def process: (Parser::AST::Node node) -> void
+
           # @rbs node: Parser::AST::Node
           def arguments_for: (Parser::AST::Node node) -> Array[String]
 
+          # @rbs node: Parser::AST::Node
+          def args_for: (Parser::AST::Node node) -> Parser::AST::Node
+
           def parse_comments: () -> Array[RBS::Inline::AnnotationParser::ParsingResult]
 
           # @rbs annotation: RBS::Inline::AST::Annotations::BlockType |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rbs_inline
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Takeshi KOMIYA