From 7094291573dc819e3115950ec3b2316bd5e9ea33 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 16 Aug 2018 12:51:40 +0300
Subject: tt-attrs

---
 crates/libeditor/src/code_actions.rs |  2 +-
 crates/libeditor/src/lib.rs          | 15 +++++++--------
 crates/libeditor/src/symbols.rs      |  6 ++----
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'crates/libeditor/src')

diff --git a/crates/libeditor/src/code_actions.rs b/crates/libeditor/src/code_actions.rs
index 88c348436..4987964d2 100644
--- a/crates/libeditor/src/code_actions.rs
+++ b/crates/libeditor/src/code_actions.rs
@@ -66,7 +66,7 @@ fn find_non_trivia_leaf(syntax: SyntaxNodeRef, offset: TextUnit) -> Option<Synta
         .find(|leaf| !leaf.kind().is_trivia())
 }
 
-fn find_node<'a, N: AstNode<&'a SyntaxRoot>>(syntax: SyntaxNodeRef<'a>, offset: TextUnit) -> Option<N> {
+pub fn find_node<'a, N: AstNode<&'a SyntaxRoot>>(syntax: SyntaxNodeRef<'a>, offset: TextUnit) -> Option<N> {
     let leaf = find_non_trivia_leaf(syntax, offset)?;
     ancestors(leaf)
         .filter_map(N::cast)
diff --git a/crates/libeditor/src/lib.rs b/crates/libeditor/src/lib.rs
index 28da457d1..76cb4d028 100644
--- a/crates/libeditor/src/lib.rs
+++ b/crates/libeditor/src/lib.rs
@@ -21,7 +21,10 @@ pub use self::{
     extend_selection::extend_selection,
     symbols::{StructureNode, file_structure, FileSymbol, file_symbols},
     edit::{EditBuilder, Edit, AtomEdit},
-    code_actions::{flip_comma, add_derive, ActionResult, CursorPosition},
+    code_actions::{
+        ActionResult, CursorPosition, find_node,
+        flip_comma, add_derive,
+    },
 };
 
 #[derive(Debug)]
@@ -59,9 +62,7 @@ pub fn matching_brace(file: &ast::File, offset: TextUnit) -> Option<TextUnit> {
         L_PAREN, R_PAREN,
         L_ANGLE, R_ANGLE,
     ];
-    let syntax = file.syntax();
-    let syntax = syntax.as_ref();
-    let (brace_node, brace_idx) = find_leaf_at_offset(syntax, offset)
+    let (brace_node, brace_idx) = find_leaf_at_offset(file.syntax_ref(), offset)
         .filter_map(|node| {
             let idx = BRACES.iter().position(|&brace| brace == node.kind())?;
             Some((node, idx))
@@ -75,9 +76,8 @@ pub fn matching_brace(file: &ast::File, offset: TextUnit) -> Option<TextUnit> {
 }
 
 pub fn highlight(file: &ast::File) -> Vec<HighlightedRange> {
-    let syntax = file.syntax();
     let mut res = Vec::new();
-    for node in walk::preorder(syntax.as_ref()) {
+    for node in walk::preorder(file.syntax_ref()) {
         let tag = match node.kind() {
             ERROR => "error",
             COMMENT | DOC_COMMENT => "comment",
@@ -99,10 +99,9 @@ pub fn highlight(file: &ast::File) -> Vec<HighlightedRange> {
 }
 
 pub fn diagnostics(file: &ast::File) -> Vec<Diagnostic> {
-    let syntax = file.syntax();
     let mut res = Vec::new();
 
-    for node in walk::preorder(syntax.as_ref()) {
+    for node in walk::preorder(file.syntax_ref()) {
         if node.kind() == ERROR {
             res.push(Diagnostic {
                 range: node.range(),
diff --git a/crates/libeditor/src/symbols.rs b/crates/libeditor/src/symbols.rs
index 6f8853770..2585d9579 100644
--- a/crates/libeditor/src/symbols.rs
+++ b/crates/libeditor/src/symbols.rs
@@ -26,8 +26,7 @@ pub struct FileSymbol {
 }
 
 pub fn file_symbols(file: &ast::File) -> Vec<FileSymbol> {
-    let syntax = file.syntax();
-    preorder(syntax.as_ref())
+    preorder(file.syntax_ref())
         .filter_map(to_symbol)
         .collect()
 }
@@ -57,9 +56,8 @@ fn to_symbol(node: SyntaxNodeRef) -> Option<FileSymbol> {
 pub fn file_structure(file: &ast::File) -> Vec<StructureNode> {
     let mut res = Vec::new();
     let mut stack = Vec::new();
-    let syntax = file.syntax();
 
-    for event in walk(syntax.as_ref()) {
+    for event in walk(file.syntax_ref()) {
         match event {
             WalkEvent::Enter(node) => {
                 match structure_node(node) {
-- 
cgit v1.2.3