Merge pull request #9901 from jonas054/9891_auto_gen_config_hash_syntax

[Fix #9891] Fix --auto-gen-config bug for Style/HashSyntax
rubocop · Jul 5, 2021 · 61dc5da · 61dc5da
2 parents d2fbf72 + 98d229f
commit 61dc5da
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/changelog/fix_autogenconfig_bug_for_HashSyntax.md b/changelog/fix_autogenconfig_bug_for_HashSyntax.md
@@ -0,0 +1 @@
+* [#9891](https://github.com/rubocop/rubocop/issues/9891): Fix `--auto-gen-config` bug for `Style/HashSyntax`. ([@jonas054][])
diff --git a/lib/rubocop/cop/style/hash_syntax.rb b/lib/rubocop/cop/style/hash_syntax.rb
@@ -74,7 +74,7 @@ def on_hash(node)
             ruby19_no_mixed_keys_check(pairs)
           elsif style == :no_mixed_keys
             no_mixed_keys_check(pairs)
-          elsif node.source.include?('=>')
+          else
             ruby19_check(pairs)
           end
         end

diff --git a/spec/rubocop/cli/auto_gen_config_spec.rb b/spec/rubocop/cli/auto_gen_config_spec.rb
@@ -8,7 +8,10 @@
   include_context 'cli spec behavior'
 
   describe '--auto-gen-config' do
-    before { RuboCop::Formatter::DisabledConfigFormatter.config_to_allow_offenses = {} }
+    before do
+      RuboCop::Formatter::DisabledConfigFormatter.config_to_allow_offenses = {}
+      RuboCop::Formatter::DisabledConfigFormatter.detected_styles = {}
+    end
 
     shared_examples 'LineLength handling' do |ctx, initial_dotfile, exp_dotfile|
       context ctx do
@@ -446,11 +449,10 @@ def fooBar; end
         todo_contents = File.read('.rubocop_todo.yml').lines[8..-1].join
         expect(todo_contents).to eq(<<~YAML)
           # Offense count: 1
-          # Configuration parameters: EnforcedStyle, IgnoredPatterns.
+          # Configuration parameters: IgnoredPatterns.
           # SupportedStyles: snake_case, camelCase
           Naming/MethodName:
-            Exclude:
-              - 'example1.rb'
+            EnforcedStyle: camelCase
 
           # Offense count: 1
           # Cop supports --auto-correct.
@@ -1190,6 +1192,33 @@ def function(arg1, arg2, arg3, arg4, arg5, arg6, arg7)
       end
     end
 
+    it 'generates EnforcedStyle parameter if it solves all offenses' do
+      create_file('example1.rb', ['# frozen_string_literal: true', '', 'h(:a => 1)'])
+
+      expect(cli.run(['--auto-gen-config'])).to eq(0)
+      expect(File.readlines('.rubocop_todo.yml')[10..-1].join)
+        .to eq(<<~YAML)
+          # Configuration parameters: UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+          # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+          Style/HashSyntax:
+            EnforcedStyle: hash_rockets
+        YAML
+    end
+
+    it 'generates Exclude if no EnforcedStyle solves all offenses' do
+      create_file('example1.rb', ['# frozen_string_literal: true', '', 'h(:a => 1)', 'h(b: 2)'])
+
+      expect(cli.run(['--auto-gen-config'])).to eq(0)
+      expect(File.readlines('.rubocop_todo.yml')[10..-1].join)
+        .to eq(<<~YAML)
+          # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+          # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+          Style/HashSyntax:
+            Exclude:
+              - 'example1.rb'
+        YAML
+    end
+
     it 'can be called when there are no files to inspection' do
       expect(cli.run(['--auto-gen-config'])).to eq(0)
     end