1 files changed, 96 insertions, 89 deletions
diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index 28c8324d0..b4df6ee2a 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -119,27 +119,28 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "foo",
+                label: "foo()",
-       ⋮        source_range: [187; 187),
+                source_range: [187; 187),
-       ⋮        delete: [187; 187),
+                delete: [187; 187),
-       ⋮        insert: "foo()$0",
+                insert: "foo()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn foo(self)",
+                lookup: "foo",
-       ⋮    },
+                detail: "fn foo(self)",
-       ⋮    CompletionItem {
+            },
-       ⋮        label: "the_field",
+            CompletionItem {
-       ⋮        source_range: [187; 187),
+                label: "the_field",
-       ⋮        delete: [187; 187),
+                source_range: [187; 187),
-       ⋮        insert: "the_field",
+                delete: [187; 187),
-       ⋮        kind: Field,
+                insert: "the_field",
-       ⋮        detail: "(u32,)",
+                kind: Field,
-       ⋮        documentation: Documentation(
+                detail: "(u32,)",
-       ⋮            "This is the_field",
+                documentation: Documentation(
-       ⋮        ),
+                    "This is the_field",
-       ⋮    },
+                ),
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -158,24 +159,25 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "foo",
+                label: "foo()",
-       ⋮        source_range: [126; 126),
+                source_range: [126; 126),
-       ⋮        delete: [126; 126),
+                delete: [126; 126),
-       ⋮        insert: "foo()$0",
+                insert: "foo()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn foo(&self)",
+                lookup: "foo",
-       ⋮    },
+                detail: "fn foo(&self)",
-       ⋮    CompletionItem {
+            },
-       ⋮        label: "the_field",
+            CompletionItem {
-       ⋮        source_range: [126; 126),
+                label: "the_field",
-       ⋮        delete: [126; 126),
+                source_range: [126; 126),
-       ⋮        insert: "the_field",
+                delete: [126; 126),
-       ⋮        kind: Field,
+                insert: "the_field",
-       ⋮        detail: "(u32, i32)",
+                kind: Field,
-       ⋮    },
+                detail: "(u32, i32)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -210,16 +212,17 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "the_method",
+                label: "the_method()",
-       ⋮        source_range: [144; 144),
+                source_range: [144; 144),
-       ⋮        delete: [144; 144),
+                delete: [144; 144),
-       ⋮        insert: "the_method()$0",
+                insert: "the_method()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn the_method(&self)",
+                lookup: "the_method",
-       ⋮    },
+                detail: "fn the_method(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -238,16 +241,17 @@ mod tests {
            ",
            ),
            @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "the_method",
+                label: "the_method()",
-       ⋮        source_range: [151; 151),
+                source_range: [151; 151),
-       ⋮        delete: [151; 151),
+                delete: [151; 151),
-       ⋮        insert: "the_method()$0",
+                insert: "the_method()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn the_method(&self)",
+                lookup: "the_method",
-       ⋮    },
+                detail: "fn the_method(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -266,16 +270,17 @@ mod tests {
            ",
            ),
            @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "the_method",
+                label: "the_method()",
-       ⋮        source_range: [155; 155),
+                source_range: [155; 155),
-       ⋮        delete: [155; 155),
+                delete: [155; 155),
-       ⋮        insert: "the_method()$0",
+                insert: "the_method()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn the_method(&self)",
+                lookup: "the_method",
-       ⋮    },
+                detail: "fn the_method(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -317,16 +322,17 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "the_method",
+                label: "the_method()",
-       ⋮        source_range: [249; 249),
+                source_range: [249; 249),
-       ⋮        delete: [249; 249),
+                delete: [249; 249),
-       ⋮        insert: "the_method()$0",
+                insert: "the_method()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn the_method(&self)",
+                lookup: "the_method",
-       ⋮    },
+                detail: "fn the_method(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -386,16 +392,17 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "blah",
+                label: "blah()",
-       ⋮        source_range: [299; 300),
+                source_range: [299; 300),
-       ⋮        delete: [299; 300),
+                delete: [299; 300),
-       ⋮        insert: "blah()$0",
+                insert: "blah()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "pub fn blah(&self)",
+                lookup: "blah",
-       ⋮    },
+                detail: "pub fn blah(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }

diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs index 28c8324d0..b4df6ee2a 100644 --- a/crates/ra_ide_api/src/completion/complete_dot.rs +++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -119,27 +119,28 @@ mod tests {
119	",	119	",
120	),	120	),
121	@r###"	121	@r###"
122	⋮[	122	[
123	⋮ CompletionItem {	123	CompletionItem {
124	⋮ label: "foo",	124	label: "foo()",
125	⋮ source_range: [187; 187),	125	source_range: [187; 187),
126	⋮ delete: [187; 187),	126	delete: [187; 187),
127	⋮ insert: "foo()$0",	127	insert: "foo()$0",
128	⋮ kind: Method,	128	kind: Method,
129	⋮ detail: "fn foo(self)",	129	lookup: "foo",
130	⋮ },	130	detail: "fn foo(self)",
131	⋮ CompletionItem {	131	},
132	⋮ label: "the_field",	132	CompletionItem {
133	⋮ source_range: [187; 187),	133	label: "the_field",
134	⋮ delete: [187; 187),	134	source_range: [187; 187),
135	⋮ insert: "the_field",	135	delete: [187; 187),
136	⋮ kind: Field,	136	insert: "the_field",
137	⋮ detail: "(u32,)",	137	kind: Field,
138	⋮ documentation: Documentation(	138	detail: "(u32,)",
139	⋮ "This is the_field",	139	documentation: Documentation(
140	⋮ ),	140	"This is the_field",
141	⋮ },	141	),
142	⋮]	142	},
		143	]
