node_mutation 1.23.3 → 1.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e941ef481546d5db16679d319312e0541c63b61cf5dceefcef91b97625e9ee18
-  data.tar.gz: e0638f659b75f11cbfadcbddb2a108e50b2e0055918a608b352661a54f5b66b6
+  metadata.gz: 6e67a8d6feebbc0ca9e6dd85003a976250c3718e8dd6f7192ef0847b2cc1385f
+  data.tar.gz: c4b1d58061ac4661ac1eeb85303438f87d4ff563d8181a0fea8c8ac24e88dde3
 SHA512:
-  metadata.gz: 5546f83edb1e5cbf6550a9400bacee3d478ead1f8898572be71aaa1e136ffb4fe62aea1927f5eae517d8cbc171b3371700fda96ca8ec3b581e38b5a257194467
-  data.tar.gz: cdd3a1497c5e6a4e451cdba7af3b55287a3859a4b435b7a8c63108851b1599babd17e78c68d91126ae382c6ecfc98ce2d982d6f871a0ab7c828e9685d3a1cce5
+  metadata.gz: c99a8e8fce9fa6c610e93aeaa9aa5ad9fe89c5bb6cac19f216c34872c9bd57e2900d0b5e566a5f4e04c967f5383e8ace02d945cb94146602717b110a09ddbcb2
+  data.tar.gz: ff6f52635d513523c5bf8d617e7e277ee71166e8f0cbee60fe3a94ffe379062e687128cc3378c791940e211a863e8d9585cd07c9e26db95f98ff1a58455b3906

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # NodeMutation
 
+## 1.24.1 (2024-03-05)
+
+* Adjust `start` and `end` position of `AppendAction` and `PrependAction`
+
+## 1.24.0 (2024-03-03)
+
+* Remove `Adapter#get_indent`
+
 ## 1.23.3 (2024-02-20)
 
 * `child_node_range` supports `LocalVariableReadNode#name`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.23.3)
