yerba 0.7.2-arm-linux-gnu → 0.7.3-arm-linux-gnu

data/rust/src/syntax.rs

@@ -1,7 +1,7 @@
 use rowan::ast::AstNode;
 use rowan::{TextRange, TextSize};
 
-use yaml_parser::ast::{BlockMap, BlockMapEntry};
+use yaml_parser::ast::{BlockMap, BlockMapEntry, BlockSeq};
 use yaml_parser::{SyntaxKind, SyntaxNode, SyntaxToken};
 
 #[derive(Debug, Clone, PartialEq)]
@@ -31,25 +31,27 @@ pub fn detect_yaml_type(scalar: &ScalarValue) -> YerbaValueType {
   detect_yaml_type_from_plain(&scalar.text)
 }
 
-pub fn extract_scalar(node: &SyntaxNode) -> Option<ScalarValue> {
-  if let Some(token) = find_scalar_token(node) {
-    let text = match token.kind() {
-      SyntaxKind::PLAIN_SCALAR => token.text().to_string(),
+pub fn raw_scalar_value(token: &SyntaxToken) -> Option<String> {
+  match token.kind() {
+    SyntaxKind::PLAIN_SCALAR => Some(token.text().to_string()),
 
-      SyntaxKind::DOUBLE_QUOTED_SCALAR => {
-        let raw = token.text();
-        unescape_double_quoted(&raw[1..raw.len() - 1])
-      }
+    SyntaxKind::DOUBLE_QUOTED_SCALAR => {
+      let text = token.text();
+      Some(unescape_double_quoted(&text[1..text.len() - 1]))
+    }
 
-      SyntaxKind::SINGLE_QUOTED_SCALAR => {
-        let raw = token.text();
-        unescape_single_quoted(&raw[1..raw.len() - 1])
-      }
+    SyntaxKind::SINGLE_QUOTED_SCALAR => {
+      let text = token.text();
+      Some(unescape_single_quoted(&text[1..text.len() - 1]))
+    }
 
-      _ => return None,
-    };
+    _ => None,
+  }
+}
 
-    return Some(ScalarValue {
+pub fn extract_scalar(node: &SyntaxNode) -> Option<ScalarValue> {
+  if let Some(token) = find_scalar_token(node) {
+    return raw_scalar_value(&token).map(|text| ScalarValue {
       text,
       kind: token.kind(),
       file_path: None,
@@ -72,6 +74,35 @@ pub fn extract_scalar(node: &SyntaxNode) -> Option<ScalarValue> {
   })
 }
 
+pub fn find_block_map(node: &SyntaxNode) -> Option<BlockMap> {
+  node.descendants().find_map(BlockMap::cast)
+}
+
+pub fn find_block_sequence(node: &SyntaxNode) -> Option<BlockSeq> {
+  node.descendants().find_map(BlockSeq::cast)
+}
+
+pub enum FirstCollection {
+  Map(BlockMap),
+  Sequence(BlockSeq),
+}
+
+pub fn first_collection(node: &SyntaxNode) -> Option<FirstCollection> {
+  match (find_block_map(node), find_block_sequence(node)) {
+    (Some(map), Some(sequence)) => {
+      if sequence.syntax().text_range().start() <= map.syntax().text_range().start() {
+        Some(FirstCollection::Sequence(sequence))
+      } else {
+        Some(FirstCollection::Map(map))
+      }
+    }
+
+    (Some(map), None) => Some(FirstCollection::Map(map)),
+    (None, Some(sequence)) => Some(FirstCollection::Sequence(sequence)),
+    (None, None) => None,
+  }
+}
+
 pub fn is_map_key(token: &SyntaxToken) -> bool {
   token.parent_ancestors().any(|ancestor| ancestor.kind() == SyntaxKind::BLOCK_MAP_KEY)
 }
@@ -120,34 +151,7 @@ pub fn quote_if_needed(value: &str) -> String {
 }
 
 pub fn extract_scalar_text(node: &SyntaxNode) -> Option<String> {
-  if let Some(token) = find_scalar_token(node) {
-    return match token.kind() {
-      SyntaxKind::PLAIN_SCALAR => Some(token.text().to_string()),
-
-      SyntaxKind::DOUBLE_QUOTED_SCALAR => {
-        let text = token.text();
-        let inner = &text[1..text.len() - 1];
-
-        Some(unescape_double_quoted(inner))
-      }
-
-      SyntaxKind::SINGLE_QUOTED_SCALAR => {
-        let text = token.text();
-        let inner = &text[1..text.len() - 1];
-
-        Some(unescape_single_quoted(inner))
-      }
-
-      _ => None,
-    };
-  }
-
-  let block_scalar_text = node
-    .descendants_with_tokens()
-    .filter_map(|element| element.into_token())
-    .find(|token| token.kind() == SyntaxKind::BLOCK_SCALAR_TEXT)?;
-
-  Some(dedent_block_scalar(block_scalar_text.text()))
+  extract_scalar(node).map(|scalar| scalar.text)
 }
 
 pub fn dedent_block_scalar(text: &str) -> String {
@@ -207,6 +211,18 @@ pub fn unescape_single_quoted(text: &str) -> String {
   text.replace("''", "'")
 }
 
+pub fn line_at(source: &str, offset: usize) -> usize {
+  source[..offset].matches('\n').count() + 1
+}
+
+pub fn line_start_at(source: &str, offset: usize) -> usize {
+  source[..offset].rfind('\n').map(|position| position + 1).unwrap_or(0)
+}
+
+pub fn column_at(source: &str, offset: usize) -> usize {
+  offset - line_start_at(source, offset)
+}
+
 pub fn preceding_whitespace_indent(node: &SyntaxNode) -> String {
   if let Some(token) = preceding_whitespace_token(node) {
     let text = token.text();
@@ -221,10 +237,10 @@ pub fn preceding_whitespace_indent(node: &SyntaxNode) -> String {
   let source = root.text().to_string();
 
   if start_offset > 0 {
-    let before = &source[..start_offset];
+    let line_start = line_start_at(&source, start_offset);
 
-    if let Some(newline_position) = before.rfind('\n') {
-      return before[newline_position + 1..].to_string();
+    if line_start > 0 {
+      return source[line_start..start_offset].to_string();
     }
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yerba
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: arm-linux-gnu
 authors:
 - Marco Roth
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2026-06-22 00:00:00.000000000 Z
+date: 2026-07-02 00:00:00.000000000 Z
 dependencies: []
 description: A CLI tool for editing YAML while preserving structure, comments, and
   format.