prism 0.14.0 → 0.15.1

data/lib/prism/lex_compat.rb

@@ -357,6 +357,7 @@ module Prism
           @dedent_next = true
           @dedent = nil
           @embexpr_balance = 0
+          @ended_on_newline = false
         end
 
         # As tokens are coming in, we track the minimum amount of common leading
@@ -366,13 +367,14 @@ module Prism
           case token.event
           when :on_embexpr_beg, :on_heredoc_beg
             @embexpr_balance += 1
+            @dedent = 0 if @dedent_next && @ended_on_newline
           when :on_embexpr_end, :on_heredoc_end
             @embexpr_balance -= 1
           when :on_tstring_content
             if embexpr_balance == 0
               line = token.value
 
-              if !(line.strip.empty? && line.end_with?("\n")) && dedent_next
+              if dedent_next && !(line.strip.empty? && line.end_with?("\n"))
                 leading = line[/\A(\s*)\n?/, 1]
                 next_dedent = 0
 
@@ -385,11 +387,16 @@ module Prism
                 end
 
                 @dedent = [dedent, next_dedent].compact.min
+                @dedent_next = true
+                @ended_on_newline = line.end_with?("\n")
+                tokens << token
+                return
               end
             end
           end
 
           @dedent_next = token.event == :on_tstring_content && embexpr_balance == 0
+          @ended_on_newline = false
           tokens << token
         end
 
@@ -440,28 +447,21 @@ module Prism
 
             while index < max_index
               token = tokens[index]
+              results << token
               index += 1
 
               case token.event
               when :on_embexpr_beg, :on_heredoc_beg
                 embexpr_balance += 1
-                results << token
               when :on_embexpr_end, :on_heredoc_end
                 embexpr_balance -= 1
-                results << token
               when :on_tstring_content
                 if embexpr_balance == 0
-                  results << token
-
                   while index < max_index && tokens[index].event == :on_tstring_content
                     token.value << tokens[index].value
                     index += 1
                   end
-                else
-                  results << token
                 end
-              else
-                results << token
               end
             end
 

data/lib/prism/mutation_compiler.rb

@@ -97,7 +97,7 @@ module Prism
 
     # Copy a CallAndWriteNode node
     def visit_call_and_write_node(node)
-      node.copy(receiver: visit(node.receiver), arguments: visit(node.arguments), value: visit(node.value))
+      node.copy(receiver: visit(node.receiver), value: visit(node.value))
     end
 
     # Copy a CallNode node
@@ -107,12 +107,12 @@ module Prism
 
     # Copy a CallOperatorWriteNode node
     def visit_call_operator_write_node(node)
-      node.copy(receiver: visit(node.receiver), arguments: visit(node.arguments), value: visit(node.value))
+      node.copy(receiver: visit(node.receiver), value: visit(node.value))
     end
 
     # Copy a CallOrWriteNode node
     def visit_call_or_write_node(node)
-      node.copy(receiver: visit(node.receiver), arguments: visit(node.arguments), value: visit(node.value))
+      node.copy(receiver: visit(node.receiver), value: visit(node.value))
     end
 
     # Copy a CapturePatternNode node
@@ -350,6 +350,21 @@ module Prism
       node.copy(pattern: visit(node.pattern), statements: visit(node.statements))
     end
 
+    # Copy a IndexAndWriteNode node
+    def visit_index_and_write_node(node)
+      node.copy(receiver: visit(node.receiver), arguments: visit(node.arguments), block: visit(node.block), value: visit(node.value))
+    end
+
+    # Copy a IndexOperatorWriteNode node
+    def visit_index_operator_write_node(node)
+      node.copy(receiver: visit(node.receiver), arguments: visit(node.arguments), block: visit(node.block), value: visit(node.value))
+    end
+
+    # Copy a IndexOrWriteNode node
+    def visit_index_or_write_node(node)
+      node.copy(receiver: visit(node.receiver), arguments: visit(node.arguments), block: visit(node.block), value: visit(node.value))
+    end
+
     # Copy a InstanceVariableAndWriteNode node
     def visit_instance_variable_and_write_node(node)
       node.copy(value: visit(node.value))