143	"###	144	"###
144	);	145	);
145	}	146	}
@@ -158,24 +159,25 @@ mod tests {
158	",	159	",
159	),	160	),
160	@r###"	161	@r###"
161	⋮[	162	[
162	⋮ CompletionItem {	163	CompletionItem {
163	⋮ label: "foo",	164	label: "foo()",
164	⋮ source_range: [126; 126),	165	source_range: [126; 126),
165	⋮ delete: [126; 126),	166	delete: [126; 126),
166	⋮ insert: "foo()$0",	167	insert: "foo()$0",
167	⋮ kind: Method,	168	kind: Method,
168	⋮ detail: "fn foo(&self)",	169	lookup: "foo",
169	⋮ },	170	detail: "fn foo(&self)",
170	⋮ CompletionItem {	171	},
171	⋮ label: "the_field",	172	CompletionItem {
172	⋮ source_range: [126; 126),	173	label: "the_field",
173	⋮ delete: [126; 126),	174	source_range: [126; 126),
174	⋮ insert: "the_field",	175	delete: [126; 126),
175	⋮ kind: Field,	176	insert: "the_field",
176	⋮ detail: "(u32, i32)",	177	kind: Field,
177	⋮ },	178	detail: "(u32, i32)",
178	⋮]	179	},
		180	]
179	"###	181	"###
180	);	182	);
181	}	183	}
@@ -210,16 +212,17 @@ mod tests {
210	",	212	",
211	),	213	),
212	@r###"	214	@r###"
213	⋮[	215	[
214	⋮ CompletionItem {	216	CompletionItem {
215	⋮ label: "the_method",	217	label: "the_method()",
216	⋮ source_range: [144; 144),	218	source_range: [144; 144),
217	⋮ delete: [144; 144),	219	delete: [144; 144),
218	⋮ insert: "the_method()$0",	220	insert: "the_method()$0",
219	⋮ kind: Method,	221	kind: Method,
220	⋮ detail: "fn the_method(&self)",	222	lookup: "the_method",
221	⋮ },	223	detail: "fn the_method(&self)",
222	⋮]	224	},
		225	]
223	"###	226	"###
224	);	227	);
225	}	228	}
@@ -238,16 +241,17 @@ mod tests {
238	",	241	",
239	),	242	),
240	@r###"	243	@r###"
241	⋮[	244	[
242	⋮ CompletionItem {	245	CompletionItem {
243	⋮ label: "the_method",	246	label: "the_method()",
244	⋮ source_range: [151; 151),	247	source_range: [151; 151),
245	⋮ delete: [151; 151),	248	delete: [151; 151),
246	⋮ insert: "the_method()$0",	249	insert: "the_method()$0",
247	⋮ kind: Method,	250	kind: Method,
248	⋮ detail: "fn the_method(&self)",	251	lookup: "the_method",
249	⋮ },	252	detail: "fn the_method(&self)",
250	⋮]	253	},
		254	]
251	"###	255	"###
252	);	256	);
253	}	257	}
@@ -266,16 +270,17 @@ mod tests {
266	",	270	",
267	),	271	),
268	@r###"	272	@r###"
269	⋮[	273	[
270	⋮ CompletionItem {	274	CompletionItem {
271	⋮ label: "the_method",	275	label: "the_method()",
272	⋮ source_range: [155; 155),	276	source_range: [155; 155),
273	⋮ delete: [155; 155),	277	delete: [155; 155),
274	⋮ insert: "the_method()$0",	278	insert: "the_method()$0",
275	⋮ kind: Method,	279	kind: Method,
276	⋮ detail: "fn the_method(&self)",	280	lookup: "the_method",
277	⋮ },	281	detail: "fn the_method(&self)",
278	⋮]	282	},
		283	]
279	"###	284	"###
280	);	285	);
281	}	286	}
@@ -317,16 +322,17 @@ mod tests {
317	",	322	",
318	),	323	),
319	@r###"	324	@r###"
320	⋮[	325	[
321	⋮ CompletionItem {	326	CompletionItem {
322	⋮ label: "the_method",	327	label: "the_method()",
323	⋮ source_range: [249; 249),	328	source_range: [249; 249),
324	⋮ delete: [249; 249),	329	delete: [249; 249),
325	⋮ insert: "the_method()$0",	330	insert: "the_method()$0",
326	⋮ kind: Method,	331	kind: Method,
327	⋮ detail: "fn the_method(&self)",	332	lookup: "the_method",
328	⋮ },	333	detail: "fn the_method(&self)",
329	⋮]	334	},
		335	]
330	"###	336	"###
331	);	337	);
332	}	338	}
@@ -386,16 +392,17 @@ mod tests {
386	",	392	",
387	),	393	),
388	@r###"	394	@r###"
389	⋮[	395	[
390	⋮ CompletionItem {	396	CompletionItem {
391	⋮ label: "blah",	397	label: "blah()",
392	⋮ source_range: [299; 300),	398	source_range: [299; 300),
393	⋮ delete: [299; 300),	399	delete: [299; 300),
394	⋮ insert: "blah()$0",	400	insert: "blah()$0",
395	⋮ kind: Method,	401	kind: Method,
396	⋮ detail: "pub fn blah(&self)",	402	lookup: "blah",
397	⋮ },	403	detail: "pub fn blah(&self)",
398	⋮]	404	},
		405	]
399	"###	406	"###
400	);	407	);
401	}	408	}