More consistent usage of fixtures

author: Aleksey Kladov <[email protected]> 2020-06-24 10:29:43 +0100
committer: Aleksey Kladov <[email protected]> 2020-06-24 10:29:43 +0100
commit: c6795fb83a850dde6ac0b08decf108c0c3aa452a (patch)
tree: 6f5ae66dc754b6e20069bdcbccf70fa42b236b57 /crates/ra_ide/src/completion/complete_unqualified_path.rs
parent: e9cb818c2683e06153f013c3b8d03f7f2719eb02 (diff)
1 files changed, 131 insertions, 131 deletions
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index aa2b07a2f..a0a04bb58 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -85,15 +85,15 @@ mod tests {
                "#,
            ),
            @r###"
-            [
+        [
-                CompletionItem {
+            CompletionItem {
-                    label: "collections",
+                label: "collections",
-                    source_range: 21..24,
+                source_range: 4..7,
-                    delete: 21..24,
+                delete: 4..7,
-                    insert: "collections",
+                insert: "collections",
-                },
+            },
-            ]
+        ]
-            "###
+        "###
        );
    }
@@ -157,16 +157,16 @@ mod tests {
                "
            ),
            @r###"
-            [
+        [
-                CompletionItem {
+            CompletionItem {
-                    label: "Enum",
+                label: "Enum",
-                    source_range: 231..233,
+                source_range: 102..104,
-                    delete: 231..233,
+                delete: 102..104,
-                    insert: "Enum",
+                insert: "Enum",
-                    kind: Enum,
+                kind: Enum,
-                },
+            },
-            ]
+        ]
-            "###
+        "###
        );
    }
