From eabe46338617b8a3906f2236ea9be2e185c77f2a Mon Sep 17 00:00:00 2001
From: Sijawusz Pur Rahnama <sija@sija.pl>
Date: Fri, 18 Nov 2022 05:27:05 +0100
Subject: [PATCH] Instead of adding the new rule to support enforcing parens
 around assignments, refactor existing `RedundantParentheses` rule

---
 .../rule/style/redundant_parentheses_spec.cr  | 17 +++++++-
 .../rule/style/parenthesized_assignments.cr   | 43 -------------------
 src/ameba/rule/style/redundant_parentheses.cr | 23 +++++++---
 3 files changed, 32 insertions(+), 51 deletions(-)
 delete mode 100644 src/ameba/rule/style/parenthesized_assignments.cr

diff --git a/spec/ameba/rule/style/redundant_parentheses_spec.cr b/spec/ameba/rule/style/redundant_parentheses_spec.cr
index c6890332..c356b63d 100644
--- a/spec/ameba/rule/style/redundant_parentheses_spec.cr
+++ b/spec/ameba/rule/style/redundant_parentheses_spec.cr
@@ -75,7 +75,7 @@ module Ameba::Rule::Style
         end
       end
 
-      context "#exclude_assignments=" do
+      context "#parenthesized_assignments=" do
         it "reports assignments by default" do
           expect_issue subject, <<-CRYSTAL
             if (foo = @foo)
@@ -83,11 +83,24 @@ module Ameba::Rule::Style
               foo
             end
             CRYSTAL
+
+          expect_no_issues subject, <<-CRYSTAL
+            if foo = @foo
+              foo
+            end
+            CRYSTAL
         end
 
         it "allows to configure assignments" do
           rule = Rule::Style::RedundantParentheses.new
-          rule.exclude_assignments = true
+          rule.parenthesized_assignments = true
+
+          expect_issue rule, <<-CRYSTAL
+            if foo = @foo
+             # ^^^^^^^^^^ error: Missing parentheses
+              foo
+            end
+            CRYSTAL
 
           expect_no_issues rule, <<-CRYSTAL
             if (foo = @foo)
diff --git a/src/ameba/rule/style/parenthesized_assignments.cr b/src/ameba/rule/style/parenthesized_assignments.cr
deleted file mode 100644
index 784d58b6..00000000
--- a/src/ameba/rule/style/parenthesized_assignments.cr
+++ /dev/null
@@ -1,43 +0,0 @@
-module Ameba::Rule::Style
-  # A rule that disallows assignments without parens in control expressions.
-  #
-  # For example, this is considered invalid:
-  #
-  # ```
-  # if foo = @foo
-  #   do_something
-  # end
-  # ```
-  #
-  # And should be replaced by the following:
-  #
-  # ```
-  # if (foo = @foo)
-  #   do_something
-  # end
-  # ```
-  #
-  # YAML configuration example:
-  #
-  # ```
-  # Style/ParenthesizedAssignments:
-  #   Enabled: true
-  # ```
-  class ParenthesizedAssignments < Base
-    properties do
-      enabled false
-      description "Disallows assignments without parens in control expressions"
-    end
-
-    MSG = "Missing parentheses around assignment"
-
-    def test(source, node : Crystal::If | Crystal::Unless | Crystal::Case | Crystal::While | Crystal::Until)
-      return unless (cond = node.cond).is_a?(Crystal::Assign)
-
-      issue_for cond, MSG do |corrector|
-        corrector.insert_before(cond, '(')
-        corrector.insert_after(cond, ')')
-      end
-    end
-  end
-end
diff --git a/src/ameba/rule/style/redundant_parentheses.cr b/src/ameba/rule/style/redundant_parentheses.cr
index b0c1ec15..07e97532 100644
--- a/src/ameba/rule/style/redundant_parentheses.cr
+++ b/src/ameba/rule/style/redundant_parentheses.cr
@@ -23,17 +23,18 @@ module Ameba::Rule::Style
   # Style/RedundantParentheses:
   #   Enabled: true
   #   ExcludeTernary: false
-  #   ExcludeAssignments: false
+  #   ParenthesizedAssignments: false
   # ```
   class RedundantParentheses < Base
     properties do
       description "Disallows redundant parentheses around control expressions"
 
       exclude_ternary false
-      exclude_assignments false
+      parenthesized_assignments false
     end
 
-    MSG = "Redundant parentheses"
+    MSG_REDUNDANT = "Redundant parentheses"
+    MSG_MISSING   = "Missing parentheses"
 
     protected def strip_parentheses?(node, in_ternary) : Bool
       case node
@@ -44,24 +45,34 @@ module Ameba::Rule::Style
       when Crystal::Yield
         !in_ternary || node.has_parentheses? || node.exps.empty?
       when Crystal::Assign, Crystal::OpAssign, Crystal::MultiAssign
-        !in_ternary && !exclude_assignments
+        !in_ternary && !parenthesized_assignments
       else
         true
       end
     end
 
     def test(source, node : Crystal::If | Crystal::Unless | Crystal::Case | Crystal::While | Crystal::Until)
+      cond = node.cond
+
+      if cond.is_a?(Crystal::Assign) && parenthesized_assignments
+        issue_for cond, MSG_MISSING do |corrector|
+          corrector.insert_before(cond, '(')
+          corrector.insert_after(cond, ')')
+        end
+        return
+      end
+
       is_ternary = node.is_a?(Crystal::If) && node.ternary?
 
       return if is_ternary && exclude_ternary
 
-      return unless (cond = node.cond).is_a?(Crystal::Expressions)
+      return unless cond.is_a?(Crystal::Expressions)
       return unless cond.keyword.paren?
 
       return unless exp = cond.single_expression?
       return unless strip_parentheses?(exp, is_ternary)
 
-      issue_for cond, MSG do |corrector|
+      issue_for cond, MSG_REDUNDANT do |corrector|
         corrector.remove_trailing(cond, 1)
         corrector.remove_leading(cond, 1)
       end