Flatten argument iterators at call site

Author: lionel-

crates/ark/src/lsp/diagnostics.rs

@@ -824,7 +824,7 @@ fn recurse_call(
 fn handle_package_attach_call(node: Node, context: &mut DiagnosticContext) -> anyhow::Result<()> {
     // Find the first argument (package name). Positionally for now, no attempt
     // at argument matching whatsoever.
-    let Some(package_node) = node.arguments_values().nth(0) else {
+    let Some(package_node) = node.arguments_values().flatten().nth(0) else {
         return Err(anyhow::anyhow!("Can't unpack attached package argument"));
     };
 
@@ -833,6 +833,7 @@ fn handle_package_attach_call(node: Node, context: &mut DiagnosticContext) -> an
     // infrastructure.
     if let Some(_) = node
         .arguments_names_as_string(context.contents)
+        .flatten()
         .find(|n| n == "character.only")
     {
         return Ok(());

crates/ark/src/lsp/traits/node.rs

@@ -94,9 +94,12 @@ pub trait NodeExt: Sized {
     fn children_of(node: Self) -> impl Iterator<Item = Self>;
     fn next_siblings(&self) -> impl Iterator<Item = Self>;
     fn arguments(&self) -> impl Iterator<Item = (Option<Self>, Option<Self>)>;
-    fn arguments_values(&self) -> impl Iterator<Item = Self>;
-    fn arguments_names(&self) -> impl Iterator<Item = Self>;
-    fn arguments_names_as_string(&self, contents: &ropey::Rope) -> impl Iterator<Item = String>;
+    fn arguments_values(&self) -> impl Iterator<Item = Option<Self>>;
+    fn arguments_names(&self) -> impl Iterator<Item = Option<Self>>;
+    fn arguments_names_as_string(
+        &self,
+        contents: &ropey::Rope,
+    ) -> impl Iterator<Item = Option<String>>;
 }
 
 impl<'tree> NodeExt for Node<'tree> {
@@ -277,24 +280,27 @@ impl<'tree> NodeExt for Node<'tree> {
             })
     }
 
-    fn arguments_names(&self) -> impl Iterator<Item = Node<'tree>> {
-        self.arguments().filter_map(|(name, _value)| name)
+    fn arguments_names(&self) -> impl Iterator<Item = Option<Node<'tree>>> {
+        self.arguments().map(|(name, _value)| name)
     }
 
-    fn arguments_names_as_string(&self, contents: &ropey::Rope) -> impl Iterator<Item = String> {
-        self.arguments_names().filter_map(|node| -> Option<String> {
-            match contents.node_slice(&node) {
+    fn arguments_names_as_string(
+        &self,
+        contents: &ropey::Rope,
+    ) -> impl Iterator<Item = Option<String>> {
+        self.arguments_names().map(|maybe_node| {
+            maybe_node.and_then(|node| match contents.node_slice(&node) {
                 Err(err) => {
                     tracing::error!("Can't convert argument name to text: {err:?}");
                     None
                 },
                 Ok(text) => Some(text.to_string()),
-            }
+            })
         })
     }
 
-    fn arguments_values(&self) -> impl Iterator<Item = Node<'tree>> {
-        self.arguments().filter_map(|(_name, value)| value)
+    fn arguments_values(&self) -> impl Iterator<Item = Option<Node<'tree>>> {
+        self.arguments().map(|(_name, value)| value)
     }
 }