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

internal: fix bugs in tests by simplifying code

Browse source
This commit is contained in:
Aleksey Kladov 2021-09-13 13:28:00 +03:00
parent 80991356e1
commit 940b3afd00
7 changed files with 144 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/sourcegen/src/lib.rs
View file

@ -55,22 +55,20 @@ impl CommentBlock {
assert!(tag.starts_with(char::is_uppercase));
let tag = format!("{}:", tag);
let mut res = Vec::new();
for mut block in CommentBlock::do_extract(text, true) {
let first = block.contents.remove(0);
if let Some(id) = first.strip_prefix(&tag) {
block.id = id.trim().to_string();
res.push(block);
}
}
res
// Would be nice if we had `.retain_mut` here!
CommentBlock::extract_untagged(text)
.into_iter()
.filter_map(|mut block| {
let first = block.contents.remove(0);
first.strip_prefix(&tag).map(|id| {
block.id = id.trim().to_string();
block
})
})
.collect()
}
pub fn extract_untagged(text: &str) -> Vec<CommentBlock> {
CommentBlock::do_extract(text, false)
}
fn do_extract(text: &str, allow_blocks_with_empty_lines: bool) -> Vec<CommentBlock> {
let mut res = Vec::new();
let prefix = "// ";
@ -79,7 +77,7 @@ impl CommentBlock {
let dummy_block = CommentBlock { id: String::new(), line: 0, contents: Vec::new() };
let mut block = dummy_block.clone();
for (line_num, line) in lines.enumerate() {
if line == "//" && allow_blocks_with_empty_lines {
if line == "//" {
block.contents.push(String::new());
continue;
}