Skip to content

Commit ea72a51

Browse files
VeykrilVeykril
committed
Add functions to base items completion test fixture
1 parent b744e33 commit ea72a51

File tree

7 files changed

+46
-106
lines changed

7 files changed

+46
-106
lines changed

‎crates/ide_completion/src/completions/unqualified_path.rs

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -135,61 +135,6 @@ mod tests {
135135
expect.assert_eq(&actual)
136136
}
137137

138-
#[test]
139-
fn completes_bindings_from_let() {
140-
check(
141-
r#"
142-
fn quux(x: i32) {
143-
let y = 92;
144-
1 + $0;
145-
let z = ();
146-
}
147-
"#,
148-
expect![[r#"
149-
lc y i32
150-
lc x i32
151-
fn quux(…) fn(i32)
152-
"#]],
153-
);
154-
}
155-
156-
#[test]
157-
fn completes_bindings_from_if_let() {
158-
check(
159-
r#"
160-
fn quux() {
161-
if let Some(x) = foo() {
162-
let y = 92;
163-
};
164-
if let Some(a) = bar() {
165-
let b = 62;
166-
1 + $0
167-
}
168-
}
169-
"#,
170-
expect![[r#"
171-
lc b i32
172-
lc a
173-
fn quux() fn()
174-
"#]],
175-
);
176-
}
177-
178-
#[test]
179-
fn completes_bindings_from_for() {
180-
check(
181-
r#"
182-
fn quux() {
183-
for x in &[1, 2, 3] { $0 }
184-
}
185-
"#,
186-
expect![[r#"
187-
lc x
188-
fn quux() fn()
189-
"#]],
190-
);
191-
}
192-
193138
#[test]
194139
fn completes_if_prefix_is_keyword() {
195140
cov_mark::check!(completes_if_prefix_is_keyword);

‎crates/ide_completion/src/tests.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use test_utils::assert_eq_text;
3838
use crate::{item::CompletionKind, CompletionConfig, CompletionItem};
3939

4040
/// Lots of basic item definitions
41-
const BASE_FIXTURE: &str = r#"
41+
const BASE_ITEMS_FIXTURE: &str = r#"
4242
enum Enum { TupleV(u32), RecordV { field: u32 }, UnitV }
4343
use self::Enum::TupleV;
4444
mod module {}
@@ -53,6 +53,7 @@ struct Unit;
5353
macro_rules! makro {}
5454
#[rustc_builtin_macro]
5555
pub macro Clone {}
56+
fn function() {}
5657
"#;
5758

5859
pub(crate) const TEST_CONFIG: CompletionConfig = CompletionConfig {

‎crates/ide_completion/src/tests/item.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
//! in [crate::completions::mod_].
55
use expect_test::{expect, Expect};
66

7-
use crate::tests::{completion_list, BASE_FIXTURE};
7+
use crate::tests::{completion_list, BASE_ITEMS_FIXTURE};
88

99
fn check(ra_fixture: &str, expect: Expect) {
10-
let actual = completion_list(&format!("{}{}", BASE_FIXTURE, ra_fixture));
10+
let actual = completion_list(&format!("{}{}", BASE_ITEMS_FIXTURE, ra_fixture));
1111
expect.assert_eq(&actual)
1212
}
1313

@@ -25,10 +25,10 @@ impl Tra$0
2525
en Enum
2626
st Record
2727
st Tuple
28-
ma makro!(…) #[macro_export] macro_rules! makro
2928
md module
3029
st Unit
3130
ma makro!(…) #[macro_export] macro_rules! makro
31+
ma makro!(…) #[macro_export] macro_rules! makro
3232
bt u32
3333
"##]],
3434
)
@@ -48,10 +48,10 @@ impl Trait for Str$0
4848
en Enum
4949
st Record
5050
st Tuple
51-
ma makro!(…) #[macro_export] macro_rules! makro
5251
md module
5352
st Unit
5453
ma makro!(…) #[macro_export] macro_rules! makro
54+
ma makro!(…) #[macro_export] macro_rules! makro
5555
bt u32
5656
"##]],
5757
)

‎crates/ide_completion/src/tests/item_list.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//! Completion tests for item list position.
22
use expect_test::{expect, Expect};
33

4-
use crate::tests::{completion_list, BASE_FIXTURE};
4+
use crate::tests::{completion_list, BASE_ITEMS_FIXTURE};
55

66
fn check(ra_fixture: &str, expect: Expect) {
7-
let actual = completion_list(&format!("{}{}", BASE_FIXTURE, ra_fixture));
7+
let actual = completion_list(&format!("{}{}", BASE_ITEMS_FIXTURE, ra_fixture));
88
expect.assert_eq(&actual)
99
}
1010

@@ -65,9 +65,9 @@ fn in_source_file_item_list() {
6565
kw self
6666
kw super
6767
kw crate
68-
ma makro!(…) #[macro_export] macro_rules! makro
6968
md module
7069
ma makro!(…) #[macro_export] macro_rules! makro
70+
ma makro!(…) #[macro_export] macro_rules! makro
7171
"##]],
7272
)
7373
}
@@ -105,8 +105,8 @@ fn in_qualified_path() {
105105
check(
106106
r#"crate::$0"#,
107107
expect![[r##"
108-
ma makro!(…) #[macro_export] macro_rules! makro
109108
md module
109+
ma makro!(…) #[macro_export] macro_rules! makro
110110
"##]],
111111
)
112112
}
@@ -170,9 +170,9 @@ fn in_impl_assoc_item_list() {
170170
kw self
171171
kw super
172172
kw crate
173-
ma makro!(…) #[macro_export] macro_rules! makro
174173
md module
175174
ma makro!(…) #[macro_export] macro_rules! makro
175+
ma makro!(…) #[macro_export] macro_rules! makro
176176
"##]],
177177
)
178178
}

‎crates/ide_completion/src/tests/pattern.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
//! Completion tests for pattern position.
22
use expect_test::{expect, Expect};
33

4-
use crate::tests::{completion_list, BASE_FIXTURE};
4+
use crate::tests::{completion_list, BASE_ITEMS_FIXTURE};
55

66
fn check(ra_fixture: &str, expect: Expect) {
77
let actual = completion_list(ra_fixture);
88
expect.assert_eq(&actual)
99
}
1010

1111
fn check_with(ra_fixture: &str, expect: Expect) {
12-
let actual = completion_list(&format!("{}\n{}", BASE_FIXTURE, ra_fixture));
12+
let actual = completion_list(&format!("{}\n{}", BASE_ITEMS_FIXTURE, ra_fixture));
1313
expect.assert_eq(&actual)
1414
}
1515

‎crates/ide_completion/src/tests/predicate.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//! Completion tests for predicates and bounds.
22
use expect_test::{expect, Expect};
33

4-
use crate::tests::{completion_list, BASE_FIXTURE};
4+
use crate::tests::{completion_list, BASE_ITEMS_FIXTURE};
55

66
fn check(ra_fixture: &str, expect: Expect) {
7-
let actual = completion_list(&format!("{}\n{}", BASE_FIXTURE, ra_fixture));
7+
let actual = completion_list(&format!("{}\n{}", BASE_ITEMS_FIXTURE, ra_fixture));
88
expect.assert_eq(&actual)
99
}
1010

@@ -130,10 +130,10 @@ impl Record {
130130
en Enum
131131
st Record
132132
st Tuple
133-
ma makro!(…) #[macro_export] macro_rules! makro
134133
md module
135134
st Unit
136135
ma makro!(…) #[macro_export] macro_rules! makro
136+
ma makro!(…) #[macro_export] macro_rules! makro
137137
bt u32
138138
"##]],
139139
);

‎crates/ide_completion/src/tests/type_pos.rs

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
//! Completion tests for type position.
22
use expect_test::{expect, Expect};
33

4-
use crate::tests::completion_list;
4+
use crate::tests::{completion_list, BASE_ITEMS_FIXTURE};
55

66
fn check_with(ra_fixture: &str, expect: Expect) {
7-
let base = r#"
8-
enum Enum { TupleV(u32), RecordV { field: u32 }, UnitV }
9-
use self::Enum::TupleV;
10-
mod module {}
11-
12-
trait Trait {}
13-
static STATIC: Unit = Unit;
14-
const CONST: Unit = Unit;
15-
struct Record { field: u32 }
16-
struct Tuple(u32);
17-
struct Unit
18-
macro_rules! makro {}
19-
"#;
20-
let actual = completion_list(&format!("{}\n{}", base, ra_fixture));
7+
let actual = completion_list(&format!("{}\n{}", BASE_ITEMS_FIXTURE, ra_fixture));
218
expect.assert_eq(&actual)
229
}
2310

@@ -29,7 +16,7 @@ struct Foo<'lt, T, const C: usize> {
2916
f: $0
3017
}
3118
"#,
32-
expect![[r#"
19+
expect![[r##"
3320
kw self
3421
kw super
3522
kw crate
@@ -42,9 +29,10 @@ struct Foo<'lt, T, const C: usize> {
4229
md module
4330
st Foo<…>
4431
st Unit
45-
ma makro!(…) macro_rules! makro
32+
ma makro!(…) #[macro_export] macro_rules! makro
33+
ma makro!(…) #[macro_export] macro_rules! makro
4634
bt u32
47-
"#]],
35+
"##]],
4836
)
4937
}
5038

@@ -54,7 +42,7 @@ fn tuple_struct_field() {
5442
r#"
5543
struct Foo<'lt, T, const C: usize>(f$0);
5644
"#,
57-
expect![[r#"
45+
expect![[r##"
5846
kw pub(crate)
5947
kw pub
6048
kw self
@@ -69,9 +57,10 @@ struct Foo<'lt, T, const C: usize>(f$0);
6957
md module
7058
st Foo<…>
7159
st Unit
72-
ma makro!(…) macro_rules! makro
60+
ma makro!(…) #[macro_export] macro_rules! makro
61+
ma makro!(…) #[macro_export] macro_rules! makro
7362
bt u32
74-
"#]],
63+
"##]],
7564
)
7665
}
7766

@@ -81,7 +70,7 @@ fn fn_return_type() {
8170
r#"
8271
fn x<'lt, T, const C: usize>() -> $0
8372
"#,
84-
expect![[r#"
73+
expect![[r##"
8574
kw self
8675
kw super
8776
kw crate
@@ -92,9 +81,10 @@ fn x<'lt, T, const C: usize>() -> $0
9281
st Tuple
9382
md module
9483
st Unit
95-
ma makro!(…) macro_rules! makro
84+
ma makro!(…) #[macro_export] macro_rules! makro
85+
ma makro!(…) #[macro_export] macro_rules! makro
9686
bt u32
97-
"#]],
87+
"##]],
9888
);
9989
}
10090

@@ -107,7 +97,7 @@ fn foo<'lt, T, const C: usize>() {
10797
let _: $0;
10898
}
10999
"#,
110-
expect![[r#"
100+
expect![[r##"
111101
kw self
112102
kw super
113103
kw crate
@@ -118,9 +108,10 @@ fn foo<'lt, T, const C: usize>() {
118108
st Tuple
119109
md module
120110
st Unit
121-
ma makro!(…) macro_rules! makro
111+
ma makro!(…) #[macro_export] macro_rules! makro
112+
ma makro!(…) #[macro_export] macro_rules! makro
122113
bt u32
123-
"#]],
114+
"##]],
124115
);
125116
check_with(
126117
r#"
@@ -129,14 +120,15 @@ fn foo<'lt, T, const C: usize>() {
129120
let _: self::$0;
130121
}
131122
"#,
132-
expect![[r#"
123+
expect![[r##"
133124
tt Trait
134125
en Enum
135126
st Record
136127
st Tuple
137128
md module
138129
st Unit
139-
"#]],
130+
ma makro!(…) #[macro_export] macro_rules! makro
131+
"##]],
140132
);
141133
}
142134

@@ -150,7 +142,7 @@ trait Trait2 {
150142
151143
fn foo<'lt, T: Trait2<$0>, const CONST_PARAM: usize>(_: T) {}
152144
"#,
153-
expect![[r#"
145+
expect![[r##"
154146
kw self
155147
kw super
156148
kw crate
@@ -161,13 +153,14 @@ fn foo<'lt, T: Trait2<$0>, const CONST_PARAM: usize>(_: T) {}
161153
en Enum
162154
st Record
163155
st Tuple
164-
tt Trait2
165156
md module
166157
st Unit
158+
ma makro!(…) #[macro_export] macro_rules! makro
159+
tt Trait2
167160
ct CONST
168-
ma makro!(…) macro_rules! makro
161+
ma makro!(…) #[macro_export] macro_rules! makro
169162
bt u32
170-
"#]],
163+
"##]],
171164
);
172165
check_with(
173166
r#"
@@ -177,15 +170,16 @@ trait Trait2 {
177170
178171
fn foo<'lt, T: Trait2<self::$0>, const CONST_PARAM: usize>(_: T) {}
179172
"#,
180-
expect![[r#"
173+
expect![[r##"
181174
tt Trait
182175
en Enum
183176
st Record
184177
st Tuple
185-
tt Trait2
186178
md module
187179
st Unit
180+
ma makro!(…) #[macro_export] macro_rules! makro
181+
tt Trait2
188182
ct CONST
189-
"#]],
183+
"##]],
190184
);
191185
}

0 commit comments

Comments
 (0)