From 9d64525daa16eb25c15a97d7dd8e099f6ff102c7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 24 Jun 2020 11:50:53 +0200 Subject: Simplify --- crates/ra_ide/src/mock_analysis.rs | 6 ------ crates/ra_ide/src/syntax_highlighting/tests.rs | 11 +++-------- 2 files changed, 3 insertions(+), 14 deletions(-) (limited to 'crates') diff --git a/crates/ra_ide/src/mock_analysis.rs b/crates/ra_ide/src/mock_analysis.rs index 5bad3911f..79b796544 100644 --- a/crates/ra_ide/src/mock_analysis.rs +++ b/crates/ra_ide/src/mock_analysis.rs @@ -126,12 +126,6 @@ impl MockAnalysis { file_id } - pub fn add_file(&mut self, path: &str, text: &str) -> FileId { - let file_id = self.next_id(); - self.files.push(MockFileData::new(path.to_string(), text.to_string())); - file_id - } - fn add_file_with_range(&mut self, path: &str, text: &str) -> FileRange { let (range, text) = extract_range(text); let file_id = self.next_id(); diff --git a/crates/ra_ide/src/syntax_highlighting/tests.rs b/crates/ra_ide/src/syntax_highlighting/tests.rs index c8943816f..b7fad9719 100644 --- a/crates/ra_ide/src/syntax_highlighting/tests.rs +++ b/crates/ra_ide/src/syntax_highlighting/tests.rs @@ -2,10 +2,7 @@ use std::fs; use test_utils::{assert_eq_text, project_dir, read_text}; -use crate::{ - mock_analysis::{single_file, MockAnalysis}, - FileRange, TextRange, -}; +use crate::{mock_analysis::single_file, FileRange, TextRange}; #[test] fn test_highlighting() { @@ -127,12 +124,10 @@ fn accidentally_quadratic() { let file = project_dir().join("crates/ra_syntax/test_data/accidentally_quadratic"); let src = fs::read_to_string(file).unwrap(); - let mut mock = MockAnalysis::new(); - let file_id = mock.add_file("/main.rs", &src); - let host = mock.analysis_host(); + let (analysis, file_id) = single_file(&src); // let t = std::time::Instant::now(); - let _ = host.analysis().highlight(file_id).unwrap(); + let _ = analysis.highlight(file_id).unwrap(); // eprintln!("elapsed: {:?}", t.elapsed()); } -- cgit v1.2.3