language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rewrite merge use trees assist to use muatable syntax trees

Browse source 
changelog internal
This commit is contained in:
Aleksey Kladov 2021-03-18 12:57:55 +03:00
parent d834306e7c
commit 9cbf09ec4f
7 changed files with 116 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

46
crates/syntax/src/ast/edit.rs
View file

@ -9,7 +9,7 @@ use std::{
use arrayvec::ArrayVec;
use crate::{
algo::{self, neighbor, SyntaxRewriter},
algo::{self, SyntaxRewriter},
ast::{
self,
make::{self, tokens},
@ -322,27 +322,6 @@ impl ast::Use {
}
self.clone()
}
pub fn remove(&self) -> SyntaxRewriter<'static> {
let mut res = SyntaxRewriter::default();
res.delete(self.syntax());
let next_ws = self
.syntax()
.next_sibling_or_token()
.and_then(|it| it.into_token())
.and_then(ast::Whitespace::cast);
if let Some(next_ws) = next_ws {
let ws_text = next_ws.syntax().text();
if let Some(rest) = ws_text.strip_prefix('\n') {
if rest.is_empty() {
res.delete(next_ws.syntax())
} else {
res.replace(next_ws.syntax(), &make::tokens::whitespace(rest));
}
}
}
res
}
}
impl ast::UseTree {
@ -396,22 +375,6 @@ impl ast::UseTree {
Some(res)
}
}
pub fn remove(&self) -> SyntaxRewriter<'static> {
let mut res = SyntaxRewriter::default();
res.delete(self.syntax());
for &dir in [Direction::Next, Direction::Prev].iter() {
if let Some(nb) = neighbor(self, dir) {
self.syntax()
.siblings_with_tokens(dir)
.skip(1)
.take_while(|it| it.as_node() != Some(nb.syntax()))
.for_each(|el| res.delete(&el));
return res;
}
}
res
}
}
impl ast::MatchArmList {
@ -592,6 +555,13 @@ impl ops::Add<u8> for IndentLevel {
}
impl IndentLevel {
pub fn from_element(element: &SyntaxElement) -> IndentLevel {
match element {
rowan::NodeOrToken::Node(it) => IndentLevel::from_node(it),
rowan::NodeOrToken::Token(it) => IndentLevel::from_token(it),
}
}
pub fn from_node(node: &SyntaxNode) -> IndentLevel {
match node.first_token() {
Some(it) => Self::from_token(&it),