+    node_mutation (1.24.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/node_mutation/action/append_action.rb

@@ -12,13 +12,27 @@ class NodeMutation::AppendAction < NodeMutation::Action
     @type = :insert
   end
 
+  # The rewritten source code with proper indent.
+  #
+  # @return [String] rewritten code.
+  def new_code
+    if rewritten_source.split("\n").length > 1
+      "\n" + rewritten_source.split("\n").map { |line| indent(@node) + line }.join("\n") + "\n"
+    else
+      indent(@node) + rewritten_source + "\n"
+    end
+  end
+
   private
 
   END_LENGTH = "\nend".length
 
   # Calculate the begin the end positions.
   def calculate_position
-    @start = @adapter.get_end(@node) - @adapter.get_start_loc(@node).column - END_LENGTH
+    node_end = @adapter.get_end(@node)
+    node_source = @adapter.get_source(@node)
+    last_line = node_source.split("\n").last
+    @start = node_end - last_line.length
     @end = @start
   end
 

data/lib/node_mutation/action/prepend_action.rb

@@ -12,6 +12,17 @@ class NodeMutation::PrependAction < NodeMutation::Action
     @type = :insert
   end
 
+  # The rewritten source code with proper indent.
+  #
+  # @return [String] rewritten code.
+  def new_code
+    if rewritten_source.split("\n").length > 1
+      "\n" + rewritten_source.split("\n").map { |line| indent(@node) + line }.join("\n") + "\n"
+    else
+      indent(@node) + rewritten_source + "\n"
+    end
+  end
+
   private
 
   # Calculate the begin and end positions.
@@ -19,7 +30,7 @@ class NodeMutation::PrependAction < NodeMutation::Action
     node_start = @adapter.get_start(@node)
     node_source = @adapter.get_source(@node)
     first_line = node_source.split("\n").first
-    @start = first_line.end_with?("do") ? node_start + first_line.rindex("do") + "do".length : node_start + first_line.length
+    @start = node_start + first_line.length + "\n".length
     @end = @start
   end
 

data/lib/node_mutation/action.rb

@@ -31,18 +31,6 @@ class NodeMutation::Action
     self
   end
 
-  # The rewritten source code with proper indent.
-  #
-  # @return [String] rewritten code.
-  def new_code
-    if rewritten_source.split("\n").length > 1
-      "\n\n" + rewritten_source.split("\n").map { |line| indent(@node) + line }
-                               .join("\n")
-    else
-      "\n" + indent(@node) + rewritten_source
-    end
-  end
-
   def to_struct
     to_struct_actions = @actions ? @actions.map(&:to_struct) : nil
     NodeMutation::Struct::Action.new(@type, @start, @end, new_code, to_struct_actions)

data/lib/node_mutation/adapter/parser.rb

@@ -82,7 +82,7 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
           if lines_count > 1 && lines_count == evaluated.size
             new_code = []
             lines.each_with_index { |line, index|
-              new_code << (index == 0 ? line : line[get_indent(evaluated.first) - NodeMutation.tab_width..-1])
+              new_code << (index == 0 ? line : line[get_start_loc(evaluated.first).column - NodeMutation.tab_width..-1])
             }
             new_code.join("\n")
           else
@@ -253,10 +253,6 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
     NodeMutation::Struct::Location.new(end_loc.line, end_loc.column)
   end
 
-  def get_indent(node)
-    file_source(node).split("\n")[get_start_loc(node).line - 1][/\A */].size
-  end
-
   private
 
   def child_node_by_name(node, child_name)

data/lib/node_mutation/adapter/prism.rb

@@ -74,7 +74,7 @@ class NodeMutation::PrismAdapter < NodeMutation::Adapter
           if lines_count > 1 && lines_count == evaluated.size
             new_code = []
             lines.each_with_index { |line, index|
-              new_code << (index == 0 ? line : line[get_indent(evaluated.first) - NodeMutation.tab_width..-1])
+              new_code << (index == 0 ? line : line[get_start_loc(evaluated.first).column - NodeMutation.tab_width..-1])
             }
             new_code.join("\n")
           else
@@ -186,10 +186,6 @@ class NodeMutation::PrismAdapter < NodeMutation::Adapter
     NodeMutation::Struct::Location.new(node.location.end_line, node.location.end_column)
   end
 
-  def get_indent(node)
-    node.location.start_column
-  end
-
   private
 
   def child_node_by_name(node, child_name)

data/lib/node_mutation/adapter/syntax_tree.rb

@@ -74,7 +74,7 @@ class NodeMutation::SyntaxTreeAdapter < NodeMutation::Adapter
           if lines_count > 1 && lines_count == evaluated.size
             new_code = []
             lines.each_with_index { |line, index|
-              new_code << (index == 0 ? line : line[get_indent(evaluated.first) - NodeMutation.tab_width..-1])
+              new_code << (index == 0 ? line : line[get_start_loc(evaluated.first).column - NodeMutation.tab_width..-1])
             }
             new_code.join("\n")
           else
@@ -185,10 +185,6 @@ class NodeMutation::SyntaxTreeAdapter < NodeMutation::Adapter
     NodeMutation::Struct::Location.new(node.location.end_line, node.location.end_column)
   end
 
-  def get_indent(node)
-    node.location.start_column
-  end
-
   private
 
   def child_node_by_name(node, child_name)

data/lib/node_mutation/adapter.rb

@@ -66,11 +66,4 @@ class NodeMutation::Adapter
   def get_end_loc(node, child_name = nil)
     raise NotImplementedError, "get_end_loc is not implemented"
   end
-
-  # Get indent of ast node
-  # @param node [Node] ast node
-  # @return [Number] indent
-  def get_indent(node)
-    raise NotImplementedError, "get_indent is not implemented"
-  end
 end

data/lib/node_mutation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class NodeMutation
-  VERSION = "1.23.3"
+  VERSION = "1.24.1"
 end

data/sig/node_mutation/adapter.rbs

@@ -14,6 +14,4 @@ class NodeMutation::Adapter[T]
   def get_start_loc: (node: T, ?child_name: String) -> NodeMutation::Struct::Location
 
   def get_end_loc: (node: T, ?child_name: String) -> NodeMutation::Struct::Location
-
-  def get_indent: (node: T) -> Integer
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.23.3
+  version: 1.24.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies: []
 description: ast node mutation apis
 email: