yoshiki 11.0.0.pre.9 → 11.0.0.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c6b40d96843b4e382ed33f54c8f0aab30f8f7c85f84b79f52552ec0ca68f30
-  data.tar.gz: 43addf10ac85160ca98e9a10df47db1defe7d3ff841bcca1eb30e7689dfccd6c
+  metadata.gz: 5bf1901967e5f7d00c6463a17508751166e6981eb1edac1172e52c44c0623580
+  data.tar.gz: 2c82f7056a5fa916ff1eff0d54c688113ff285fac49f8b7d0fe8469ebce33e70
 SHA512:
-  metadata.gz: 4443fd5e0d5d268a8a3b4adaea6ee4dabea427803b1fdad635012fca031f9cb2ab9b9b7f5cce3b89fad100c676738a3293e11efaa30ad8d422810cafe9237465
-  data.tar.gz: 185d9c3f40485a41cf997573098c93ed4dd01b95d1aa18fb06896a2e9d9df469c18f07046cfd93155fefded56747a2ba1449c8d7b1cf4d3f7ef121e502247546
+  metadata.gz: ed3f86f1b4cf9bacb1ca3da1793f2b5a9fe6e0ff2b76b486600b59a81f574ef869234a7a47720be1a0f6958ef8ec47d2b947310993fb013ccb5a604fd88c87de
+  data.tar.gz: '00294aa60e50cb7d4152902b0de1b4b22145c6fafc55f76ecbb71a7fa28aea2ba80083af30cc3708f95bcd88ded99d7a0e8066613d74c5ef91661851acb2b25c'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yoshiki (11.0.0.pre.9)
+    yoshiki (11.0.0.pre.10)
       rubocop (= 1.89.0)
       rubocop-performance (= 1.26.1)
       rubocop-rake (= 0.7.1)

data/lib/rubocop/cop/yoshiki/style/it_block_parameter.rb

@@ -5,15 +5,23 @@ module RuboCop
         # Checks for blocks with one argument where `it` block parameter can be used.
         #
         # `force_single_line` requires a single-line one-parameter block to use `it`.
-        # Multi-line blocks may keep a named parameter.
+        # Multi-line blocks may keep a named parameter, except `|it|` — never
+        # declare that name; it is the anonymous parameter.
+        #
+        # Hash value omission keeps the original key (`name:` becomes
+        # `name: it`, not `it:`). Replacing the identifier would make
+        # `it:`, which calls a method named `it` instead of the parameter.
         #
         # @example EnforcedStyle: force_single_line
         #   # bad
         #   block { |named_param| do_something(named_param) }
         #   block { do_something(_1) }
+        #   block { |name| remember!(name:) }
+        #   block { |it| do_something(it) }
         #
         #   # good
         #   block { do_something(it) }
+        #   block { remember!(name: it) }
         #   block do |named_param|
         #     do_something(named_param)
         #   end
@@ -29,6 +37,7 @@ module RuboCop
           minimum_target_ruby_version 3.4
 
           def on_block node
+            return correct_named_it(node) if named_it_parameter?(node)
             return unless force_single_line?
             return unless node.single_line?
             return unless node.arguments.one?
@@ -53,9 +62,26 @@ module RuboCop
             style == :force_single_line
           end
 
+          def named_it_parameter? node
+            node.arguments.one? &&
+              node.first_argument.arg_type? &&
+              node.first_argument.source == 'it'
+          end
+
+          def correct_named_it node
+            correct_to_it(node, 'it') do |corrector|
+              remove_block_arguments(corrector, node)
+            end
+          end
+
           def remove_block_arguments corrector, node
             range = node.arguments.source_range
-            range = range.adjust(end_pos: 1) if range.source_buffer.source[range.end_pos] == ' '
+            buf   = range.source_buffer.source
+            if buf[range.end_pos] == ' '
+              range = range.adjust(end_pos: 1)
+            elsif buf[range.begin_pos - 1] == ' '
+              range = range.adjust(begin_pos: -1)
+            end
             corrector.remove(range)
           end
 
@@ -65,13 +91,34 @@ module RuboCop
             return if variables.any? { used_in_nested_block?(it, node) }
 
             variables.each do |variable|
-              add_offense(variable, message: MSG_USE_IT_PARAMETER) do |corrector|
+              target = omitted_pair_for(variable) || variable
+              add_offense(target, message: MSG_USE_IT_PARAMETER) do |corrector|
                 before_replace&.call(corrector)
-                corrector.replace(variable, 'it')
+                replace_with_it(corrector, variable)
               end
             end
           end
 
+          def replace_with_it corrector, variable
+            pair = omitted_pair_for(variable)
+            if pair
+              corrector.replace(pair, "#{ pair.key.source }: it")
+            else
+              corrector.replace(variable, 'it')
+            end
+          end
+
+          # `name:` shares one identifier for key and value. Replacing the
+          # lvar would rewrite the keyword to `it:` (a method call).
+          def omitted_pair_for variable
+            parent = variable.parent
+            return unless parent&.pair_type?
+            return unless parent.value_omission?
+            return unless parent.value.equal?(variable)
+
+            parent
+          end
+
           def find_block_variables node, name
             return [] unless node.body
 

data/lib/yoshiki/version.rb

@@ -1,5 +1,5 @@
 module Yoshiki
 
-  VERSION = '11.0.0-9'.freeze
+  VERSION = '11.0.0-10'.freeze
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yoshiki
 version: !ruby/object:Gem::Version
-  version: 11.0.0.pre.9
+  version: 11.0.0.pre.10
 platform: ruby
 authors:
 - BM5k