Skip to content

Generalize annotations #5135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2020
Merged

Generalize annotations #5135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions crates/test_utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ pub mod mark;
mod fixture;

use std::{
convert::TryInto,
env, fs,
path::{Path, PathBuf},
};
Expand Down Expand Up @@ -168,8 +169,10 @@ pub fn extract_annotations(text: &str) -> Vec<(TextRange, String)> {
for line in lines_with_ends(text) {
if let Some(idx) = line.find("//^") {
let offset = prev_line_start.unwrap() + TextSize::of(&line[..idx + "//".len()]);
let data = line[idx + "//^".len()..].trim().to_string();
res.push((TextRange::at(offset, 1.into()), data))
let marker_and_data = &line[idx + "//".len()..];
let len = marker_and_data.chars().take_while(|&it| it == '^').count();
let data = marker_and_data[len..].trim().to_string();
res.push((TextRange::at(offset, len.try_into().unwrap()), data))
}
prev_line_start = Some(line_start);
line_start += TextSize::of(line);
Expand All @@ -184,15 +187,15 @@ fn test_extract_annotations() {
fn main() {
let x = 92;
//^ def
z + 1
} //^ i32
zoo + 1
} //^^^ i32
"#,
);
let res = extract_annotations(&text)
.into_iter()
.map(|(range, ann)| (&text[range], ann))
.collect::<Vec<_>>();
assert_eq!(res, vec![("x", "def".into()), ("z", "i32".into()),]);
assert_eq!(res, vec![("x", "def".into()), ("zoo", "i32".into()),]);
}

// Comparison functionality borrowed from cargo:
Expand Down