bash-merge 2.0.6 → 7.1.3

data/lib/bash/merge/freeze_node.rb

@@ -75,11 +75,11 @@ module Bash
       # String representation for debugging
       # @return [String]
       def inspect
-        # :nocov:
+        # simplecov:disable
         # Defensive: slice is always set via resolve_content in FreezeNodeBase#initialize
         # The || 0 branch is normally unreachable because validate_structure! ensures non-empty content
         content_length = slice&.length || 0
-        # :nocov:
+        # simplecov:enable
         "#<#{self.class.name} lines=#{start_line}..#{end_line} content_length=#{content_length}>"
       end
 
@@ -88,13 +88,13 @@ module Bash
       def validate_structure!
         validate_line_order!
 
-        if @lines.empty? || @lines.all?(&:nil?)
-          raise InvalidStructureError.new(
-            "Freeze block is empty",
-            start_line: @start_line,
-            end_line: @end_line,
-          )
-        end
+        return unless @lines.empty? || @lines.all?(&:nil?)
+
+        raise InvalidStructureError.new(
+          'Freeze block is empty',
+          start_line: @start_line,
+          end_line: @end_line
+        )
       end
     end
   end

data/lib/bash/merge/merge_result.rb

@@ -12,6 +12,8 @@ module Bash
     #   result.add_line("echo 'hello'", decision: :kept_template, source: :template)
     #   result.to_bash # => "echo 'hello'\n"
     class MergeResult < Ast::Merge::MergeResultBase
+      include Ast::Merge::StructuredReviewApplySupport
+
       # Inherit decision constants from base class
       DECISION_KEPT_TEMPLATE = Ast::Merge::MergeResultBase::DECISION_KEPT_TEMPLATE
       DECISION_KEPT_DEST = Ast::Merge::MergeResultBase::DECISION_KEPT_DEST
@@ -31,7 +33,7 @@ module Bash
           dest_lines: 0,
           merged_lines: 0,
           freeze_preserved_lines: 0,
-          total_decisions: 0,
+          total_decisions: 0
         }
       end
 
@@ -46,7 +48,7 @@ module Bash
           content: line,
           decision: decision,
           source: source,
-          original_line: original_line,
+          original_line: original_line
         }
 
         track_statistics(decision, source)
@@ -71,7 +73,7 @@ module Bash
       # @param decision [Symbol] Decision for the blank line
       # @param source [Symbol] Source
       def add_blank_line(decision: DECISION_MERGED, source: :merged)
-        add_line("", decision: decision, source: source)
+        add_line('', decision: decision, source: source)
       end
 
       # Add content from a freeze block
@@ -83,7 +85,7 @@ module Bash
             line.chomp,
             decision: DECISION_FREEZE_BLOCK,
             source: :destination,
-            original_line: freeze_node.start_line + idx,
+            original_line: freeze_node.start_line + idx
           )
         end
       end
@@ -121,9 +123,13 @@ module Bash
         to_bash
       end
 
+      def to_s
+        to_bash
+      end
+
       private
 
-      def track_statistics(decision, source)
+      def track_statistics(decision, _source)
         @statistics[:total_decisions] += 1
 
         case decision

data/lib/bash/merge/node_wrapper.rb

@@ -19,22 +19,24 @@ module Bash
     #
     # @see Ast::Merge::NodeWrapperBase
     class NodeWrapper < Ast::Merge::NodeWrapperBase
+      attr_reader :node
+
       # Check if this is a function definition
       # @return [Boolean]
       def function_definition?
-        @node.type.to_s == "function_definition"
+        @node.type.to_s == 'function_definition'
       end
 
       # Check if this is a variable assignment
       # @return [Boolean]
       def variable_assignment?
-        @node.type.to_s == "variable_assignment"
+        @node.type.to_s == 'variable_assignment'
       end
 
       # Check if this is an if statement
       # @return [Boolean]
       def if_statement?
