Merge remote-tracking branch 'origin/main' into 44-bug-unsafe-byte-indexing-in-parse_value-can-panic-instead-of-returning-error

# Conflicts:
#	src/document.rs

Author: nathanjmcdougall

src/document.rs

@@ -378,39 +378,52 @@ fn apply_complex_replace(
     let start_byte = feature.location.byte_span.0 - ws_len;
     let end_byte = feature.location.byte_span.1;
 
-    // Find the colon separating key from value
-    let colon_pos = find_key_colon(content_with_ws);
+    // Use query_exact to locate the value's byte span independently.
+    // This avoids string-searching for the colon separator, which breaks
+    // on quoted keys containing colons (e.g. "http://example.com": 8080).
+    let value_feature = doc
+        .query_exact(route)
+        .map_err(|e| format!("Query failed: {e}"))?;
 
-    let key_part = match colon_pos {
-        Some(pos) => {
-            let key = &content_with_ws[..pos + 1]; // through the colon
-            key.to_string()
+    let key_part = match value_feature {
+        Some(vf) => {
+            let vf_start = vf.location.byte_span.0;
+            // Note: no reversed-span check needed; tree-sitter nodes guarantee start <= end.
+            if vf_start > source.len() || !source.is_char_boundary(vf_start) {
+                return Err("Value feature span is not valid in source".to_string());
+            }
+            let prefix = source[start_byte..vf_start].trim_end();
+            if prefix.is_empty() {
+                // Bare value (e.g. sequence item) — no key prefix
+                let serialized = serde_yaml::to_string(value)
+                    .map_err(|e| format!("Failed to serialize YAML: {e}"))?;
+                let trimmed = serialized.trim_end_matches('\n');
+
+                let line_start = source[..feature.location.byte_span.0]
+                    .rfind('\n')
+                    .map(|nl| nl + 1)
+                    .unwrap_or(0);
+                let base_indent = feature.location.byte_span.0 - line_start;
+                let indent_str = " ".repeat(base_indent);
+
+                let indented = indent_block(trimmed, &indent_str);
+
+                let mut result = source.to_string();
+                result.replace_range(
+                    feature.location.byte_span.0..feature.location.byte_span.1,
+                    &indented,
+                );
+                if !result.ends_with('\n') {
+                    result.push('\n');
+                }
+                return yamlpath::Document::new(result)
+                    .map_err(|e| format!("Failed to re-parse YAML: {e}"));
+            }
+            prefix.to_string()
         }
         None => {
-            // No colon found — bare value (e.g. sequence item)
-            let serialized = serde_yaml::to_string(value)
-                .map_err(|e| format!("Failed to serialize YAML: {e}"))?;
-            let trimmed = serialized.trim_end_matches('\n');
-
-            let line_start = source[..feature.location.byte_span.0]
-                .rfind('\n')
-                .map(|nl| nl + 1)
-                .unwrap_or(0);
-            let base_indent = feature.location.byte_span.0 - line_start;
-            let indent_str = " ".repeat(base_indent);
-
-            let indented = indent_block(trimmed, &indent_str);
-
-            let mut result = source.to_string();
-            result.replace_range(
-                feature.location.byte_span.0..feature.location.byte_span.1,
-                &indented,
-            );
-            if !result.ends_with('\n') {
-                result.push('\n');
-            }
-            return yamlpath::Document::new(result)
-                .map_err(|e| format!("Failed to re-parse YAML: {e}"));
+            // Absent value (e.g. `key:\n`) — content is just key+colon
+            content_with_ws.trim_end().to_string()
         }
     };
 
@@ -449,16 +462,6 @@ fn apply_complex_replace(
     yamlpath::Document::new(result).map_err(|e| format!("Failed to re-parse YAML: {e}"))
 }
 
-/// Find the first colon (key-value separator) in a YAML fragment.
-///
-/// Uses a naive `find(':')`, consistent with yamlpatch's own Replace
-/// implementation. This means colons inside quoted keys will be
-/// misidentified — a known yamlpatch limitation that will be fixed
-/// uniformly when yamlpatch addresses it.
-fn find_key_colon(content: &str) -> Option<usize> {
-    content.find(':')
-}
-
 fn indent_block(content: &str, indent: &str) -> String {
     let mut result = String::new();
     for (i, line) in content.lines().enumerate() {

tests/test_document.py

@@ -349,6 +349,18 @@ def test_replace_flow_mapping_with_dict(self):
         doc2 = doc.replace("config", value={"x": 10})
         assert doc2["config"] == {"x": 10}
 
+    def test_replace_quoted_key_with_colon_complex_value(self):
+        """Regression: colon inside quoted key must not corrupt complex replace."""
+        doc = Document('"http://example.com": 8080\n')
+        doc2 = doc.replace("http://example.com", value={"port": 9090})
+        assert doc2["http://example.com"] == {"port": 9090}
+
+    def test_replace_quoted_key_with_multiple_colons_complex_value(self):
+        """Regression: multiple colons inside quoted key must not corrupt complex replace."""
+        doc = Document('"a:b:c": val\n')
+        doc2 = doc.replace("a:b:c", value={"x": 1})
+        assert doc2["a:b:c"] == {"x": 1}
+
     def test_replace_key_with_hash_in_value(self):
         doc = Document("color: '#ff0000'\n")
         doc2 = doc.replace("color", value={"r": 255, "g": 0, "b": 0})