@@ -186,8 +186,8 @@ mod tests {
        [
            CompletionItem {
                label: "quux(…)",
-                source_range: 91..91,
+                source_range: 42..42,
-                delete: 91..91,
+                delete: 42..42,
                insert: "quux(${1:x})$0",
                kind: Function,
                lookup: "quux",
@@ -196,16 +196,16 @@ mod tests {
            },
            CompletionItem {
                label: "x",
-                source_range: 91..91,
+                source_range: 42..42,
-                delete: 91..91,
+                delete: 42..42,
                insert: "x",
                kind: Binding,
                detail: "i32",
            },
            CompletionItem {
                label: "y",
-                source_range: 91..91,
+                source_range: 42..42,
-                delete: 91..91,
+                delete: 42..42,
                insert: "y",
                kind: Binding,
                detail: "i32",
@@ -235,23 +235,23 @@ mod tests {
        [
            CompletionItem {
                label: "a",
-                source_range: 242..242,
+                source_range: 129..129,
-                delete: 242..242,
+                delete: 129..129,
                insert: "a",
                kind: Binding,
            },
            CompletionItem {
                label: "b",
-                source_range: 242..242,
+                source_range: 129..129,
-                delete: 242..242,
+                delete: 129..129,
                insert: "b",
                kind: Binding,
                detail: "i32",
            },
            CompletionItem {
                label: "quux()",
-                source_range: 242..242,
+                source_range: 129..129,
-                delete: 242..242,
+                delete: 129..129,
                insert: "quux()$0",
                kind: Function,
                lookup: "quux",
@@ -278,8 +278,8 @@ mod tests {
        [
            CompletionItem {
                label: "quux()",
-                source_range: 95..95,
+                source_range: 46..46,
-                delete: 95..95,
+                delete: 46..46,
                insert: "quux()$0",
                kind: Function,
                lookup: "quux",
@@ -287,8 +287,8 @@ mod tests {
            },
            CompletionItem {
                label: "x",
-                source_range: 95..95,
+                source_range: 46..46,
-                delete: 95..95,
+                delete: 46..46,
                insert: "x",
                kind: Binding,
            },
@@ -314,15 +314,15 @@ mod tests {
        [
            CompletionItem {
                label: "index",
-                source_range: 107..107,
+                source_range: 58..58,
-                delete: 107..107,
+                delete: 58..58,
                insert: "index",
                kind: Binding,
            },
            CompletionItem {
                label: "test()",
-                source_range: 107..107,
+                source_range: 58..58,
-                delete: 107..107,
+                delete: 58..58,
                insert: "test()$0",
                kind: Function,
                lookup: "test",
@@ -347,15 +347,15 @@ mod tests {
        [
            CompletionItem {
                label: "T",
-                source_range: 52..52,
+                source_range: 19..19,
-                delete: 52..52,
+                delete: 19..19,
                insert: "T",
                kind: TypeParam,
            },
            CompletionItem {
                label: "quux()",
-                source_range: 52..52,
+                source_range: 19..19,
-                delete: 52..52,
+                delete: 19..19,
                insert: "quux()$0",
                kind: Function,
                lookup: "quux",
@@ -380,22 +380,22 @@ mod tests {
        [
            CompletionItem {
                label: "Self",
-                source_range: 54..54,
+                source_range: 21..21,
-                delete: 54..54,
+                delete: 21..21,
                insert: "Self",
                kind: TypeParam,
            },
            CompletionItem {
                label: "T",
-                source_range: 54..54,
+                source_range: 21..21,
-                delete: 54..54,
+                delete: 21..21,
                insert: "T",
                kind: TypeParam,
            },
            CompletionItem {
                label: "X<…>",
-                source_range: 54..54,
+                source_range: 21..21,
-                delete: 54..54,
+                delete: 21..21,
                insert: "X<$0>",
                kind: Struct,
                lookup: "X",
@@ -419,15 +419,15 @@ mod tests {
        [
            CompletionItem {
                label: "Self",
-                source_range: 48..48,
+                source_range: 15..15,
-                delete: 48..48,
+                delete: 15..15,
                insert: "Self",
                kind: TypeParam,
            },
            CompletionItem {
                label: "X",
-                source_range: 48..48,
+                source_range: 15..15,
-                delete: 48..48,
+                delete: 15..15,
                insert: "X",
                kind: Enum,
            },
@@ -452,22 +452,22 @@ mod tests {
        [
            CompletionItem {
                label: "Baz",
-                source_range: 105..105,
+                source_range: 40..40,
-                delete: 105..105,
+                delete: 40..40,
                insert: "Baz",
                kind: Enum,
            },
            CompletionItem {
                label: "Foo",
-                source_range: 105..105,
+                source_range: 40..40,
-                delete: 105..105,
+                delete: 40..40,
                insert: "Foo",
                kind: Struct,
            },
            CompletionItem {
                label: "quux()",
-                source_range: 105..105,
+                source_range: 40..40,
-                delete: 105..105,
+                delete: 40..40,
                insert: "quux()$0",
                kind: Function,
                lookup: "quux",
@@ -520,15 +520,15 @@ mod tests {
        [
            CompletionItem {
                label: "Bar",
-                source_range: 117..117,
+                source_range: 52..52,
-                delete: 117..117,
+                delete: 52..52,
                insert: "Bar",
                kind: Struct,
            },
            CompletionItem {
                label: "quux()",
-                source_range: 117..117,
+                source_range: 52..52,
-                delete: 117..117,
+                delete: 52..52,
                insert: "quux()$0",
                kind: Function,
                lookup: "quux",
@@ -552,15 +552,15 @@ mod tests {
        [
            CompletionItem {
                label: "Foo",
-                source_range: 55..55,
+                source_range: 22..22,
-                delete: 55..55,
+                delete: 22..22,
                insert: "Foo",
                kind: Struct,
            },
            CompletionItem {
                label: "x()",
-                source_range: 55..55,
+                source_range: 22..22,
-                delete: 55..55,
+                delete: 22..22,
                insert: "x()$0",
                kind: Function,
                lookup: "x",
@@ -589,16 +589,16 @@ mod tests {
        [
            CompletionItem {
                label: "bar",
-                source_range: 146..146,
+                source_range: 65..65,
-                delete: 146..146,
+                delete: 65..65,
                insert: "bar",
                kind: Binding,
                detail: "i32",
            },
            CompletionItem {
                label: "foo()",
-                source_range: 146..146,
+                source_range: 65..65,
-                delete: 146..146,
+                delete: 65..65,
                insert: "foo()$0",
                kind: Function,
                lookup: "foo",
@@ -1001,16 +1001,16 @@ mod tests {
        [
            CompletionItem {
                label: "m!(…)",
-                source_range: 145..145,
+                source_range: 80..80,
-                delete: 145..145,
+                delete: 80..80,
                insert: "m!($0)",
                kind: Macro,
                detail: "macro_rules! m",
            },
            CompletionItem {
                label: "quux(…)",
-                source_range: 145..145,
+                source_range: 80..80,
-                delete: 145..145,
+                delete: 80..80,
                insert: "quux(${1:x})$0",
                kind: Function,
                lookup: "quux",
@@ -1019,16 +1019,16 @@ mod tests {
            },
            CompletionItem {
                label: "x",
-                source_range: 145..145,
+                source_range: 80..80,
-                delete: 145..145,
+                delete: 80..80,
                insert: "x",
                kind: Binding,
                detail: "i32",
            },
            CompletionItem {
                label: "y",
-                source_range: 145..145,
+                source_range: 80..80,
-                delete: 145..145,
+                delete: 80..80,
                insert: "y",
                kind: Binding,
                detail: "i32",
@@ -1054,16 +1054,16 @@ mod tests {
        [
            CompletionItem {
                label: "m!(…)",
-                source_range: 145..146,
+                source_range: 80..81,
-                delete: 145..146,
+                delete: 80..81,
                insert: "m!($0)",
                kind: Macro,
                detail: "macro_rules! m",
            },
            CompletionItem {
                label: "quux(…)",
-                source_range: 145..146,
+                source_range: 80..81,
-                delete: 145..146,
+                delete: 80..81,
                insert: "quux(${1:x})$0",
                kind: Function,
                lookup: "quux",
@@ -1072,16 +1072,16 @@ mod tests {
            },
            CompletionItem {
                label: "x",
-                source_range: 145..146,
+                source_range: 80..81,
-                delete: 145..146,
+                delete: 80..81,
                insert: "x",
                kind: Binding,
                detail: "i32",
            },
            CompletionItem {
                label: "y",
-                source_range: 145..146,
+                source_range: 80..81,
-                delete: 145..146,
+                delete: 80..81,
                insert: "y",
                kind: Binding,
                detail: "i32",
@@ -1107,16 +1107,16 @@ mod tests {
        [
            CompletionItem {
                label: "m!(…)",
-                source_range: 145..146,
+                source_range: 80..81,
-                delete: 145..146,
+                delete: 80..81,
                insert: "m!($0)",
                kind: Macro,
                detail: "macro_rules! m",
            },
            CompletionItem {
                label: "quux(…)",
-                source_range: 145..146,
+                source_range: 80..81,
-                delete: 145..146,
+                delete: 80..81,
                insert: "quux(${1:x})$0",
                kind: Function,
                lookup: "quux",
@@ -1125,16 +1125,16 @@ mod tests {
            },
            CompletionItem {
                label: "x",
-                source_range: 145..146,
+                source_range: 80..81,
-                delete: 145..146,
+                delete: 80..81,
                insert: "x",
                kind: Binding,
                detail: "i32",
            },
            CompletionItem {
                label: "y",
-                source_range: 145..146,
+                source_range: 80..81,
-                delete: 145..146,
+                delete: 80..81,
                insert: "y",
                kind: Binding,
                detail: "i32",
@@ -1160,14 +1160,14 @@ mod tests {
        [
            CompletionItem {
                label: "Quux",
-                source_range: 82..82,
+                source_range: 33..33,
-                delete: 82..82,
+                delete: 33..33,
                insert: "Quux",
            },
            CompletionItem {
                label: "main()",
-                source_range: 82..82,
+                source_range: 33..33,
-                delete: 82..82,
+                delete: 33..33,
                insert: "main()$0",
                kind: Function,
                lookup: "main",
@@ -1201,15 +1201,15 @@ mod tests {
        [
            CompletionItem {
                label: "Foo",
-                source_range: 248..250,
+                source_range: 103..105,
-                delete: 248..250,
+                delete: 103..105,
                insert: "Foo",
                kind: Enum,
            },
            CompletionItem {
                label: "Foo::Bar",
-                source_range: 248..250,
+                source_range: 103..105,
-                delete: 248..250,
+                delete: 103..105,
                insert: "Foo::Bar",
                kind: EnumVariant,
                lookup: "Bar",
@@ -1217,8 +1217,8 @@ mod tests {
            },
            CompletionItem {
                label: "Foo::Baz",
-                source_range: 248..250,
+                source_range: 103..105,
-                delete: 248..250,
+                delete: 103..105,
                insert: "Foo::Baz",
                kind: EnumVariant,
                lookup: "Baz",
@@ -1226,8 +1226,8 @@ mod tests {
            },
            CompletionItem {
                label: "Foo::Quux",
-                source_range: 248..250,
+                source_range: 103..105,
-                delete: 248..250,
+                delete: 103..105,
                insert: "Foo::Quux",
                kind: EnumVariant,
                lookup: "Quux",
@@ -1262,15 +1262,15 @@ mod tests {
        [
            CompletionItem {
                label: "Foo",
-                source_range: 219..221,
+                source_range: 90..92,
-                delete: 219..221,
+                delete: 90..92,
                insert: "Foo",
                kind: Enum,
            },
            CompletionItem {
                label: "Foo::Bar",
-                source_range: 219..221,
+                source_range: 90..92,
-                delete: 219..221,
+                delete: 90..92,
                insert: "Foo::Bar",
                kind: EnumVariant,
                lookup: "Bar",
@@ -1278,8 +1278,8 @@ mod tests {
            },
            CompletionItem {
                label: "Foo::Baz",
-                source_range: 219..221,
+                source_range: 90..92,
-                delete: 219..221,
+                delete: 90..92,
                insert: "Foo::Baz",
                kind: EnumVariant,
                lookup: "Baz",
@@ -1287,8 +1287,8 @@ mod tests {
            },
            CompletionItem {
                label: "Foo::Quux",
-                source_range: 219..221,
+                source_range: 90..92,
-                delete: 219..221,
+                delete: 90..92,
                insert: "Foo::Quux",
                kind: EnumVariant,
                lookup: "Quux",
@@ -1319,15 +1319,15 @@ mod tests {
        [
            CompletionItem {
                label: "Foo",
-                source_range: 185..186,
+                source_range: 72..73,
-                delete: 185..186,
+                delete: 72..73,
                insert: "Foo",
                kind: Enum,
            },
            CompletionItem {
                label: "Foo::Bar",
-                source_range: 185..186,
+                source_range: 72..73,
-                delete: 185..186,
+                delete: 72..73,
                insert: "Foo::Bar",
                kind: EnumVariant,
                lookup: "Bar",
@@ -1335,8 +1335,8 @@ mod tests {
            },
            CompletionItem {
                label: "Foo::Baz",
-                source_range: 185..186,
+                source_range: 72..73,
-                delete: 185..186,
+                delete: 72..73,
                insert: "Foo::Baz",
                kind: EnumVariant,
                lookup: "Baz",
@@ -1344,8 +1344,8 @@ mod tests {
            },
            CompletionItem {
                label: "Foo::Quux",
-                source_range: 185..186,
+                source_range: 72..73,
-                delete: 185..186,
+                delete: 72..73,
                insert: "Foo::Quux",
                kind: EnumVariant,
                lookup: "Quux",
@@ -1353,8 +1353,8 @@ mod tests {
            },
            CompletionItem {
                label: "main()",
-                source_range: 185..186,
+                source_range: 72..73,
-                delete: 185..186,
+                delete: 72..73,
                insert: "main()$0",
                kind: Function,
                lookup: "main",
@@ -1381,8 +1381,8 @@ mod tests {
        [
            CompletionItem {
                label: "f()",
-                source_range: 98..99,
+                source_range: 49..50,
-                delete: 98..99,
+                delete: 49..50,
                insert: "f()$0",
                kind: Function,
                lookup: "f",
@@ -1390,15 +1390,15 @@ mod tests {
            },
            CompletionItem {
                label: "m",
-                source_range: 98..99,
+                source_range: 49..50,
-                delete: 98..99,
+                delete: 49..50,
                insert: "m",
                kind: Module,
            },
            CompletionItem {
                label: "m::E::V",
-                source_range: 98..99,
+                source_range: 49..50,
-                delete: 98..99,
+                delete: 49..50,
                insert: "m::E::V",
                kind: EnumVariant,
                lookup: "V",
author	Aleksey Kladov <[email protected]>	2020-06-24 10:29:43 +0100
committer	Aleksey Kladov <[email protected]>	2020-06-24 10:29:43 +0100
commit	c6795fb83a850dde6ac0b08decf108c0c3aa452a (patch)
tree	6f5ae66dc754b6e20069bdcbccf70fa42b236b57 /crates/ra_ide/src/completion/complete_unqualified_path.rs
parent	e9cb818c2683e06153f013c3b8d03f7f2719eb02 (diff)

diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs index aa2b07a2f..a0a04bb58 100644 --- a/crates/ra_ide/src/completion/complete_unqualified_path.rs +++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -85,15 +85,15 @@ mod tests {
85	"#,	85	"#,
86	),	86	),
87	@r###"	87	@r###"
88	[	88	[
89	CompletionItem {	89	CompletionItem {
90	label: "collections",	90	label: "collections",
91	source_range: 21..24,	91	source_range: 4..7,
92	delete: 21..24,	92	delete: 4..7,
93	insert: "collections",	93	insert: "collections",
94	},	94	},
95	]	95	]
96	"###	96	"###
97	);	97	);
98	}	98	}
99		99
@@ -157,16 +157,16 @@ mod tests {
157	"	157	"
158	),	158	),
159	@r###"	159	@r###"
160	[	160	[
161	CompletionItem {	161	CompletionItem {
162	label: "Enum",	162	label: "Enum",
163	source_range: 231..233,	163	source_range: 102..104,
164	delete: 231..233,	164	delete: 102..104,
165	insert: "Enum",	165	insert: "Enum",
166	kind: Enum,	166	kind: Enum,
167	},	167	},
168	]	168	]
169	"###	169	"###
170	);	170	);
171	}	171	}
172		172
@@ -186,8 +186,8 @@ mod tests {
186	[	186	[
187	CompletionItem {	187	CompletionItem {
188	label: "quux(…)",	188	label: "quux(…)",
189	source_range: 91..91,	189	source_range: 42..42,
190	delete: 91..91,	190	delete: 42..42,
191	insert: "quux(${1:x})$0",	191	insert: "quux(${1:x})$0",
192	kind: Function,	192	kind: Function,
193	lookup: "quux",	193	lookup: "quux",
@@ -196,16 +196,16 @@ mod tests {
196	},	196	},
197	CompletionItem {	197	CompletionItem {
198	label: "x",	198	label: "x",
199	source_range: 91..91,	199	source_range: 42..42,
200	delete: 91..91,	200	delete: 42..42,
201	insert: "x",	201	insert: "x",
202	kind: Binding,	202	kind: Binding,
203	detail: "i32",	203	detail: "i32",
204	},	204	},
205	CompletionItem {	205	CompletionItem {
206	label: "y",	206	label: "y",
207	source_range: 91..91,	207	source_range: 42..42,
208	delete: 91..91,	208	delete: 42..42,
209	insert: "y",	209	insert: "y",
210	kind: Binding,	210	kind: Binding,
211	detail: "i32",	211	detail: "i32",
@@ -235,23 +235,23 @@ mod tests {
235	[	235	[
236	CompletionItem {	236	CompletionItem {
237	label: "a",	237	label: "a",
238	source_range: 242..242,	238	source_range: 129..129,
239	delete: 242..242,	239	delete: 129..129,
240	insert: "a",	240	insert: "a",
241	kind: Binding,	241	kind: Binding,
242	},	242	},
243	CompletionItem {	243	CompletionItem {
244	label: "b",	244	label: "b",
245	source_range: 242..242,	245	source_range: 129..129,
246	delete: 242..242,	246	delete: 129..129,
247	insert: "b",	247	insert: "b",
248	kind: Binding,	248	kind: Binding,
249	detail: "i32",	249	detail: "i32",
250	},	250	},
251	CompletionItem {	251	CompletionItem {
252	label: "quux()",	252	label: "quux()",
253	source_range: 242..242,	253	source_range: 129..129,
254	delete: 242..242,	254	delete: 129..129,
255	insert: "quux()$0",	255	insert: "quux()$0",
256	kind: Function,	256	kind: Function,
257	lookup: "quux",	257	lookup: "quux",
@@ -278,8 +278,8 @@ mod tests {
278	[	278	[
279	CompletionItem {	279	CompletionItem {
280	label: "quux()",	280	label: "quux()",
281	source_range: 95..95,	281	source_range: 46..46,
282	delete: 95..95,	282	delete: 46..46,
283	insert: "quux()$0",	283	insert: "quux()$0",
284	kind: Function,	284	kind: Function,
285	lookup: "quux",	285	lookup: "quux",
@@ -287,8 +287,8 @@ mod tests {
287	},	287	},
288	CompletionItem {	288	CompletionItem {
289	label: "x",	289	label: "x",
290	source_range: 95..95,	290	source_range: 46..46,
291	delete: 95..95,	291	delete: 46..46,
292	insert: "x",	292	insert: "x",
293	kind: Binding,	293	kind: Binding,
294	},	294	},
@@ -314,15 +314,15 @@ mod tests {
314	[	314	[
315	CompletionItem {	315	CompletionItem {
316	label: "index",	316	label: "index",
317	source_range: 107..107,	317	source_range: 58..58,
318	delete: 107..107,	318	delete: 58..58,
319	insert: "index",	319	insert: "index",
320	kind: Binding,	320	kind: Binding,
321	},	321	},
322	CompletionItem {	322	CompletionItem {
323	label: "test()",	323	label: "test()",
324	source_range: 107..107,	324	source_range: 58..58,
325	delete: 107..107,	325	delete: 58..58,
326	insert: "test()$0",	326	insert: "test()$0",
327	kind: Function,	327	kind: Function,
328	lookup: "test",	328	lookup: "test",
@@ -347,15 +347,15 @@ mod tests {
347	[	347	[
348	CompletionItem {	348	CompletionItem {
349	label: "T",	349	label: "T",
350	source_range: 52..52,	350	source_range: 19..19,
351	delete: 52..52,	351	delete: 19..19,
352	insert: "T",	352	insert: "T",
353	kind: TypeParam,	353	kind: TypeParam,
354	},	354	},
355	CompletionItem {	355	CompletionItem {
356	label: "quux()",	356	label: "quux()",
357	source_range: 52..52,	357	source_range: 19..19,
358	delete: 52..52,	358	delete: 19..19,
359	insert: "quux()$0",	359	insert: "quux()$0",
360	kind: Function,	360	kind: Function,
361	lookup: "quux",	361	lookup: "quux",
@@ -380,22 +380,22 @@ mod tests {
380	[	380	[
381	CompletionItem {	381	CompletionItem {
382	label: "Self",	382	label: "Self",
383	source_range: 54..54,	383	source_range: 21..21,
384	delete: 54..54,	384	delete: 21..21,
385	insert: "Self",	385	insert: "Self",
386	kind: TypeParam,	386	kind: TypeParam,
387	},	387	},
388	CompletionItem {	388	CompletionItem {
389	label: "T",	389	label: "T",
390	source_range: 54..54,	390	source_range: 21..21,
391	delete: 54..54,	391	delete: 21..21,
392	insert: "T",	392	insert: "T",
393	kind: TypeParam,	393	kind: TypeParam,
394	},	394	},
395	CompletionItem {	395	CompletionItem {
396	label: "X<…>",	396	label: "X<…>",
397	source_range: 54..54,	397	source_range: 21..21,
398	delete: 54..54,	398	delete: 21..21,
399	insert: "X<$0>",	399	insert: "X<$0>",
400	kind: Struct,	400	kind: Struct,
401	lookup: "X",	401	lookup: "X",
@@ -419,15 +419,15 @@ mod tests {
419	[	419	[
420	CompletionItem {	420	CompletionItem {
421	label: "Self",	421	label: "Self",
422	source_range: 48..48,	422	source_range: 15..15,
423	delete: 48..48,	423	delete: 15..15,
424	insert: "Self",	424	insert: "Self",
425	kind: TypeParam,	425	kind: TypeParam,
426	},	426	},
427	CompletionItem {	427	CompletionItem {
428	label: "X",	428	label: "X",
429	source_range: 48..48,	429	source_range: 15..15,
430	delete: 48..48,	430	delete: 15..15,
431	insert: "X",	431	insert: "X",
432	kind: Enum,	432	kind: Enum,
433	},	433	},
@@ -452,22 +452,22 @@ mod tests {
452	[	452	[
453	CompletionItem {	453	CompletionItem {
454	label: "Baz",	454	label: "Baz",
455	source_range: 105..105,	455	source_range: 40..40,
456	delete: 105..105,	456	delete: 40..40,
457	insert: "Baz",	457	insert: "Baz",
458	kind: Enum,	458	kind: Enum,
459	},	459	},
460	CompletionItem {	460	CompletionItem {
461	label: "Foo",	461	label: "Foo",
462	source_range: 105..105,	462	source_range: 40..40,
463	delete: 105..105,	463	delete: 40..40,
464	insert: "Foo",	464	insert: "Foo",
465	kind: Struct,	465	kind: Struct,
466	},	466	},
467	CompletionItem {	467	CompletionItem {
468	label: "quux()",	468	label: "quux()",
469	source_range: 105..105,	469	source_range: 40..40,
470	delete: 105..105,	470	delete: 40..40,
471	insert: "quux()$0",	471	insert: "quux()$0",
472	kind: Function,	472	kind: Function,
473	lookup: "quux",	473	lookup: "quux",
@@ -520,15 +520,15 @@ mod tests {
520	[	520	[
521	CompletionItem {	521	CompletionItem {
522	label: "Bar",	522	label: "Bar",
523	source_range: 117..117,	523	source_range: 52..52,
524	delete: 117..117,	524	delete: 52..52,
525	insert: "Bar",	525	insert: "Bar",
526	kind: Struct,	526	kind: Struct,
527	},	527	},
528	CompletionItem {	528	CompletionItem {
529	label: "quux()",	529	label: "quux()",
530	source_range: 117..117,	530	source_range: 52..52,
531	delete: 117..117,	531	delete: 52..52,
532	insert: "quux()$0",	532	insert: "quux()$0",
533	kind: Function,	533	kind: Function,
534	lookup: "quux",	534	lookup: "quux",
@@ -552,15 +552,15 @@ mod tests {
552	[	552	[
553	CompletionItem {	553	CompletionItem {
554	label: "Foo",	554	label: "Foo",
555	source_range: 55..55,	555	source_range: 22..22,
556	delete: 55..55,	556	delete: 22..22,
557	insert: "Foo",	557	insert: "Foo",
558	kind: Struct,	558	kind: Struct,
559	},	559	},
560	CompletionItem {	560	CompletionItem {
561	label: "x()",	561	label: "x()",
562	source_range: 55..55,	562	source_range: 22..22,
563	delete: 55..55,	563	delete: 22..22,
564	insert: "x()$0",	564	insert: "x()$0",
565	kind: Function,	565	kind: Function,
566	lookup: "x",	566	lookup: "x",
@@ -589,16 +589,16 @@ mod tests {
589	[	589	[
590	CompletionItem {	590	CompletionItem {
591	label: "bar",	591	label: "bar",
592	source_range: 146..146,	592	source_range: 65..65,
593	delete: 146..146,	593	delete: 65..65,
594	insert: "bar",	594	insert: "bar",
595	kind: Binding,	595	kind: Binding,
596	detail: "i32",	596	detail: "i32",
597	},	597	},
598	CompletionItem {	598	CompletionItem {
599	label: "foo()",	599	label: "foo()",
600	source_range: 146..146,	600	source_range: 65..65,
601	delete: 146..146,	601	delete: 65..65,
602	insert: "foo()$0",	602	insert: "foo()$0",
603	kind: Function,	603	kind: Function,
604	lookup: "foo",	604	lookup: "foo",
@@ -1001,16 +1001,16 @@ mod tests {
1001	[	1001	[
1002	CompletionItem {	1002	CompletionItem {
1003	label: "m!(…)",	1003	label: "m!(…)",
1004	source_range: 145..145,	1004	source_range: 80..80,
1005	delete: 145..145,	1005	delete: 80..80,
1006	insert: "m!($0)",	1006	insert: "m!($0)",
1007	kind: Macro,	1007	kind: Macro,
1008	detail: "macro_rules! m",	1008	detail: "macro_rules! m",
1009	},	1009	},
1010	CompletionItem {	1010	CompletionItem {
1011	label: "quux(…)",	1011	label: "quux(…)",
1012	source_range: 145..145,	1012	source_range: 80..80,
1013	delete: 145..145,	1013	delete: 80..80,
1014	insert: "quux(${1:x})$0",	1014	insert: "quux(${1:x})$0",
1015	kind: Function,	1015	kind: Function,
1016	lookup: "quux",	1016	lookup: "quux",
@@ -1019,16 +1019,16 @@ mod tests {
1019	},	1019	},
1020	CompletionItem {	1020	CompletionItem {
1021	label: "x",	1021	label: "x",
1022	source_range: 145..145,	1022	source_range: 80..80,
1023	delete: 145..145,	1023	delete: 80..80,
1024	insert: "x",	1024	insert: "x",
1025	kind: Binding,	1025	kind: Binding,
1026	detail: "i32",	1026	detail: "i32",
1027	},	1027	},
1028	CompletionItem {	1028	CompletionItem {
1029	label: "y",	1029	label: "y",
1030	source_range: 145..145,	1030	source_range: 80..80,
1031	delete: 145..145,	1031	delete: 80..80,
1032	insert: "y",	1032	insert: "y",
1033	kind: Binding,	1033	kind: Binding,
1034	detail: "i32",	1034	detail: "i32",
@@ -1054,16 +1054,16 @@ mod tests {
1054	[	1054	[
1055	CompletionItem {	1055	CompletionItem {
1056	label: "m!(…)",	1056	label: "m!(…)",
1057	source_range: 145..146,	1057	source_range: 80..81,
1058	delete: 145..146,	1058	delete: 80..81,
1059	insert: "m!($0)",	1059	insert: "m!($0)",
1060	kind: Macro,	1060	kind: Macro,
1061	detail: "macro_rules! m",	1061	detail: "macro_rules! m",
1062	},	1062	},
1063	CompletionItem {	1063	CompletionItem {
1064	label: "quux(…)",	1064	label: "quux(…)",
1065	source_range: 145..146,	1065	source_range: 80..81,
1066	delete: 145..146,	1066	delete: 80..81,
1067	insert: "quux(${1:x})$0",	1067	insert: "quux(${1:x})$0",
1068	kind: Function,	1068	kind: Function,
1069	lookup: "quux",	1069	lookup: "quux",
@@ -1072,16 +1072,16 @@ mod tests {
1072	},	1072	},
1073	CompletionItem {	1073	CompletionItem {
1074	label: "x",	1074	label: "x",
1075	source_range: 145..146,	1075	source_range: 80..81,
1076	delete: 145..146,	1076	delete: 80..81,
1077	insert: "x",	1077	insert: "x",
1078	kind: Binding,	1078	kind: Binding,
1079	detail: "i32",	1079	detail: "i32",
1080	},	1080	},
1081	CompletionItem {	1081	CompletionItem {
1082	label: "y",	1082	label: "y",
1083	source_range: 145..146,	1083	source_range: 80..81,
1084	delete: 145..146,	1084	delete: 80..81,
1085	insert: "y",	1085	insert: "y",
1086	kind: Binding,	1086	kind: Binding,
1087	detail: "i32",	1087	detail: "i32",
@@ -1107,16 +1107,16 @@ mod tests {
1107	[	1107	[
1108	CompletionItem {	1108	CompletionItem {
1109	label: "m!(…)",	1109	label: "m!(…)",
1110	source_range: 145..146,	1110	source_range: 80..81,
1111	delete: 145..146,	1111	delete: 80..81,
1112	insert: "m!($0)",	1112	insert: "m!($0)",
1113	kind: Macro,	1113	kind: Macro,
1114	detail: "macro_rules! m",	1114	detail: "macro_rules! m",
1115	},	1115	},
1116	CompletionItem {	1116	CompletionItem {
1117	label: "quux(…)",	1117	label: "quux(…)",
1118	source_range: 145..146,	1118	source_range: 80..81,
1119	delete: 145..146,	1119	delete: 80..81,
1120	insert: "quux(${1:x})$0",	1120	insert: "quux(${1:x})$0",
1121	kind: Function,	1121	kind: Function,
1122	lookup: "quux",	1122	lookup: "quux",
@@ -1125,16 +1125,16 @@ mod tests {
1125	},	1125	},
1126	CompletionItem {	1126	CompletionItem {
1127	label: "x",	1127	label: "x",
1128	source_range: 145..146,	1128	source_range: 80..81,
1129	delete: 145..146,	1129	delete: 80..81,
1130	insert: "x",	1130	insert: "x",
1131	kind: Binding,	1131	kind: Binding,
1132	detail: "i32",	1132	detail: "i32",
1133	},	1133	},
1134	CompletionItem {	1134	CompletionItem {
1135	label: "y",	1135	label: "y",
1136	source_range: 145..146,	1136	source_range: 80..81,
1137	delete: 145..146,	1137	delete: 80..81,
1138	insert: "y",	1138	insert: "y",
1139	kind: Binding,	1139	kind: Binding,
1140	detail: "i32",	1140	detail: "i32",
@@ -1160,14 +1160,14 @@ mod tests {
1160	[	1160	[
1161	CompletionItem {	1161	CompletionItem {
1162	label: "Quux",	1162	label: "Quux",
1163	source_range: 82..82,	1163	source_range: 33..33,
1164	delete: 82..82,	1164	delete: 33..33,
1165	insert: "Quux",	1165	insert: "Quux",
1166	},	1166	},
1167	CompletionItem {	1167	CompletionItem {
1168	label: "main()",	1168	label: "main()",
1169	source_range: 82..82,	1169	source_range: 33..33,
1170	delete: 82..82,	1170	delete: 33..33,
1171	insert: "main()$0",	1171	insert: "main()$0",
1172	kind: Function,	1172	kind: Function,
1173	lookup: "main",	1173	lookup: "main",
@@ -1201,15 +1201,15 @@ mod tests {
1201	[	1201	[
1202	CompletionItem {	1202	CompletionItem {
1203	label: "Foo",	1203	label: "Foo",
1204	source_range: 248..250,	1204	source_range: 103..105,
1205	delete: 248..250,	1205	delete: 103..105,
1206	insert: "Foo",	1206	insert: "Foo",
1207	kind: Enum,	1207	kind: Enum,
1208	},	1208	},
1209	CompletionItem {	1209	CompletionItem {
1210	label: "Foo::Bar",	1210	label: "Foo::Bar",
1211	source_range: 248..250,	1211	source_range: 103..105,
1212	delete: 248..250,	1212	delete: 103..105,
1213	insert: "Foo::Bar",	1213	insert: "Foo::Bar",
1214	kind: EnumVariant,	1214	kind: EnumVariant,
1215	lookup: "Bar",	1215	lookup: "Bar",
@@ -1217,8 +1217,8 @@ mod tests {
1217	},	1217	},
1218	CompletionItem {	1218	CompletionItem {
1219	label: "Foo::Baz",	1219	label: "Foo::Baz",
1220	source_range: 248..250,	1220	source_range: 103..105,
1221	delete: 248..250,	1221	delete: 103..105,
1222	insert: "Foo::Baz",	1222	insert: "Foo::Baz",
1223	kind: EnumVariant,	1223	kind: EnumVariant,
1224	lookup: "Baz",	1224	lookup: "Baz",
@@ -1226,8 +1226,8 @@ mod tests {
1226	},	1226	},
1227	CompletionItem {	1227	CompletionItem {
1228	label: "Foo::Quux",	1228	label: "Foo::Quux",
1229	source_range: 248..250,	1229	source_range: 103..105,
1230	delete: 248..250,	1230	delete: 103..105,
1231	insert: "Foo::Quux",	1231	insert: "Foo::Quux",
1232	kind: EnumVariant,	1232	kind: EnumVariant,
1233	lookup: "Quux",	1233	lookup: "Quux",
@@ -1262,15 +1262,15 @@ mod tests {
1262	[	1262	[
1263	CompletionItem {	1263	CompletionItem {
1264	label: "Foo",	1264	label: "Foo",
1265	source_range: 219..221,	1265	source_range: 90..92,
1266	delete: 219..221,	1266	delete: 90..92,
1267	insert: "Foo",	1267	insert: "Foo",
1268	kind: Enum,	1268	kind: Enum,
1269	},	1269	},
1270	CompletionItem {	1270	CompletionItem {
1271	label: "Foo::Bar",	1271	label: "Foo::Bar",
1272	source_range: 219..221,	1272	source_range: 90..92,
1273	delete: 219..221,	1273	delete: 90..92,
1274	insert: "Foo::Bar",	1274	insert: "Foo::Bar",
1275	kind: EnumVariant,	1275	kind: EnumVariant,
1276	lookup: "Bar",	1276	lookup: "Bar",
@@ -1278,8 +1278,8 @@ mod tests {
1278	},	1278	},
1279	CompletionItem {	1279	CompletionItem {
1280	label: "Foo::Baz",	1280	label: "Foo::Baz",
1281	source_range: 219..221,	1281	source_range: 90..92,
1282	delete: 219..221,	1282	delete: 90..92,
1283	insert: "Foo::Baz",	1283	insert: "Foo::Baz",
1284	kind: EnumVariant,	1284	kind: EnumVariant,
1285	lookup: "Baz",	1285	lookup: "Baz",
@@ -1287,8 +1287,8 @@ mod tests {
1287	},	1287	},
1288	CompletionItem {	1288	CompletionItem {
1289	label: "Foo::Quux",	1289	label: "Foo::Quux",
1290	source_range: 219..221,	1290	source_range: 90..92,
1291	delete: 219..221,	1291	delete: 90..92,
1292	insert: "Foo::Quux",	1292	insert: "Foo::Quux",
1293	kind: EnumVariant,	1293	kind: EnumVariant,
1294	lookup: "Quux",	1294	lookup: "Quux",
@@ -1319,15 +1319,15 @@ mod tests {
1319	[	1319	[
1320	CompletionItem {	1320	CompletionItem {
1321	label: "Foo",	1321	label: "Foo",
1322	source_range: 185..186,	1322	source_range: 72..73,
1323	delete: 185..186,	1323	delete: 72..73,
1324	insert: "Foo",	1324	insert: "Foo",
1325	kind: Enum,	1325	kind: Enum,
1326	},	1326	},
1327	CompletionItem {	1327	CompletionItem {
1328	label: "Foo::Bar",	1328	label: "Foo::Bar",
1329	source_range: 185..186,	1329	source_range: 72..73,
1330	delete: 185..186,	1330	delete: 72..73,
1331	insert: "Foo::Bar",	1331	insert: "Foo::Bar",
1332	kind: EnumVariant,	1332	kind: EnumVariant,
1333	lookup: "Bar",	1333	lookup: "Bar",
@@ -1335,8 +1335,8 @@ mod tests {
1335	},	1335	},
1336	CompletionItem {	1336	CompletionItem {
1337	label: "Foo::Baz",	1337	label: "Foo::Baz",
1338	source_range: 185..186,	1338	source_range: 72..73,
1339	delete: 185..186,	1339	delete: 72..73,
1340	insert: "Foo::Baz",	1340	insert: "Foo::Baz",
1341	kind: EnumVariant,	1341	kind: EnumVariant,
1342	lookup: "Baz",	1342	lookup: "Baz",
@@ -1344,8 +1344,8 @@ mod tests {
1344	},	1344	},
1345	CompletionItem {	1345	CompletionItem {
1346	label: "Foo::Quux",	1346	label: "Foo::Quux",
1347	source_range: 185..186,	1347	source_range: 72..73,
1348	delete: 185..186,	1348	delete: 72..73,
1349	insert: "Foo::Quux",	1349	insert: "Foo::Quux",
1350	kind: EnumVariant,	1350	kind: EnumVariant,
1351	lookup: "Quux",	1351	lookup: "Quux",
@@ -1353,8 +1353,8 @@ mod tests {
1353	},	1353	},
1354	CompletionItem {	1354	CompletionItem {
1355	label: "main()",	1355	label: "main()",
1356	source_range: 185..186,	1356	source_range: 72..73,
1357	delete: 185..186,	1357	delete: 72..73,
1358	insert: "main()$0",	1358	insert: "main()$0",
1359	kind: Function,	1359	kind: Function,
1360	lookup: "main",	1360	lookup: "main",
@@ -1381,8 +1381,8 @@ mod tests {
1381	[	1381	[
1382	CompletionItem {	1382	CompletionItem {
1383	label: "f()",	1383	label: "f()",
1384	source_range: 98..99,	1384	source_range: 49..50,
1385	delete: 98..99,	1385	delete: 49..50,
1386	insert: "f()$0",	1386	insert: "f()$0",
1387	kind: Function,	1387	kind: Function,
1388	lookup: "f",	1388	lookup: "f",
@@ -1390,15 +1390,15 @@ mod tests {
1390	},	1390	},
1391	CompletionItem {	1391	CompletionItem {
1392	label: "m",	1392	label: "m",
1393	source_range: 98..99,	1393	source_range: 49..50,
1394	delete: 98..99,	1394	delete: 49..50,
1395	insert: "m",	1395	insert: "m",
1396	kind: Module,	1396	kind: Module,
1397	},	1397	},
1398	CompletionItem {	1398	CompletionItem {
1399	label: "m::E::V",	1399	label: "m::E::V",
1400	source_range: 98..99,	1400	source_range: 49..50,
1401	delete: 98..99,	1401	delete: 49..50,
1402	insert: "m::E::V",	1402	insert: "m::E::V",
1403	kind: EnumVariant,	1403	kind: EnumVariant,
1404	lookup: "V",	1404	lookup: "V",