Fix Style/WordArray for subarrays

koic · Jan 1, 2023 · 3cce8c8 · 3cce8c8
1 parent d5c303a
commit 3cce8c8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/rubocop/cop/style/word_array.rb b/lib/rubocop/cop/style/word_array.rb
@@ -98,7 +98,9 @@ def on_array(node)
         def within_2d_array_of_complex_content?(node)
           return false unless (parent = node.parent)
 
-          parent.array_type? && parent.values.any? { |subarray| complex_content?(subarray.values) }
+          parent.array_type? &&
+            parent.values.all?(&:array_type?) &&
+            parent.values.any? { |subarray| complex_content?(subarray.values) }
         end
 
         def complex_content?(strings, complex_regex: word_regex)

diff --git a/spec/rubocop/cop/style/word_array_spec.rb b/spec/rubocop/cop/style/word_array_spec.rb
@@ -375,6 +375,17 @@
         ]
       RUBY
     end
+
+    it 'registers an offense and corrects for nested arrays' do
+      expect_offense(<<~RUBY)
+        [['one', 'One'], 2, 3]
+         ^^^^^^^^^^^^^^ Use `%w` or `%W` for an array of words.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        [%w(one One), 2, 3]
+      RUBY
+    end
   end
 
   context 'when EnforcedStyle is array' do