-        @node.type.to_s == "if_statement"
+        @node.type.to_s == 'if_statement'
       end
 
       # Check if this is a for loop
@@ -46,31 +48,31 @@ module Bash
       # Check if this is a while loop
       # @return [Boolean]
       def while_statement?
-        @node.type.to_s == "while_statement"
+        @node.type.to_s == 'while_statement'
       end
 
       # Check if this is a case statement
       # @return [Boolean]
       def case_statement?
-        @node.type.to_s == "case_statement"
+        @node.type.to_s == 'case_statement'
       end
 
       # Check if this is a command
       # @return [Boolean]
       def command?
-        @node.type.to_s == "command"
+        @node.type.to_s == 'command'
       end
 
       # Check if this is a pipeline
       # @return [Boolean]
       def pipeline?
-        @node.type.to_s == "pipeline"
+        @node.type.to_s == 'pipeline'
       end
 
       # Check if this is a comment
       # @return [Boolean]
       def comment?
-        @node.type.to_s == "comment"
+        @node.type.to_s == 'comment'
       end
 
       # Get the function name if this is a function definition
@@ -79,7 +81,7 @@ module Bash
         return unless function_definition?
 
         # In bash tree-sitter, function name is in a 'name' or 'word' child
-        name_node = find_child_by_type("word") || find_child_by_field("name")
+        name_node = find_child_by_type('word') || find_child_by_field('name')
         node_text(name_node) if name_node
       end
 
@@ -89,7 +91,7 @@ module Bash
         return unless variable_assignment?
 
         # In bash tree-sitter, variable name is a child of type 'variable_name'
-        name_node = find_child_by_type("variable_name")
+        name_node = find_child_by_type('variable_name')
         node_text(name_node) if name_node
       end
 
@@ -107,6 +109,18 @@ module Bash
         nil
       end
 
+      def start_byte = node.start_byte
+      def end_byte = node.end_byte
+      def source_text = @source.byteslice(start_byte...end_byte).to_s
+
+      def semantic_tree
+        semantic_node(node)
+      end
+
+      def heredoc?
+        descendant_type?(node, %w[heredoc_redirect heredoc_body])
+      end
+
       # Find a child by field name
       # @param field_name [String] Field name to look for
       # @return [TreeSitter::Node, nil]
@@ -139,44 +153,49 @@ module Bash
         node_type = node.type.to_s
 
         case node_type
-        when "program"
+        when 'program'
           # Root node - signature based on direct children structure
           child_types = []
-          node.each { |child| child_types << child.type.to_s unless child.type.to_s == "comment" }
+          node.each { |child| child_types << child.type.to_s unless child.type.to_s == 'comment' }
           [:program, child_types.length]
-        when "function_definition"
+        when 'function_definition'
           # Functions are identified by their name
           name = function_name
           [:function_definition, name]
-        when "variable_assignment"
+        when 'variable_assignment'
           # Variable assignments are identified by variable name
           name = variable_name
           [:variable_assignment, name]
-        when "command"
-          # Commands identified by their command name
+        when 'command'
+          # Commands identified by their command name and arguments.
+          # Arguments are included so that `PATH_add exe` and `PATH_add bin`
+          # get distinct signatures, while `echo "hello"` repeated twice gets
+          # the same signature — the resolver handles positional matching for
+          # nodes with identical signatures.
           name = command_name
-          [:command, name, extract_command_signature_context(node)]
-        when "if_statement"
+          args = extract_command_arguments(node)
+          [:command, name, args, extract_command_signature_context(node)]
+        when 'if_statement'
           # If statements identified by their condition pattern
           condition = extract_condition_pattern(node)
           [:if_statement, condition]
-        when "for_statement", "c_style_for_statement"
+        when 'for_statement', 'c_style_for_statement'
           # For loops identified by their loop variable
           var = extract_loop_variable(node)
           [:for_statement, var]
