diff options
Diffstat (limited to 'crates/ra_ide_api_light')
-rw-r--r-- | crates/ra_ide_api_light/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ra_ide_api_light/src/formatting.rs | 74 | ||||
-rw-r--r-- | crates/ra_ide_api_light/src/join_lines.rs | 5 | ||||
-rw-r--r-- | crates/ra_ide_api_light/src/lib.rs | 1 | ||||
-rw-r--r-- | crates/ra_ide_api_light/src/typing.rs | 4 |
5 files changed, 6 insertions, 79 deletions
diff --git a/crates/ra_ide_api_light/Cargo.toml b/crates/ra_ide_api_light/Cargo.toml index c1e4314ce..86311e677 100644 --- a/crates/ra_ide_api_light/Cargo.toml +++ b/crates/ra_ide_api_light/Cargo.toml | |||
@@ -13,6 +13,7 @@ rustc-hash = "1.0" | |||
13 | 13 | ||
14 | ra_syntax = { path = "../ra_syntax" } | 14 | ra_syntax = { path = "../ra_syntax" } |
15 | ra_text_edit = { path = "../ra_text_edit" } | 15 | ra_text_edit = { path = "../ra_text_edit" } |
16 | ra_fmt = { path = "../ra_fmt" } | ||
16 | 17 | ||
17 | [dev-dependencies] | 18 | [dev-dependencies] |
18 | test_utils = { path = "../test_utils" } | 19 | test_utils = { path = "../test_utils" } |
diff --git a/crates/ra_ide_api_light/src/formatting.rs b/crates/ra_ide_api_light/src/formatting.rs deleted file mode 100644 index 8bc03f974..000000000 --- a/crates/ra_ide_api_light/src/formatting.rs +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | use itertools::Itertools; | ||
2 | use ra_syntax::{ | ||
3 | AstNode, | ||
4 | SyntaxNode, SyntaxKind::*, | ||
5 | ast::{self, AstToken}, | ||
6 | algo::generate, | ||
7 | }; | ||
8 | |||
9 | pub fn reindent(text: &str, indent: &str) -> String { | ||
10 | let indent = format!("\n{}", indent); | ||
11 | text.lines().intersperse(&indent).collect() | ||
12 | } | ||
13 | |||
14 | /// If the node is on the beginning of the line, calculate indent. | ||
15 | pub fn leading_indent(node: &SyntaxNode) -> Option<&str> { | ||
16 | for leaf in prev_leaves(node) { | ||
17 | if let Some(ws) = ast::Whitespace::cast(leaf) { | ||
18 | let ws_text = ws.text(); | ||
19 | if let Some(pos) = ws_text.rfind('\n') { | ||
20 | return Some(&ws_text[pos + 1..]); | ||
21 | } | ||
22 | } | ||
23 | if leaf.leaf_text().unwrap().contains('\n') { | ||
24 | break; | ||
25 | } | ||
26 | } | ||
27 | None | ||
28 | } | ||
29 | |||
30 | fn prev_leaves(node: &SyntaxNode) -> impl Iterator<Item = &SyntaxNode> { | ||
31 | generate(prev_leaf(node), |&node| prev_leaf(node)) | ||
32 | } | ||
33 | |||
34 | fn prev_leaf(node: &SyntaxNode) -> Option<&SyntaxNode> { | ||
35 | generate(node.ancestors().find_map(SyntaxNode::prev_sibling), |it| it.last_child()).last() | ||
36 | } | ||
37 | |||
38 | pub fn extract_trivial_expression(block: &ast::Block) -> Option<&ast::Expr> { | ||
39 | let expr = block.expr()?; | ||
40 | if expr.syntax().text().contains('\n') { | ||
41 | return None; | ||
42 | } | ||
43 | let non_trivial_children = block.syntax().children().filter(|it| match it.kind() { | ||
44 | WHITESPACE | L_CURLY | R_CURLY => false, | ||
45 | _ => it != &expr.syntax(), | ||
46 | }); | ||
47 | if non_trivial_children.count() > 0 { | ||
48 | return None; | ||
49 | } | ||
50 | Some(expr) | ||
51 | } | ||
52 | |||
53 | pub(crate) fn compute_ws(left: &SyntaxNode, right: &SyntaxNode) -> &'static str { | ||
54 | match left.kind() { | ||
55 | L_PAREN | L_BRACK => return "", | ||
56 | L_CURLY => { | ||
57 | if let USE_TREE = right.kind() { | ||
58 | return ""; | ||
59 | } | ||
60 | } | ||
61 | _ => (), | ||
62 | } | ||
63 | match right.kind() { | ||
64 | R_PAREN | R_BRACK => return "", | ||
65 | R_CURLY => { | ||
66 | if let USE_TREE = left.kind() { | ||
67 | return ""; | ||
68 | } | ||
69 | } | ||
70 | DOT => return "", | ||
71 | _ => (), | ||
72 | } | ||
73 | " " | ||
74 | } | ||
diff --git a/crates/ra_ide_api_light/src/join_lines.rs b/crates/ra_ide_api_light/src/join_lines.rs index 03770c52e..970afd327 100644 --- a/crates/ra_ide_api_light/src/join_lines.rs +++ b/crates/ra_ide_api_light/src/join_lines.rs | |||
@@ -5,10 +5,11 @@ use ra_syntax::{ | |||
5 | algo::find_covering_node, | 5 | algo::find_covering_node, |
6 | ast, | 6 | ast, |
7 | }; | 7 | }; |
8 | 8 | use ra_fmt::{ | |
9 | compute_ws, extract_trivial_expression | ||
10 | }; | ||
9 | use crate::{ | 11 | use crate::{ |
10 | LocalEdit, TextEditBuilder, | 12 | LocalEdit, TextEditBuilder, |
11 | formatting::{compute_ws, extract_trivial_expression}, | ||
12 | }; | 13 | }; |
13 | 14 | ||
14 | pub fn join_lines(file: &SourceFile, range: TextRange) -> LocalEdit { | 15 | pub fn join_lines(file: &SourceFile, range: TextRange) -> LocalEdit { |
diff --git a/crates/ra_ide_api_light/src/lib.rs b/crates/ra_ide_api_light/src/lib.rs index f3078f51e..6d1ce8dbf 100644 --- a/crates/ra_ide_api_light/src/lib.rs +++ b/crates/ra_ide_api_light/src/lib.rs | |||
@@ -3,7 +3,6 @@ | |||
3 | //! This usually means functions which take syntax tree as an input and produce | 3 | //! This usually means functions which take syntax tree as an input and produce |
4 | //! an edit or some auxiliary info. | 4 | //! an edit or some auxiliary info. |
5 | 5 | ||
6 | pub mod formatting; | ||
7 | mod extend_selection; | 6 | mod extend_selection; |
8 | mod folding_ranges; | 7 | mod folding_ranges; |
9 | mod line_index; | 8 | mod line_index; |
diff --git a/crates/ra_ide_api_light/src/typing.rs b/crates/ra_ide_api_light/src/typing.rs index a08a5a8c5..9dd9f1c1d 100644 --- a/crates/ra_ide_api_light/src/typing.rs +++ b/crates/ra_ide_api_light/src/typing.rs | |||
@@ -4,8 +4,8 @@ use ra_syntax::{ | |||
4 | algo::{find_node_at_offset, find_leaf_at_offset, LeafAtOffset}, | 4 | algo::{find_node_at_offset, find_leaf_at_offset, LeafAtOffset}, |
5 | ast::{self, AstToken}, | 5 | ast::{self, AstToken}, |
6 | }; | 6 | }; |
7 | 7 | use ra_fmt::leading_indent; | |
8 | use crate::{LocalEdit, TextEditBuilder, formatting::leading_indent}; | 8 | use crate::{LocalEdit, TextEditBuilder}; |
9 | 9 | ||
10 | pub fn on_enter(file: &SourceFile, offset: TextUnit) -> Option<LocalEdit> { | 10 | pub fn on_enter(file: &SourceFile, offset: TextUnit) -> Option<LocalEdit> { |
11 | let comment = | 11 | let comment = |