ServerWorld

2 files changed, 9 insertions, 9 deletions

diff --git a/crates/libeditor/src/code_actions.rs b/crates/libeditor/src/code_actions.rs
index 6df64be12..4b2515835 100644
--- a/crates/libeditor/src/code_actions.rs
+++ b/crates/libeditor/src/code_actions.rs
@@ -71,13 +71,11 @@ fn non_trivia_sibling(node: SyntaxNodeRef, direction: Direction) -> Option<Synta
         .find(|node| !node.kind().is_trivia())
 }
 
-fn find_non_trivia_leaf(syntax: SyntaxNodeRef, offset: TextUnit) -> Option<SyntaxNodeRef> {
-    find_leaf_at_offset(syntax, offset)
-        .find(|leaf| !leaf.kind().is_trivia())
-}
-
 pub fn find_node<'a, N: AstNode<&'a SyntaxRoot>>(syntax: SyntaxNodeRef<'a>, offset: TextUnit) -> Option<N> {
-    let leaf = find_non_trivia_leaf(syntax, offset)?;
+    let leaves = find_leaf_at_offset(syntax, offset);
+    let leaf = leaves.clone()
+        .find(|leaf| !leaf.kind().is_trivia())
+        .or_else(|| leaves.right_biased())?;
     ancestors(leaf)
         .filter_map(N::cast)
         .next()
diff --git a/crates/libeditor/tests/test.rs b/crates/libeditor/tests/test.rs
index df4cb65d1..cc4226710 100644
--- a/crates/libeditor/tests/test.rs
+++ b/crates/libeditor/tests/test.rs
@@ -1,11 +1,8 @@
 extern crate libeditor;
 extern crate libsyntax2;
-extern crate itertools;
 #[macro_use]
 extern crate assert_eq_text;
 
-use std::fmt;
-use itertools::Itertools;
 use assert_eq_text::{assert_eq_dbg};
 use libeditor::{
     File, TextUnit, TextRange, ActionResult, CursorPosition,
@@ -119,6 +116,11 @@ fn test_add_derive() {
         |file, off| add_derive(file, off).map(|f| f()),
     );
     check_action(
+        "struct Foo { <|> a: i32, }",
+        "#[derive(<|>)]\nstruct Foo {  a: i32, }",
+        |file, off| add_derive(file, off).map(|f| f()),
+    );
+    check_action(
         "#[derive(Clone)]\nstruct Foo { a: i32<|>, }",
         "#[derive(Clone<|>)]\nstruct Foo { a: i32, }",
         |file, off| add_derive(file, off).map(|f| f()),