1 files changed, 215 insertions, 213 deletions
diff --git a/crates/ra_ide/src/display/structure.rs b/crates/ra_ide/src/display/structure.rs
index aad5a8e4d..c22a5d17b 100644
--- a/crates/ra_ide/src/display/structure.rs
+++ b/crates/ra_ide/src/display/structure.rs
@@ -173,12 +173,19 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
 #[cfg(test)]
 mod tests {
+    use expect::{expect, Expect};
    use super::*;
-    use insta::assert_debug_snapshot;
+    fn check(ra_fixture: &str, expect: Expect) {
+        let file = SourceFile::parse(ra_fixture).ok().unwrap();
+        let structure = file_structure(&file);
+        expect.assert_debug_eq(&structure)
+    }
    #[test]
    fn test_file_structure() {
-        let file = SourceFile::parse(
+        check(
            r#"
 struct Foo {
    x: i32
@@ -223,216 +230,211 @@ fn obsolete() {}
 #[deprecated(note = "for awhile")]
 fn very_obsolete() {}
 "#,
-        )
+            expect![[r#"
-        .ok()
+                [
-        .unwrap();
+                    StructureNode {
-        let structure = file_structure(&file);
+                        parent: None,
-        assert_debug_snapshot!(structure,
+                        label: "Foo",
-        @r###"
+                        navigation_range: 8..11,
-        [
+                        node_range: 1..26,
-            StructureNode {
+                        kind: STRUCT_DEF,
-                parent: None,
+                        detail: None,
-                label: "Foo",
+                        deprecated: false,
-                navigation_range: 8..11,
+                    },
-                node_range: 1..26,
+                    StructureNode {
-                kind: STRUCT_DEF,
+                        parent: Some(
-                detail: None,
+                            0,
-                deprecated: false,
+                        ),
-            },
+                        label: "x",
-            StructureNode {
+                        navigation_range: 18..19,
-                parent: Some(
+                        node_range: 18..24,
-                    0,
+                        kind: RECORD_FIELD_DEF,
-                ),
+                        detail: Some(
-                label: "x",
+                            "i32",
-                navigation_range: 18..19,
+                        ),
-                node_range: 18..24,
+                        deprecated: false,
-                kind: RECORD_FIELD_DEF,
+                    },
-                detail: Some(
+                    StructureNode {
-                    "i32",
+                        parent: None,
-                ),
+                        label: "m",
-                deprecated: false,
+                        navigation_range: 32..33,
-            },
+                        node_range: 28..158,
-            StructureNode {
+                        kind: MODULE,
-                parent: None,
+                        detail: None,
-                label: "m",
+                        deprecated: false,
-                navigation_range: 32..33,
+                    },
-                node_range: 28..158,
+                    StructureNode {
-                kind: MODULE,
+                        parent: Some(
-                detail: None,
+                            2,
-                deprecated: false,
+                        ),
-            },
+                        label: "bar1",
-            StructureNode {
+                        navigation_range: 43..47,
-                parent: Some(
+                        node_range: 40..52,
-                    2,
+                        kind: FN_DEF,
-                ),
+                        detail: Some(
-                label: "bar1",
+                            "fn()",
-                navigation_range: 43..47,
+                        ),
-                node_range: 40..52,
+                        deprecated: false,
-                kind: FN_DEF,
+                    },
-                detail: Some(
+                    StructureNode {
-                    "fn()",
+                        parent: Some(
-                ),
+                            2,
-                deprecated: false,
+                        ),
-            },
+                        label: "bar2",
-            StructureNode {
+                        navigation_range: 60..64,
-                parent: Some(
+                        node_range: 57..81,
-                    2,
+                        kind: FN_DEF,
-                ),
+                        detail: Some(
-                label: "bar2",
+                            "fn<T>(t: T) -> T",
-                navigation_range: 60..64,
+                        ),
-                node_range: 57..81,
+                        deprecated: false,
-                kind: FN_DEF,
+                    },
-                detail: Some(
+                    StructureNode {
-                    "fn<T>(t: T) -> T",
+                        parent: Some(
-                ),
+                            2,
-                deprecated: false,
+                        ),
-            },
+                        label: "bar3",
-            StructureNode {
+                        navigation_range: 89..93,
-                parent: Some(
+                        node_range: 86..156,
-                    2,
+                        kind: FN_DEF,
-                ),
+                        detail: Some(
-                label: "bar3",
+                            "fn<A, B>(a: A, b: B) -> Vec< u32 >",
-                navigation_range: 89..93,
+                        ),
-                node_range: 86..156,
+                        deprecated: false,
-                kind: FN_DEF,
+                    },
-                detail: Some(
+                    StructureNode {
-                    "fn<A, B>(a: A, b: B) -> Vec< u32 >",
+                        parent: None,
-                ),
+                        label: "E",
-                deprecated: false,
+                        navigation_range: 165..166,
-            },
+                        node_range: 160..180,
-            StructureNode {
+                        kind: ENUM_DEF,
-                parent: None,
+                        detail: None,
-                label: "E",
+                        deprecated: false,
-                navigation_range: 165..166,
+                    },
-                node_range: 160..180,
+                    StructureNode {
-                kind: ENUM_DEF,
+                        parent: Some(
-                detail: None,
+                            6,
-                deprecated: false,
+                        ),
-            },
+                        label: "X",
-            StructureNode {
+                        navigation_range: 169..170,
-                parent: Some(
+                        node_range: 169..170,
-                    6,
+                        kind: ENUM_VARIANT,
-                ),
+                        detail: None,
-                label: "X",
+                        deprecated: false,
-                navigation_range: 169..170,
+                    },
-                node_range: 169..170,
+                    StructureNode {
-                kind: ENUM_VARIANT,
+                        parent: Some(
-                detail: None,
+                            6,
-                deprecated: false,
+                        ),
-            },
+                        label: "Y",
-            StructureNode {
+                        navigation_range: 172..173,
-                parent: Some(
+                        node_range: 172..178,
-                    6,
+                        kind: ENUM_VARIANT,
-                ),
+                        detail: None,
-                label: "Y",
+                        deprecated: false,
-                navigation_range: 172..173,
+                    },
-                node_range: 172..178,
+                    StructureNode {
-                kind: ENUM_VARIANT,
+                        parent: None,
-                detail: None,
+                        label: "T",
-                deprecated: false,
+                        navigation_range: 186..187,
-            },
+                        node_range: 181..193,
-            StructureNode {
+                        kind: TYPE_ALIAS_DEF,
-                parent: None,
+                        detail: Some(
-                label: "T",
+                            "()",
-                navigation_range: 186..187,
+                        ),
-                node_range: 181..193,
+                        deprecated: false,
-                kind: TYPE_ALIAS_DEF,
+                    },
-                detail: Some(
+                    StructureNode {
-                    "()",
+                        parent: None,
-                ),
+                        label: "S",
-                deprecated: false,
+                        navigation_range: 201..202,
-            },
+                        node_range: 194..213,
-            StructureNode {
+                        kind: STATIC_DEF,
-                parent: None,
+                        detail: Some(
-                label: "S",
+                            "i32",
-                navigation_range: 201..202,
+                        ),
-                node_range: 194..213,
+                        deprecated: false,
-                kind: STATIC_DEF,
+                    },
-                detail: Some(
+                    StructureNode {
-                    "i32",
+                        parent: None,
-                ),
+                        label: "C",
-                deprecated: false,
+                        navigation_range: 220..221,
-            },
+                        node_range: 214..232,
-            StructureNode {
+                        kind: CONST_DEF,
-                parent: None,
+                        detail: Some(
-                label: "C",
+                            "i32",
-                navigation_range: 220..221,
+                        ),
-                node_range: 214..232,
+                        deprecated: false,
-                kind: CONST_DEF,
+                    },
-                detail: Some(
+                    StructureNode {
-                    "i32",
+                        parent: None,
-                ),
+                        label: "impl E",
-                deprecated: false,
+                        navigation_range: 239..240,
-            },
+                        node_range: 234..243,
-            StructureNode {
+                        kind: IMPL_DEF,
-                parent: None,
+                        detail: None,
-                label: "impl E",
+                        deprecated: false,
-                navigation_range: 239..240,
+                    },
-                node_range: 234..243,
+                    StructureNode {
-                kind: IMPL_DEF,
+                        parent: None,
-                detail: None,
+                        label: "impl fmt::Debug for E",
-                deprecated: false,
+                        navigation_range: 265..266,
-            },
+                        node_range: 245..269,
-            StructureNode {
+                        kind: IMPL_DEF,
-                parent: None,
+                        detail: None,
-                label: "impl fmt::Debug for E",
+                        deprecated: false,
-                navigation_range: 265..266,
+                    },
-                node_range: 245..269,
+                    StructureNode {
-                kind: IMPL_DEF,
+                        parent: None,
-                detail: None,
+                        label: "mc",
-                deprecated: false,
+                        navigation_range: 284..286,
-            },
+                        node_range: 271..303,
-            StructureNode {
+                        kind: MACRO_CALL,
-                parent: None,
+                        detail: None,
-                label: "mc",
+                        deprecated: false,
-                navigation_range: 284..286,
+                    },
-                node_range: 271..303,
+                    StructureNode {
-                kind: MACRO_CALL,
+                        parent: None,
-                detail: None,
+                        label: "mcexp",
-                deprecated: false,
+                        navigation_range: 334..339,
-            },
+                        node_range: 305..356,
-            StructureNode {
+                        kind: MACRO_CALL,
-                parent: None,
+                        detail: None,
-                label: "mcexp",
+                        deprecated: false,
-                navigation_range: 334..339,
+                    },
-                node_range: 305..356,
+                    StructureNode {
-                kind: MACRO_CALL,
+                        parent: None,
-                detail: None,
+                        label: "mcexp",
-                deprecated: false,
+                        navigation_range: 387..392,
-            },
+                        node_range: 358..409,
-            StructureNode {
+                        kind: MACRO_CALL,
-                parent: None,
+                        detail: None,
-                label: "mcexp",
+                        deprecated: false,
-                navigation_range: 387..392,
+                    },
-                node_range: 358..409,
+                    StructureNode {
-                kind: MACRO_CALL,
+                        parent: None,
-                detail: None,
+                        label: "obsolete",
-                deprecated: false,
+                        navigation_range: 428..436,
-            },
+                        node_range: 411..441,
-            StructureNode {
+                        kind: FN_DEF,
-                parent: None,
+                        detail: Some(
-                label: "obsolete",
+                            "fn()",
-                navigation_range: 428..436,
+                        ),
-                node_range: 411..441,
+                        deprecated: true,
-                kind: FN_DEF,
+                    },
-                detail: Some(
+                    StructureNode {
-                    "fn()",
+                        parent: None,
-                ),
+                        label: "very_obsolete",
-                deprecated: true,
+                        navigation_range: 481..494,
-            },
+                        node_range: 443..499,
-            StructureNode {
+                        kind: FN_DEF,
-                parent: None,
+                        detail: Some(
-                label: "very_obsolete",
+                            "fn()",
-                navigation_range: 481..494,
+                        ),
-                node_range: 443..499,
+                        deprecated: true,
-                kind: FN_DEF,
+                    },
-                detail: Some(
+                ]
-                    "fn()",
+            "#]],
-                ),
+        );
-                deprecated: true,
-            },
-        ]
-        "###
-                );
    }
 }

diff --git a/crates/ra_ide/src/display/structure.rs b/crates/ra_ide/src/display/structure.rs index aad5a8e4d..c22a5d17b 100644 --- a/crates/ra_ide/src/display/structure.rs +++ b/crates/ra_ide/src/display/structure.rs
@@ -173,12 +173,19 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
173		173
174	#[cfg(test)]	174	#[cfg(test)]
175	mod tests {	175	mod tests {
		176	use expect::{expect, Expect};
		177
176	use super::*;	178	use super::*;
177	use insta::assert_debug_snapshot;	179
		180	fn check(ra_fixture: &str, expect: Expect) {
		181	let file = SourceFile::parse(ra_fixture).ok().unwrap();
		182	let structure = file_structure(&file);
		183	expect.assert_debug_eq(&structure)
		184	}
178		185
179	#[test]	186	#[test]
180	fn test_file_structure() {	187	fn test_file_structure() {
181	let file = SourceFile::parse(	188	check(
182	r#"	189	r#"
183	struct Foo {	190	struct Foo {
184	x: i32	191	x: i32
@@ -223,216 +230,211 @@ fn obsolete() {}
223	#[deprecated(note = "for awhile")]	230	#[deprecated(note = "for awhile")]
224	fn very_obsolete() {}	231	fn very_obsolete() {}
225	"#,	232	"#,
226	)	233	expect![[r#"
227	.ok()	234	[
228	.unwrap();	235	StructureNode {
229	let structure = file_structure(&file);	236	parent: None,
230	assert_debug_snapshot!(structure,	237	label: "Foo",
231	@r###"	238	navigation_range: 8..11,
232	[	239	node_range: 1..26,
233	StructureNode {	240	kind: STRUCT_DEF,
234	parent: None,	241	detail: None,
235	label: "Foo",	242	deprecated: false,
236	navigation_range: 8..11,	243	},
237	node_range: 1..26,	244	StructureNode {
238	kind: STRUCT_DEF,	245	parent: Some(
239	detail: None,	246	0,
240	deprecated: false,	247	),
241	},	248	label: "x",
242	StructureNode {	249	navigation_range: 18..19,
243	parent: Some(	250	node_range: 18..24,
244	0,	251	kind: RECORD_FIELD_DEF,
245	),	252	detail: Some(
246	label: "x",	253	"i32",
247	navigation_range: 18..19,	254	),
248	node_range: 18..24,	255	deprecated: false,
249	kind: RECORD_FIELD_DEF,	256	},
250	detail: Some(	257	StructureNode {
251	"i32",	258	parent: None,
252	),	259	label: "m",
253	deprecated: false,	260	navigation_range: 32..33,
254	},	261	node_range: 28..158,
255	StructureNode {	262	kind: MODULE,
256	parent: None,	263	detail: None,
257	label: "m",	264	deprecated: false,
258	navigation_range: 32..33,	265	},
259	node_range: 28..158,	266	StructureNode {
260	kind: MODULE,	267	parent: Some(
261	detail: None,	268	2,
262	deprecated: false,	269	),
263	},	270	label: "bar1",
264	StructureNode {	271	navigation_range: 43..47,
265	parent: Some(	272	node_range: 40..52,
266	2,	273	kind: FN_DEF,
267	),	274	detail: Some(
268	label: "bar1",	275	"fn()",
269	navigation_range: 43..47,	276	),
270	node_range: 40..52,	277	deprecated: false,
271	kind: FN_DEF,	278	},
272	detail: Some(	279	StructureNode {
273	"fn()",	280	parent: Some(
274	),	281	2,
275	deprecated: false,	282	),
276	},	283	label: "bar2",
277	StructureNode {	284	navigation_range: 60..64,
278	parent: Some(	285	node_range: 57..81,
279	2,	286	kind: FN_DEF,
280	),	287	detail: Some(
281	label: "bar2",	288	"fn<T>(t: T) -> T",
282	navigation_range: 60..64,	289	),
283	node_range: 57..81,	290	deprecated: false,
284	kind: FN_DEF,	291	},
285	detail: Some(	292	StructureNode {
286	"fn<T>(t: T) -> T",	293	parent: Some(
287	),	294	2,
288	deprecated: false,	295	),
289	},	296	label: "bar3",
290	StructureNode {	297	navigation_range: 89..93,
291	parent: Some(	298	node_range: 86..156,
292	2,	299	kind: FN_DEF,
293	),	300	detail: Some(
294	label: "bar3",	301	"fn<A, B>(a: A, b: B) -> Vec< u32 >",
295	navigation_range: 89..93,	302	),
296	node_range: 86..156,	303	deprecated: false,
297	kind: FN_DEF,	304	},
298	detail: Some(	305	StructureNode {
299	"fn<A, B>(a: A, b: B) -> Vec< u32 >",	306	parent: None,
300	),	307	label: "E",
301	deprecated: false,	308	navigation_range: 165..166,
302	},	309	node_range: 160..180,
303	StructureNode {	310	kind: ENUM_DEF,
304	parent: None,	311	detail: None,
305	label: "E",	312	deprecated: false,
306	navigation_range: 165..166,	313	},
307	node_range: 160..180,	314	StructureNode {
308	kind: ENUM_DEF,	315	parent: Some(
309	detail: None,	316	6,
310	deprecated: false,	317	),
311	},	318	label: "X",
312	StructureNode {	319	navigation_range: 169..170,
313	parent: Some(	320	node_range: 169..170,
314	6,	321	kind: ENUM_VARIANT,
315	),	322	detail: None,
316	label: "X",	323	deprecated: false,
317	navigation_range: 169..170,	324	},
318	node_range: 169..170,	325	StructureNode {
319	kind: ENUM_VARIANT,	326	parent: Some(
320	detail: None,	327	6,
321	deprecated: false,	328	),
322	},	329	label: "Y",
323	StructureNode {	330	navigation_range: 172..173,
324	parent: Some(	331	node_range: 172..178,
325	6,	332	kind: ENUM_VARIANT,
326	),	333	detail: None,
327	label: "Y",	334	deprecated: false,
328	navigation_range: 172..173,	335	},
329	node_range: 172..178,	336	StructureNode {
330	kind: ENUM_VARIANT,	337	parent: None,
331	detail: None,	338	label: "T",
332	deprecated: false,	339	navigation_range: 186..187,
333	},	340	node_range: 181..193,
334	StructureNode {	341	kind: TYPE_ALIAS_DEF,
335	parent: None,	342	detail: Some(
336	label: "T",	343	"()",
337	navigation_range: 186..187,	344	),
338	node_range: 181..193,	345	deprecated: false,
339	kind: TYPE_ALIAS_DEF,	346	},
340	detail: Some(	347	StructureNode {
341	"()",	348	parent: None,
342	),	349	label: "S",
343	deprecated: false,	350	navigation_range: 201..202,
344	},	351	node_range: 194..213,
345	StructureNode {	352	kind: STATIC_DEF,
346	parent: None,	353	detail: Some(
347	label: "S",	354	"i32",
348	navigation_range: 201..202,	355	),
349	node_range: 194..213,	356	deprecated: false,
350	kind: STATIC_DEF,	357	},
351	detail: Some(	358	StructureNode {
352	"i32",	359	parent: None,
353	),	360	label: "C",
354	deprecated: false,	361	navigation_range: 220..221,
355	},	362	node_range: 214..232,
356	StructureNode {	363	kind: CONST_DEF,
357	parent: None,	364	detail: Some(
358	label: "C",	365	"i32",
359	navigation_range: 220..221,	366	),
360	node_range: 214..232,	367	deprecated: false,
361	kind: CONST_DEF,	368	},
362	detail: Some(	369	StructureNode {
363	"i32",	370	parent: None,
364	),	371	label: "impl E",
365	deprecated: false,	372	navigation_range: 239..240,
366	},	373	node_range: 234..243,
367	StructureNode {	374	kind: IMPL_DEF,
368	parent: None,	375	detail: None,
369	label: "impl E",	376	deprecated: false,
370	navigation_range: 239..240,	377	},
371	node_range: 234..243,	378	StructureNode {
372	kind: IMPL_DEF,	379	parent: None,
373	detail: None,	380	label: "impl fmt::Debug for E",
374	deprecated: false,	381	navigation_range: 265..266,
375	},	382	node_range: 245..269,
376	StructureNode {	383	kind: IMPL_DEF,
377	parent: None,	384	detail: None,
378	label: "impl fmt::Debug for E",	385	deprecated: false,
379	navigation_range: 265..266,	386	},
380	node_range: 245..269,	387	StructureNode {
381	kind: IMPL_DEF,	388	parent: None,
382	detail: None,	389	label: "mc",
383	deprecated: false,	390	navigation_range: 284..286,
384	},	391	node_range: 271..303,
385	StructureNode {	392	kind: MACRO_CALL,
386	parent: None,	393	detail: None,
387	label: "mc",	394	deprecated: false,
388	navigation_range: 284..286,	395	},
389	node_range: 271..303,	396	StructureNode {
390	kind: MACRO_CALL,	397	parent: None,
391	detail: None,	398	label: "mcexp",
392	deprecated: false,	399	navigation_range: 334..339,
393	},	400	node_range: 305..356,
394	StructureNode {	401	kind: MACRO_CALL,
395	parent: None,	402	detail: None,
396	label: "mcexp",	403	deprecated: false,
397	navigation_range: 334..339,	404	},
398	node_range: 305..356,	405	StructureNode {
399	kind: MACRO_CALL,	406	parent: None,
400	detail: None,	407	label: "mcexp",
401	deprecated: false,	408	navigation_range: 387..392,
402	},	409	node_range: 358..409,
403	StructureNode {	410	kind: MACRO_CALL,
404	parent: None,	411	detail: None,
405	label: "mcexp",	412	deprecated: false,
406	navigation_range: 387..392,	413	},
407	node_range: 358..409,	414	StructureNode {
408	kind: MACRO_CALL,	415	parent: None,
409	detail: None,	416	label: "obsolete",
410	deprecated: false,	417	navigation_range: 428..436,
411	},	418	node_range: 411..441,
412	StructureNode {	419	kind: FN_DEF,
413	parent: None,	420	detail: Some(
414	label: "obsolete",	421	"fn()",
415	navigation_range: 428..436,	422	),
416	node_range: 411..441,	423	deprecated: true,
417	kind: FN_DEF,	424	},
418	detail: Some(	425	StructureNode {
419	"fn()",	426	parent: None,
420	),	427	label: "very_obsolete",
421	deprecated: true,	428	navigation_range: 481..494,
422	},	429	node_range: 443..499,
423	StructureNode {	430	kind: FN_DEF,
424	parent: None,	431	detail: Some(
425	label: "very_obsolete",	432	"fn()",
426	navigation_range: 481..494,	433	),
427	node_range: 443..499,	434	deprecated: true,
428	kind: FN_DEF,	435	},
429	detail: Some(	436	]
430	"fn()",	437	"#]],
431	),	438	);
432	deprecated: true,
433	},
434	]
435	"###
436	);
437	}	439	}
438	}	440	}