mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-11 12:56:19 +00:00
fix: Don't produce ChangedAncestor
for SyntaxToken
s
This commit is contained in:
parent
ff1124918e
commit
5eb8affdc5
2 changed files with 52 additions and 10 deletions
|
@ -327,7 +327,7 @@ mod tests {
|
|||
|
||||
use crate::{
|
||||
ast::{self, make, syntax_factory::SyntaxFactory},
|
||||
AstNode,
|
||||
AstNode, SyntaxKind,
|
||||
};
|
||||
|
||||
use super::*;
|
||||
|
@ -540,4 +540,50 @@ mod tests {
|
|||
}"#]];
|
||||
expect.assert_eq(&edit.new_root.to_string());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_replace_token_in_parent() {
|
||||
let parent_fn = make::fn_(
|
||||
None,
|
||||
make::name("it"),
|
||||
None,
|
||||
None,
|
||||
make::param_list(None, []),
|
||||
make::block_expr([], Some(make::expr_unit())),
|
||||
Some(make::ret_type(make::ty_unit())),
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
);
|
||||
|
||||
let mut editor = SyntaxEditor::new(parent_fn.syntax().clone());
|
||||
|
||||
if let Some(ret_ty) = parent_fn.ret_type() {
|
||||
editor.delete(ret_ty.syntax().clone());
|
||||
|
||||
if let Some(SyntaxElement::Token(token)) = ret_ty.syntax().next_sibling_or_token() {
|
||||
if token.kind().is_trivia() {
|
||||
editor.delete(token);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(tail) = parent_fn.body().unwrap().tail_expr() {
|
||||
// FIXME: We do this because `xtask tidy` will not allow us to have trailing whitespace in the expect string.
|
||||
if let Some(SyntaxElement::Token(token)) = tail.syntax().prev_sibling_or_token() {
|
||||
if let SyntaxKind::WHITESPACE = token.kind() {
|
||||
editor.delete(token);
|
||||
}
|
||||
}
|
||||
editor.delete(tail.syntax().clone());
|
||||
}
|
||||
|
||||
let edit = editor.finish();
|
||||
|
||||
let expect = expect![[r#"
|
||||
fn it() {
|
||||
}"#]];
|
||||
expect.assert_eq(&edit.new_root.to_string());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue