diff options
Diffstat (limited to 'crates/ra_ide')
-rw-r--r-- | crates/ra_ide/src/completion/presentation.rs | 9 | ||||
-rw-r--r-- | crates/ra_ide/src/typing.rs | 40 |
2 files changed, 26 insertions, 23 deletions
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs index 910844244..253848602 100644 --- a/crates/ra_ide/src/completion/presentation.rs +++ b/crates/ra_ide/src/completion/presentation.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | //! This modules takes care of rendering various definitions as completion items. | 1 | //! This modules takes care of rendering various definitions as completion items. |
2 | 2 | ||
3 | use hir::{db::HirDatabase, Docs, HasAttrs, HasSource, HirDisplay, ScopeDef, StructKind, Type}; | 3 | use hir::{Docs, HasAttrs, HasSource, HirDisplay, ScopeDef, StructKind, Type}; |
4 | use join_to_string::join; | 4 | use join_to_string::join; |
5 | use ra_syntax::ast::NameOwner; | 5 | use ra_syntax::ast::NameOwner; |
6 | use test_utils::tested_by; | 6 | use test_utils::tested_by; |
@@ -9,7 +9,10 @@ use crate::completion::{ | |||
9 | CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions, | 9 | CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions, |
10 | }; | 10 | }; |
11 | 11 | ||
12 | use crate::display::{const_label, macro_label, type_label, FunctionSignature}; | 12 | use crate::{ |
13 | display::{const_label, macro_label, type_label, FunctionSignature}, | ||
14 | RootDatabase, | ||
15 | }; | ||
13 | 16 | ||
14 | impl Completions { | 17 | impl Completions { |
15 | pub(crate) fn add_field( | 18 | pub(crate) fn add_field( |
@@ -300,7 +303,7 @@ impl Completions { | |||
300 | } | 303 | } |
301 | } | 304 | } |
302 | 305 | ||
303 | fn is_deprecated(node: impl HasAttrs, db: &impl HirDatabase) -> bool { | 306 | fn is_deprecated(node: impl HasAttrs, db: &RootDatabase) -> bool { |
304 | node.attrs(db).by_key("deprecated").exists() | 307 | node.attrs(db).by_key("deprecated").exists() |
305 | } | 308 | } |
306 | 309 | ||
diff --git a/crates/ra_ide/src/typing.rs b/crates/ra_ide/src/typing.rs index 53c65f8bc..cb2cd2479 100644 --- a/crates/ra_ide/src/typing.rs +++ b/crates/ra_ide/src/typing.rs | |||
@@ -213,14 +213,14 @@ fn foo() { | |||
213 | type_char( | 213 | type_char( |
214 | '.', | 214 | '.', |
215 | r" | 215 | r" |
216 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 216 | fn main() { |
217 | self.child_impl(db, name) | 217 | xs.foo() |
218 | <|> | 218 | <|> |
219 | } | 219 | } |
220 | ", | 220 | ", |
221 | r" | 221 | r" |
222 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 222 | fn main() { |
223 | self.child_impl(db, name) | 223 | xs.foo() |
224 | . | 224 | . |
225 | } | 225 | } |
226 | ", | 226 | ", |
@@ -228,8 +228,8 @@ fn foo() { | |||
228 | type_char_noop( | 228 | type_char_noop( |
229 | '.', | 229 | '.', |
230 | r" | 230 | r" |
231 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 231 | fn main() { |
232 | self.child_impl(db, name) | 232 | xs.foo() |
233 | <|> | 233 | <|> |
234 | } | 234 | } |
235 | ", | 235 | ", |
@@ -241,14 +241,14 @@ fn foo() { | |||
241 | type_char( | 241 | type_char( |
242 | '.', | 242 | '.', |
243 | r" | 243 | r" |
244 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 244 | fn main() { |
245 | self.child_impl(db, name) | 245 | xs.foo() |
246 | <|>; | 246 | <|>; |
247 | } | 247 | } |
248 | ", | 248 | ", |
249 | r" | 249 | r" |
250 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 250 | fn main() { |
251 | self.child_impl(db, name) | 251 | xs.foo() |
252 | .; | 252 | .; |
253 | } | 253 | } |
254 | ", | 254 | ", |
@@ -256,8 +256,8 @@ fn foo() { | |||
256 | type_char_noop( | 256 | type_char_noop( |
257 | '.', | 257 | '.', |
258 | r" | 258 | r" |
259 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 259 | fn main() { |
260 | self.child_impl(db, name) | 260 | xs.foo() |
261 | <|>; | 261 | <|>; |
262 | } | 262 | } |
263 | ", | 263 | ", |
@@ -269,15 +269,15 @@ fn foo() { | |||
269 | type_char( | 269 | type_char( |
270 | '.', | 270 | '.', |
271 | r" | 271 | r" |
272 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 272 | fn main() { |
273 | self.child_impl(db, name) | 273 | xs.foo() |
274 | .first() | 274 | .first() |
275 | <|> | 275 | <|> |
276 | } | 276 | } |
277 | ", | 277 | ", |
278 | r" | 278 | r" |
279 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 279 | fn main() { |
280 | self.child_impl(db, name) | 280 | xs.foo() |
281 | .first() | 281 | .first() |
282 | . | 282 | . |
283 | } | 283 | } |
@@ -286,8 +286,8 @@ fn foo() { | |||
286 | type_char_noop( | 286 | type_char_noop( |
287 | '.', | 287 | '.', |
288 | r" | 288 | r" |
289 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 289 | fn main() { |
290 | self.child_impl(db, name) | 290 | xs.foo() |
291 | .first() | 291 | .first() |
292 | <|> | 292 | <|> |
293 | } | 293 | } |
@@ -334,7 +334,7 @@ fn foo() { | |||
334 | type_char_noop( | 334 | type_char_noop( |
335 | '.', | 335 | '.', |
336 | r" | 336 | r" |
337 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 337 | fn main() { |
338 | <|> | 338 | <|> |
339 | } | 339 | } |
340 | ", | 340 | ", |
@@ -342,7 +342,7 @@ fn foo() { | |||
342 | type_char_noop( | 342 | type_char_noop( |
343 | '.', | 343 | '.', |
344 | r" | 344 | r" |
345 | pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> { | 345 | fn main() { |
346 | <|> | 346 | <|> |
347 | } | 347 | } |
348 | ", | 348 | ", |