RubyGems - rubocop-rbs_inline - Versions diffs - 1.1.1 → 1.2.1 - Mend

rubocop-rbs_inline 1.1.1 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
data/.vscode/settings.json +7 -0
data/Steepfile +1 -0
data/lib/rubocop/cop/style/rbs_inline/invalid_comment.rb +29 -1
data/lib/rubocop/cop/style/rbs_inline/invalid_types.rb +7 -1
data/lib/rubocop/cop/style/rbs_inline/unmatched_annotations.rb +1 -1
data/lib/rubocop/rbs_inline/version.rb +1 -1
data/rbs_collection.lock.yaml +12 -12
data/sig/rubocop/cop/style/rbs_inline/invalid_comment.rbs +4 -0
data/sig/rubocop/cop/style/rbs_inline/invalid_types.rbs +2 -0
metadata +3 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b33ed6ff1d6efff790de931d74d2663e0ca262a761d063114e486948828e9ca
-  data.tar.gz: 2d5678da5232ff06102653fc68a89ced09554eec6a048cc1f6dee322d37228e3
+  metadata.gz: df9439ba1e35119fa462bf18e5fa2a95932072807697d9d9a0e6f68e85331a06
+  data.tar.gz: c78bec5cc75c31720322a082aa87ab085077c01b010ab1c79e7033b236f54308
 SHA512:
-  metadata.gz: 0a6c443fbc4e058be3aca4ccc5b3e25068b139095c01994bfcd8ea62b406701f44fa5b4b643d7a23902e5c4a7d754b4fb5f741f0f0706ab36bc8cd465801751e
-  data.tar.gz: c6fcb3f88b5685f0a20e7a0c90f723ba4dabd14a029e10585c61bea64258ec29304b53b3e7db3ed962365abacfc21860ef1e65866eacc89b28efcf3aeaae9360
+  metadata.gz: 4bd4daa7ae11ace6793d58d78b06cb65b21fb5f3c8fb956b33b021a4b5aacdf397cff2dbf50d2ce9c888e0492764aa8280c24712c554013bb611a646a02d12bf
+  data.tar.gz: 020fa5e9e7dff73ba78d14e12b0a9caf4490893efaa422facddbb58097e44dfcd1e2c96e50cdef3beafdc71e9e97229fc4c30e116dc3eacf476fe545a1943b40

data/.vscode/settings.json CHANGED Viewed

