diff options
Diffstat (limited to 'crates/ide_db')
-rw-r--r-- | crates/ide_db/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ide_db/src/call_info.rs | 5 | ||||
-rw-r--r-- | crates/ide_db/src/call_info/tests.rs | 4 | ||||
-rw-r--r-- | crates/ide_db/src/helpers/insert_use.rs | 7 | ||||
-rw-r--r-- | crates/ide_db/src/helpers/insert_use/tests.rs | 6 |
5 files changed, 11 insertions, 12 deletions
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml index d4612a75e..1f855c621 100644 --- a/crates/ide_db/Cargo.toml +++ b/crates/ide_db/Cargo.toml | |||
@@ -10,6 +10,7 @@ edition = "2018" | |||
10 | doctest = false | 10 | doctest = false |
11 | 11 | ||
12 | [dependencies] | 12 | [dependencies] |
13 | cov-mark = "1.1" | ||
13 | log = "0.4.8" | 14 | log = "0.4.8" |
14 | rayon = "1.5.0" | 15 | rayon = "1.5.0" |
15 | fst = { version = "0.4", default-features = false } | 16 | fst = { version = "0.4", default-features = false } |
diff --git a/crates/ide_db/src/call_info.rs b/crates/ide_db/src/call_info.rs index 615fa7b0e..d8878aa91 100644 --- a/crates/ide_db/src/call_info.rs +++ b/crates/ide_db/src/call_info.rs | |||
@@ -7,7 +7,6 @@ use syntax::{ | |||
7 | ast::{self, ArgListOwner}, | 7 | ast::{self, ArgListOwner}, |
8 | match_ast, AstNode, SyntaxNode, SyntaxToken, TextRange, TextSize, | 8 | match_ast, AstNode, SyntaxNode, SyntaxToken, TextRange, TextSize, |
9 | }; | 9 | }; |
10 | use test_utils::mark; | ||
11 | 10 | ||
12 | use crate::RootDatabase; | 11 | use crate::RootDatabase; |
13 | 12 | ||
@@ -122,7 +121,7 @@ fn call_info_impl( | |||
122 | 121 | ||
123 | let arg_list_range = arg_list.syntax().text_range(); | 122 | let arg_list_range = arg_list.syntax().text_range(); |
124 | if !arg_list_range.contains_inclusive(token.text_range().start()) { | 123 | if !arg_list_range.contains_inclusive(token.text_range().start()) { |
125 | mark::hit!(call_info_bad_offset); | 124 | cov_mark::hit!(call_info_bad_offset); |
126 | return None; | 125 | return None; |
127 | } | 126 | } |
128 | let param = std::cmp::min( | 127 | let param = std::cmp::min( |
@@ -162,7 +161,7 @@ impl ActiveParameter { | |||
162 | let idx = active_parameter?; | 161 | let idx = active_parameter?; |
163 | let mut params = signature.params(sema.db); | 162 | let mut params = signature.params(sema.db); |
164 | if !(idx < params.len()) { | 163 | if !(idx < params.len()) { |
165 | mark::hit!(too_many_arguments); | 164 | cov_mark::hit!(too_many_arguments); |
166 | return None; | 165 | return None; |
167 | } | 166 | } |
168 | let (pat, ty) = params.swap_remove(idx); | 167 | let (pat, ty) = params.swap_remove(idx); |
diff --git a/crates/ide_db/src/call_info/tests.rs b/crates/ide_db/src/call_info/tests.rs index c714cf280..9f84c253c 100644 --- a/crates/ide_db/src/call_info/tests.rs +++ b/crates/ide_db/src/call_info/tests.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | use crate::RootDatabase; | 1 | use crate::RootDatabase; |
2 | use base_db::{fixture::ChangeFixture, FilePosition}; | 2 | use base_db::{fixture::ChangeFixture, FilePosition}; |
3 | use expect_test::{expect, Expect}; | 3 | use expect_test::{expect, Expect}; |
4 | use test_utils::{mark, RangeOrOffset}; | 4 | use test_utils::RangeOrOffset; |
5 | 5 | ||
6 | /// Creates analysis from a multi-file fixture, returns positions marked with $0. | 6 | /// Creates analysis from a multi-file fixture, returns positions marked with $0. |
7 | pub(crate) fn position(ra_fixture: &str) -> (RootDatabase, FilePosition) { | 7 | pub(crate) fn position(ra_fixture: &str) -> (RootDatabase, FilePosition) { |
@@ -347,7 +347,7 @@ pub fn foo(mut r: WriteHandler<()>) { | |||
347 | 347 | ||
348 | #[test] | 348 | #[test] |
349 | fn call_info_bad_offset() { | 349 | fn call_info_bad_offset() { |
350 | mark::check!(call_info_bad_offset); | 350 | cov_mark::check!(call_info_bad_offset); |
351 | check( | 351 | check( |
352 | r#" | 352 | r#" |
353 | fn foo(x: u32, y: u32) -> u32 {x + y} | 353 | fn foo(x: u32, y: u32) -> u32 {x + y} |
diff --git a/crates/ide_db/src/helpers/insert_use.rs b/crates/ide_db/src/helpers/insert_use.rs index f52aee344..df66d8ea0 100644 --- a/crates/ide_db/src/helpers/insert_use.rs +++ b/crates/ide_db/src/helpers/insert_use.rs | |||
@@ -13,7 +13,6 @@ use syntax::{ | |||
13 | }, | 13 | }, |
14 | AstToken, InsertPosition, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken, | 14 | AstToken, InsertPosition, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken, |
15 | }; | 15 | }; |
16 | use test_utils::mark; | ||
17 | 16 | ||
18 | #[derive(Clone, Copy, Debug, PartialEq, Eq)] | 17 | #[derive(Clone, Copy, Debug, PartialEq, Eq)] |
19 | pub struct InsertUseConfig { | 18 | pub struct InsertUseConfig { |
@@ -138,7 +137,7 @@ pub fn insert_use<'a>( | |||
138 | 137 | ||
139 | if add_blank.has_before() { | 138 | if add_blank.has_before() { |
140 | if let Some(indent) = indent.clone() { | 139 | if let Some(indent) = indent.clone() { |
141 | mark::hit!(insert_use_indent_before); | 140 | cov_mark::hit!(insert_use_indent_before); |
142 | buf.push(indent); | 141 | buf.push(indent); |
143 | } | 142 | } |
144 | } | 143 | } |
@@ -156,11 +155,11 @@ pub fn insert_use<'a>( | |||
156 | // only add indentation *after* our stuff if there's another node directly after it | 155 | // only add indentation *after* our stuff if there's another node directly after it |
157 | if add_blank.has_after() && matches!(insert_position, InsertPosition::Before(_)) { | 156 | if add_blank.has_after() && matches!(insert_position, InsertPosition::Before(_)) { |
158 | if let Some(indent) = indent { | 157 | if let Some(indent) = indent { |
159 | mark::hit!(insert_use_indent_after); | 158 | cov_mark::hit!(insert_use_indent_after); |
160 | buf.push(indent); | 159 | buf.push(indent); |
161 | } | 160 | } |
162 | } else if add_blank.has_after() && matches!(insert_position, InsertPosition::After(_)) { | 161 | } else if add_blank.has_after() && matches!(insert_position, InsertPosition::After(_)) { |
163 | mark::hit!(insert_use_no_indent_after); | 162 | cov_mark::hit!(insert_use_no_indent_after); |
164 | } | 163 | } |
165 | 164 | ||
166 | buf | 165 | buf |
diff --git a/crates/ide_db/src/helpers/insert_use/tests.rs b/crates/ide_db/src/helpers/insert_use/tests.rs index 67d0d6fb6..3d151e629 100644 --- a/crates/ide_db/src/helpers/insert_use/tests.rs +++ b/crates/ide_db/src/helpers/insert_use/tests.rs | |||
@@ -51,7 +51,7 @@ use std::bar::G;", | |||
51 | 51 | ||
52 | #[test] | 52 | #[test] |
53 | fn insert_start_indent() { | 53 | fn insert_start_indent() { |
54 | mark::check!(insert_use_indent_after); | 54 | cov_mark::check!(insert_use_indent_after); |
55 | check_none( | 55 | check_none( |
56 | "std::bar::AA", | 56 | "std::bar::AA", |
57 | r" | 57 | r" |
@@ -120,7 +120,7 @@ use std::bar::ZZ;", | |||
120 | 120 | ||
121 | #[test] | 121 | #[test] |
122 | fn insert_end_indent() { | 122 | fn insert_end_indent() { |
123 | mark::check!(insert_use_indent_before); | 123 | cov_mark::check!(insert_use_indent_before); |
124 | check_none( | 124 | check_none( |
125 | "std::bar::ZZ", | 125 | "std::bar::ZZ", |
126 | r" | 126 | r" |
@@ -255,7 +255,7 @@ fn insert_empty_file() { | |||
255 | 255 | ||
256 | #[test] | 256 | #[test] |
257 | fn insert_empty_module() { | 257 | fn insert_empty_module() { |
258 | mark::check!(insert_use_no_indent_after); | 258 | cov_mark::check!(insert_use_no_indent_after); |
259 | check( | 259 | check( |
260 | "foo::bar", | 260 | "foo::bar", |
261 | "mod x {}", | 261 | "mod x {}", |