mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Aleksey Kladov 2020-06-24 11:48:44 +02:00
parent c749fe223b
commit d4a493078a
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ra_ide/src/mock_analysis.rs
View File

@ -105,10 +105,13 @@ impl MockAnalysis {
pub fn with_files_and_position(fixture: &str) -> (MockAnalysis, FilePosition) { pub fn with_files_and_position(fixture: &str) -> (MockAnalysis, FilePosition) {
let mut position = None; let mut position = None;
let mut res = MockAnalysis::new(); let mut res = MockAnalysis::new();
for entry in Fixture::parse(fixture) { for mut entry in Fixture::parse(fixture) {
if entry.text.contains(CURSOR_MARKER) { if entry.text.contains(CURSOR_MARKER) {
assert!(position.is_none(), "only one marker (<|>) per fixture is allowed"); assert!(position.is_none(), "only one marker (<|>) per fixture is allowed");
position = Some(res.add_file_fixture_with_position(entry)); let (offset, text) = extract_offset(&entry.text);
entry.text = text;
let file_id = res.add_file_fixture(entry);
position = Some(FilePosition { file_id, offset });
} else { } else {
res.add_file_fixture(entry); res.add_file_fixture(entry);
} }
@ -123,19 +126,12 @@ impl MockAnalysis {
file_id file_id
} }
fn add_file_fixture_with_position(&mut self, mut fixture: Fixture) -> FilePosition {
let (offset, text) = extract_offset(&fixture.text);
fixture.text = text;
let file_id = self.next_id();
self.files.push(MockFileData::from(fixture));
FilePosition { file_id, offset }
}
pub fn add_file(&mut self, path: &str, text: &str) -> FileId { pub fn add_file(&mut self, path: &str, text: &str) -> FileId {
let file_id = self.next_id(); let file_id = self.next_id();
self.files.push(MockFileData::new(path.to_string(), text.to_string())); self.files.push(MockFileData::new(path.to_string(), text.to_string()));
file_id file_id
} }
fn add_file_with_range(&mut self, path: &str, text: &str) -> FileRange { fn add_file_with_range(&mut self, path: &str, text: &str) -> FileRange {
let (range, text) = extract_range(text); let (range, text) = extract_range(text);
let file_id = self.next_id(); let file_id = self.next_id();