@@ -1,5 +1,12 @@
 {
     "cSpell.words": [
+        "blockarg",
+        "Ivar",
+        "kwarg",
+        "kwoptarg",
+        "kwrestarg",
+        "optarg",
+        "restarg",
         "strscan"
     ],
     "rbs-helper.rbs-inline-on-save": true,

data/Steepfile CHANGED Viewed

@@ -8,4 +8,5 @@ target :lib do
   check 'lib'
   configure_code_diagnostics(D::Ruby.strict)
+  implicitly_returns_nil!
 end

data/lib/rubocop/cop/style/rbs_inline/invalid_comment.rb CHANGED Viewed

@@ -30,7 +30,8 @@ module RuboCop
           RBS_INLINE_KEYWORDS = %w[inherits override use module-self generic skip module class].freeze #: Array[String]
           def on_new_investigation #: void
-            processed_source.comments.each do |comment|
+            comments = consume_embedded_rbs(processed_source.comments)
+            comments.each do |comment|
               add_offense(comment) if comment.text =~ /\A#\s+#{SIGNATURE_PATTERN}/
               add_offense(comment) if comment.text =~ /\A#\s+:\s*#{SIGNATURE_PATTERN}/
@@ -40,6 +41,33 @@ module RuboCop
               end
             end
           end
+          private
+          def consume_embedded_rbs(comments) # rubocop:disable Metrics/MethodLength
+            in_embedded = false
+            indent = 1
+            line = 0
+            comments.select do |comment|
+              case comment.text
+              when /\A#(\s+)@rbs!(\s+|\Z)/
+                in_embedded = true
+                indent = Regexp.last_match(1).to_s.size
+                line = comment.loc.line
+                false
+              when /\A#(\s{#{indent + 1},}.*|\s*)\Z/
+                if in_embedded && comment.loc.line == line + 1
+                  line += 1
+                  false
+                else
+                  true
+                end
+              else
+                in_embedded = false
+                true
+              end
+            end
+          end
         end
       end
     end

data/lib/rubocop/cop/style/rbs_inline/invalid_types.rb CHANGED Viewed

@@ -23,10 +23,11 @@ module RuboCop
         class InvalidTypes < Base
           include RangeHelp
           include RBS::Inline::AST::Annotations
+          include RBS::Inline::AST::Members
           MSG = 'Invalid annotation found.'
-          def on_new_investigation #: void # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          def on_new_investigation #: void # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
             results = parse_comments
             results.each do |result|
               result.each_annotation do |annotation|
@@ -44,6 +45,11 @@ module RuboCop
                   add_offense(range) if annotation.self_types.empty?
                 when SyntaxErrorAssertion
                   add_offense(range)
+                when Embedded
+                  comment = annotation.source.comments.fetch(0)
+                  parsing_result = RBS::Inline::AnnotationParser::ParsingResult.new(comment)
+                  embedded = RBSEmbedded.new(parsing_result, annotation)
+                  add_offense(range) if embedded.members.is_a?(RBS::ParsingError)
                 end
               end
             end

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

@@ -141,7 +141,7 @@ module RuboCop
           #                  RBS::Inline::AST::Annotations::VarType
           def add_offense_for(annotation) #: void # rubocop:disable Metrics/AbcSize
             name = annotation_name(annotation)
-            loc = annotation.source.comments.first.location
+            loc = annotation.source.comments.first&.location or raise
             source = processed_source.buffer.source.dup.force_encoding('ASCII')
             text = source[loc.start_offset...loc.end_offset] or raise
             comment = text.force_encoding(processed_source.buffer.source.encoding)

data/lib/rubocop/rbs_inline/version.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 module RuboCop
   module RbsInline
-    VERSION = '1.1.1'
+    VERSION = '1.2.1'
   end
 end

data/rbs_collection.lock.yaml CHANGED Viewed

@@ -6,7 +6,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ddba0c60808c22451a194c1b57504fceb4fafd23
+    revision: 7651e7b92c15bd5b4bc11fd3dd455be0ea571fd0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: dbm
@@ -18,7 +18,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ddba0c60808c22451a194c1b57504fceb4fafd23
+    revision: 7651e7b92c15bd5b4bc11fd3dd455be0ea571fd0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: fileutils
@@ -46,7 +46,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ddba0c60808c22451a194c1b57504fceb4fafd23
+    revision: 7651e7b92c15bd5b4bc11fd3dd455be0ea571fd0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: parser
@@ -54,7 +54,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ddba0c60808c22451a194c1b57504fceb4fafd23
+    revision: 7651e7b92c15bd5b4bc11fd3dd455be0ea571fd0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: pathname
@@ -62,7 +62,7 @@ gems:
   source:
     type: stdlib
 - name: prism
-  version: 1.0.0
+  version: 1.2.0
   source:
     type: rubygems
 - name: pstore
@@ -78,7 +78,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ddba0c60808c22451a194c1b57504fceb4fafd23
+    revision: 7651e7b92c15bd5b4bc11fd3dd455be0ea571fd0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -86,15 +86,15 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ddba0c60808c22451a194c1b57504fceb4fafd23
+    revision: 7651e7b92c15bd5b4bc11fd3dd455be0ea571fd0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.6.1
+  version: 3.8.1
   source:
     type: rubygems
 - name: rbs-inline
-  version: 0.9.0
+  version: 0.10.0
   source:
     type: rubygems
 - name: rdoc
@@ -106,7 +106,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ddba0c60808c22451a194c1b57504fceb4fafd23
+    revision: 7651e7b92c15bd5b4bc11fd3dd455be0ea571fd0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop
@@ -114,7 +114,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ddba0c60808c22451a194c1b57504fceb4fafd23
+    revision: 7651e7b92c15bd5b4bc11fd3dd455be0ea571fd0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop-ast
@@ -122,7 +122,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: ddba0c60808c22451a194c1b57504fceb4fafd23
+    revision: 7651e7b92c15bd5b4bc11fd3dd455be0ea571fd0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: strscan

data/sig/rubocop/cop/style/rbs_inline/invalid_comment.rbs CHANGED Viewed

@@ -27,6 +27,10 @@ module RuboCop
           RBS_INLINE_KEYWORDS: Array[String]
           def on_new_investigation: () -> void
+          private
+          def consume_embedded_rbs: (untyped comments) -> untyped
         end
       end
     end

data/sig/rubocop/cop/style/rbs_inline/invalid_types.rbs CHANGED Viewed

@@ -22,6 +22,8 @@ module RuboCop
           include RBS::Inline::AST::Annotations
+          include RBS::Inline::AST::Members
           MSG: ::String
           def on_new_investigation: () -> void

metadata CHANGED Viewed

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rbs_inline
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Takeshi KOMIYA
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs-inline
@@ -87,7 +86,6 @@ metadata:
   source_code_uri: https://github.com/tk0miya/rubocop-rbs_inline
   changelog_uri: https://github.com/tk0miya/rubocop-rbs_inline
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +100,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 to check RBS annotation comments
 test_files: []