-        when "while_statement"
+        when 'while_statement'
           # While loops identified by condition
           condition = extract_condition_pattern(node)
           [:while_statement, condition]
-        when "case_statement"
+        when 'case_statement'
           # Case statements identified by the expression being matched
           expr = extract_case_expression(node)
           [:case_statement, expr]
-        when "pipeline"
+        when 'pipeline'
           # Pipelines identified by command names in order
           commands = extract_pipeline_commands(node)
           [:pipeline, commands]
-        when "comment"
+        when 'comment'
           # Comments identified by their content
           [:comment, node_text(node).strip]
         else
@@ -188,38 +207,72 @@ module Bash
 
       private
 
+      def semantic_node(value)
+        children = value.children
+        return [value.type.to_s, @source.byteslice(value.start_byte...value.end_byte).to_s] if children.empty?
+
+        [value.type.to_s, children.select(&:named?).map { |child| semantic_node(child) }]
+      end
+
+      def descendant_type?(value, types)
+        return true if types.include?(value.type.to_s)
+
+        value.children.any? { |child| descendant_type?(child, types) }
+      end
+
       def extract_command_signature_context(node)
         # Extract additional context like redirections
         redirections = []
         node.each do |child|
-          if child.type.to_s.include?("redirect")
-            redirections << child.type.to_s
-          end
+          redirections << child.type.to_s if child.type.to_s.include?('redirect')
         end
         redirections.empty? ? nil : redirections.sort
       end
 
+      # Extract argument words from a command node.
+      # Returns the argument text values (everything after the command name).
+      #
+      # @param node [Object] A tree-sitter command node
+      # @return [Array<String>, nil] Argument values, or nil if none
+      def extract_command_arguments(node)
+        args = []
+        found_command_name = false
+        node.each do |child|
+          type_s = child.type.to_s
+          # Skip comments and redirections
+          next if %w[comment file_redirect heredoc_redirect].include?(type_s)
+
+          if !found_command_name && %w[word command_name].include?(type_s)
+            # First word/command_name is the command itself, skip it
+            found_command_name = true
+            next
+          end
+
+          # Everything after the command name is an argument
+          args << node_text(child) if found_command_name
+        end
+        args.empty? ? nil : args
+      end
+
       def extract_condition_pattern(node)
         # Try to extract the test/condition from if/while statements
         # Look for test_command, compound_statement, etc.
         node.each do |child|
-          if %w[test_command bracket_command].include?(child.type.to_s)
-            return node_text(child).slice(0, 100).strip
-          end
+          return node_text(child).slice(0, 100).strip if %w[test_command bracket_command].include?(child.type.to_s)
         end
         nil
       end
 
       def extract_loop_variable(node)
         # Extract the loop variable from for statements
-        var_node = node.each.find { |child| child.type.to_s == "variable_name" }
+        var_node = node.each.find { |child| child.type.to_s == 'variable_name' }
         node_text(var_node) if var_node
       end
 
       def extract_case_expression(node)
         # Extract the expression being matched in a case statement
         node.each do |child|
-          return node_text(child).slice(0, 50).strip if child.type.to_s == "word" || child.type.to_s == "variable_name"
+          return node_text(child).slice(0, 50).strip if %w[word variable_name].include?(child.type.to_s)
         end
         nil
       end
@@ -228,11 +281,11 @@ module Bash
         # Extract command names from a pipeline
         commands = []
         node.each do |child|
-          if child.type.to_s == "command"
-            wrapper = NodeWrapper.new(child, lines: @lines, source: @source)
-            cmd_name = wrapper.command_name
-            commands << cmd_name if cmd_name
-          end
+          next unless child.type.to_s == 'command'
+
+          wrapper = NodeWrapper.new(child, lines: @lines, source: @source)
+          cmd_name = wrapper.command_name
+          commands << cmd_name if cmd_name
         end
         commands
       end