Fix up assoc indentation

Author: kddnewton

bin/test

@@ -35,9 +35,11 @@ END {
 }
 
 __END__
-assoc.rb:1
+assign.rb:6
+assoc.rb:4
 assoc.rb:8
 bare_assoc_hash.rb:4
+bare_assoc_hash.rb:5
 brace_block.rb:1
 break.rb:9
 call.rb:7
@@ -52,7 +54,6 @@ command_call.rb:3
 command_call.rb:4
 command_call.rb:7
 command_call.rb:9
-command_call.rb:10
 command_call.rb:11
 def.rb:6
 def_endless.rb:9
@@ -66,7 +67,7 @@ elsif.rb:3
 embdoc.rb:0
 embdoc.rb:1
 end_content.rb:0
-heredoc.rb:17
+hash.rb:6
 heredoc.rb:18
 if.rb:3
 if.rb:7

lib/syntax_tree/prism/formatter.rb

@@ -427,39 +427,12 @@ def format_prefix(operator_loc, value)
 
     # foo = bar
     def format_write(operator_loc, value)
-      indent_value = true
-      current = value
-
-      # Here, determine whether or not we should attempt to indent the value of
-      # the write. For certain nodes we can to avoid this because it will look
-      # strange.
-      until current.nil?
-        case current.type
-        when :array_node
-          indent_value = current.opening_loc.nil?
-          break
-        when :hash_node, :lambda_node
-          indent_value = false
-          break
-        when :string_node, :x_string_node, :interpolated_string_node, :interpolated_x_string_node
-          indent_value = current.opening_loc ? !current.opening.start_with?("<<") : true
-          break
-        when :call_node
-          current = current.receiver
-        when :interpolated_symbol_node
-          indent_value = current.opening_loc ? !current.opening.start_with?("%s") : true
-          break
-        else
-          break
-        end
-      end
-
       group do
         yield
         text(" ")
         loc(operator_loc)
 
-        if indent_value
+        if value.indent_write?
           indent do
             breakable_space
             format(value)

lib/syntax_tree/prism/nodes.rb

@@ -42,6 +42,23 @@ def contains_write?
 
       false
     end
+
+    def indent_write?
+      case type
+      when :array_node
+        opening_loc.nil?
+      when :hash_node, :lambda_node
+        false
+      when :string_node, :x_string_node, :interpolated_string_node, :interpolated_x_string_node
+        opening_loc ? !opening.start_with?("<<") : true
+      when :call_node
+        receiver ? receiver.indent_write? : true
+      when :interpolated_symbol_node
+        opening_loc ? !opening.start_with?("%s") : true
+      else
+        true
+      end
+    end
   end
 
   class AliasGlobalVariableNode
@@ -242,14 +259,29 @@ def format(q)
       if operator_loc
         q.format(key)
         q.text(" #{operator}")
-        q.breakable_space
-        q.format(value)
+
+        if value.indent_write?
+          q.indent do
+            q.breakable_space
+            q.format(value)
+          end
+        else
+          q.text(" ")
+          q.format(value)
+        end
       else
         q.format(key)
 
         if value && !value.is_a?(ImplicitNode)
-          q.text(" ")
-          q.format(value)
+          if value.indent_write?
+            q.indent do
+              q.breakable_space
+              q.format(value)
+            end
+          else
+            q.text(" ")
+            q.format(value)
+          end
         end
       end
     end