Merge pull request #9390 from koic/fix_infinite_loop_error_for_non_ni…

…l_check

Fix an infinite loop error for `Style/NonNilCheck` with `Style/NilComparison`

changelog/fix_infinite_loop_error_for_non_nil_check.md

@@ -0,0 +1 @@
+* [#9389](https://github.com/rubocop-hq/rubocop/pull/9389): Fix an infinite loop error for `IncludeSemanticChanges: false` of `Style/NonNilCheck` with `EnforcedStyle: comparison` of `Style/NilComparison`. ([@koic][])

lib/rubocop/cop/style/non_nil_check.rb

@@ -8,6 +8,9 @@ module Style
       # With `IncludeSemanticChanges` set to `false` by default, this cop
       # does not report offenses for `!x.nil?` and does no changes that might
       # change behavior.
+      # Also `IncludeSemanticChanges` set to `false` with `EnforcedStyle: comparison` of
+      # `Style/NilComparison` cop, this cop does not report offenses for `x != nil` and
+      # does no changes to `!x.nil?` style.
       #
       # With `IncludeSemanticChanges` set to `true`, this cop reports offenses
       # for `!x.nil?` and autocorrects that and `x != nil` to solely `x`, which
@@ -49,7 +52,8 @@ class NonNilCheck < Base
         def_node_matcher :not_and_nil_check?, '(send (send _ :nil?) :!)'
 
         def on_send(node)
-          return if ignored_node?(node)
+          return if ignored_node?(node) ||
+                    !include_semantic_changes? && nil_comparison_style == 'comparison'
           return unless (offense_node = find_offense_node(node))
 
           message = message(node)
@@ -138,6 +142,12 @@ def autocorrect_unless_nil(corrector, node, receiver)
           corrector.replace(node.parent.loc.keyword, 'if')
           corrector.replace(node, receiver.source)
         end
+
+        def nil_comparison_style
+          nil_comparison_conf = config.for_cop('Style/NilComparison')
+
+          nil_comparison_conf['Enabled'] && nil_comparison_conf['EnforcedStyle']
+        end
       end
     end
   end

spec/rubocop/cli/cli_autocorrect_spec.rb

@@ -1639,6 +1639,37 @@ def self.some_method(foo, bar: 1)
     RUBY
   end
 
+  it 'corrects `Style/InverseMethods` offenses when specifying `IncludeSemanticChanges: false` of ' \
+     '`Style/NonNilCheck` and `EnforcedStyle: comparison` of `Style/NilComparison`' do
+    create_file('example.rb', <<~RUBY)
+      # frozen_string_literal: true
+
+      !(foo == nil)
+    RUBY
+
+    create_file('.rubocop.yml', <<~YAML)
+      Style/NilComparison:
+        Enabled: true
+        EnforcedStyle: comparison # alternative config
+
+      Style/NonNilCheck:
+        Enabled: true
+        IncludeSemanticChanges: false # default config
+    YAML
+
+    expect(cli.run([
+                     '--auto-correct-all',
+                     '--only',
+                     'Style/InverseMethods,Style/NonNilCheck,Style/NilComparison'
+                   ])).to eq(0)
+    expect($stderr.string).to eq('')
+    expect(IO.read('example.rb')).to eq(<<~RUBY)
+      # frozen_string_literal: true
+
+      foo != nil
+    RUBY
+  end
+
   it 'corrects Lint/ParenthesesAsGroupedExpression and offenses and ' \
      'accepts Style/RedundantParentheses' do
     create_file('example.rb', <<~RUBY)

spec/rubocop/cop/style/non_nil_check_spec.rb

@@ -162,4 +162,43 @@ def Test.signed_in?
       RUBY
     end
   end
+
+  context 'when `EnforcedStyle: comparison` of `Style/NilComparison` cop' do
+    let(:other_cops) do
+      {
+        'Style/NilComparison' => { 'EnforcedStyle' => 'comparison' }
+      }
+    end
+
+    context '`IncludeSemanticChanges: false`' do
+      let(:cop_config) do
+        {
+          'IncludeSemanticChanges' => false
+        }
+      end
+
+      it 'does not register an offense for `foo != nil`' do
+        expect_no_offenses('foo != nil')
+      end
+    end
+
+    context '`IncludeSemanticChanges: true`' do
+      let(:cop_config) do
+        {
+          'IncludeSemanticChanges' => true
+        }
+      end
+
+      it 'does not register an offense for `foo != nil`' do
+        expect_offense(<<~RUBY)
+          foo != nil
+              ^^ Prefer `!expression.nil?` over `expression != nil`.
+        RUBY
+
+        expect_correction(<<~RUBY)
+          foo
+        RUBY
+      end
+    end
+  end
 end