From 62be91b82d6368a20a40893b199bc4f7a35a2223 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 21 Jul 2019 13:08:32 +0300 Subject: minor, move type --- crates/ra_syntax/src/algo.rs | 12 ++++++++++-- crates/ra_syntax/src/lib.rs | 5 +++-- crates/ra_syntax/src/syntax_node.rs | 8 -------- 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'crates') diff --git a/crates/ra_syntax/src/algo.rs b/crates/ra_syntax/src/algo.rs index 6bb46b021..ecd42c133 100644 --- a/crates/ra_syntax/src/algo.rs +++ b/crates/ra_syntax/src/algo.rs @@ -5,8 +5,8 @@ use std::ops::RangeInclusive; use itertools::Itertools; use crate::{ - AstNode, Direction, InsertPosition, NodeOrToken, SourceFile, SyntaxElement, SyntaxNode, - SyntaxNodePtr, SyntaxToken, TextRange, TextUnit, + AstNode, Direction, NodeOrToken, SourceFile, SyntaxElement, SyntaxNode, SyntaxNodePtr, + SyntaxToken, TextRange, TextUnit, }; pub use rowan::TokenAtOffset; @@ -61,6 +61,14 @@ pub fn find_covering_element(root: &SyntaxNode, range: TextRange) -> SyntaxEleme root.covering_element(range) } +#[derive(Debug, PartialEq, Eq, Clone, Copy)] +pub enum InsertPosition { + First, + Last, + Before(T), + After(T), +} + /// Adds specified children (tokens or nodes) to the current node at the /// specific position. /// diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs index 21c07d69a..7b778f38c 100644 --- a/crates/ra_syntax/src/lib.rs +++ b/crates/ra_syntax/src/lib.rs @@ -37,13 +37,14 @@ use ra_text_edit::AtomTextEdit; use crate::syntax_node::GreenNode; pub use crate::{ + algo::InsertPosition, ast::{AstNode, AstToken}, parsing::{classify_literal, tokenize, Token}, ptr::{AstPtr, SyntaxNodePtr}, syntax_error::{Location, SyntaxError, SyntaxErrorKind}, syntax_node::{ - Direction, InsertPosition, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken, - SyntaxTreeBuilder, WalkEvent, + Direction, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken, SyntaxTreeBuilder, + WalkEvent, }, }; pub use ra_parser::SyntaxKind; diff --git a/crates/ra_syntax/src/syntax_node.rs b/crates/ra_syntax/src/syntax_node.rs index 689dbefde..95795a27a 100644 --- a/crates/ra_syntax/src/syntax_node.rs +++ b/crates/ra_syntax/src/syntax_node.rs @@ -17,14 +17,6 @@ use crate::{ pub use rowan::WalkEvent; pub(crate) use rowan::{GreenNode, GreenToken}; -#[derive(Debug, PartialEq, Eq, Clone, Copy)] -pub enum InsertPosition { - First, - Last, - Before(T), - After(T), -} - #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] pub enum RustLanguage {} impl Language for RustLanguage { -- cgit v1.2.3