Merge pull request #22 from vbauerster/cosmetic-patch

refactor traverse_up_to_node_which_matters
ul · Jan 24, 2021 · 863924d · 863924d
2 parents 8c0b6b4 + b9dcc88
commit 863924d
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -193,15 +193,11 @@ fn traverse_up_to_node_which_matters<'a>(
     filetype_config: &FiletypeConfig,
     current_node: Node<'a>,
 ) -> Node<'a> {
-    let mut node = current_node;
-    while let Some(parent) = if node.is_named() && filetype_config.is_node_visible(node) {
-        None
-    } else {
-        node.parent()
-    } {
-        node = parent;
+    let mut opt_node = Some(current_node);
+    while let Some(node) = opt_node.filter(|&n| !(n.is_named() && filetype_config.is_node_visible(n))) {
+        opt_node = node.parent();
     }
-    node
+    opt_node.unwrap_or(current_node)
 }
 
 fn find_parent_of_interest<'a>(