language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove SyntaxRewriter usage in insert_use in favor of ted

Browse source
This commit is contained in:
Lukas Wirth 2021-04-20 02:05:22 +02:00
parent e8744ed9bb
commit fa20a5064b
8 changed files with 185 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ide_db/src/helpers/insert_use/tests.rs
View file

@ -51,17 +51,16 @@ use std::bar::G;",
#[test]
fn insert_start_indent() {
cov_mark::check!(insert_use_indent_after);
check_none(
"std::bar::AA",
r"
use std::bar::B;
use std::bar::D;",
use std::bar::C;",
r"
use std::bar::AA;
use std::bar::B;
use std::bar::D;",
)
use std::bar::C;",
);
}
#[test]
@ -120,7 +119,6 @@ use std::bar::ZZ;",
#[test]
fn insert_end_indent() {
cov_mark::check!(insert_use_indent_before);
check_none(
"std::bar::ZZ",
r"
@ -255,7 +253,6 @@ fn insert_empty_file() {
#[test]
fn insert_empty_module() {
cov_mark::check!(insert_use_no_indent_after);
check(
"foo::bar",
"mod x {}",
@ -615,7 +612,7 @@ fn check(
if module {
syntax = syntax.descendants().find_map(ast::Module::cast).unwrap().syntax().clone();
}
let file = super::ImportScope::from(syntax).unwrap();
let file = super::ImportScope::from(syntax.clone_for_update()).unwrap();
let path = ast::SourceFile::parse(&format!("use {};", path))
.tree()
.syntax()
@ -623,12 +620,8 @@ fn check(
.find_map(ast::Path::cast)
.unwrap();
let rewriter = insert_use(
&file,
path,
InsertUseConfig { merge: mb, prefix_kind: PrefixKind::Plain, group },
);
let result = rewriter.rewrite(file.as_syntax_node()).to_string();
insert_use(&file, path, InsertUseConfig { merge: mb, prefix_kind: PrefixKind::Plain, group });
let result = file.as_syntax_node().to_string();
assert_eq_text!(ra_fixture_after, &result);
}