aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir/src/name.rs2
-rw-r--r--crates/ra_hir/src/nameres/tests.rs274
-rw-r--r--crates/ra_hir/src/nameres/tests/globs.rs76
-rw-r--r--crates/ra_hir/src/nameres/tests/macros.rs54
-rw-r--r--crates/ra_syntax/Cargo.toml2
5 files changed, 196 insertions, 212 deletions
diff --git a/crates/ra_hir/src/name.rs b/crates/ra_hir/src/name.rs
index 9a999e66c..e3a82cf03 100644
--- a/crates/ra_hir/src/name.rs
+++ b/crates/ra_hir/src/name.rs
@@ -5,7 +5,7 @@ use ra_syntax::{ast, SmolStr};
5/// `Name` is a wrapper around string, which is used in hir for both references 5/// `Name` is a wrapper around string, which is used in hir for both references
6/// and declarations. In theory, names should also carry hygiene info, but we are 6/// and declarations. In theory, names should also carry hygiene info, but we are
7/// not there yet! 7/// not there yet!
8#[derive(Clone, PartialEq, Eq, Hash)] 8#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
9pub struct Name { 9pub struct Name {
10 text: SmolStr, 10 text: SmolStr,
11} 11}
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 572bd1bf7..958871b17 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -8,7 +8,11 @@ use ra_db::SourceDatabase;
8use test_utils::covers; 8use test_utils::covers;
9use insta::assert_snapshot_matches; 9use insta::assert_snapshot_matches;
10 10
11use crate::{Crate, mock::{MockDatabase, CrateGraphFixture}, nameres::Resolution}; 11use crate::{
12 Crate,
13 mock::{MockDatabase, CrateGraphFixture},
14 nameres::Resolution,
15};
12 16
13use super::*; 17use super::*;
14 18
@@ -25,12 +29,15 @@ fn compute_crate_def_map(fixture: &str, graph: Option<CrateGraphFixture>) -> Arc
25fn render_crate_def_map(map: &CrateDefMap) -> String { 29fn render_crate_def_map(map: &CrateDefMap) -> String {
26 let mut buf = String::new(); 30 let mut buf = String::new();
27 go(&mut buf, map, "\ncrate", map.root); 31 go(&mut buf, map, "\ncrate", map.root);
28 return buf; 32 return buf.trim().to_string();
29 33
30 fn go(buf: &mut String, map: &CrateDefMap, path: &str, module: CrateModuleId) { 34 fn go(buf: &mut String, map: &CrateDefMap, path: &str, module: CrateModuleId) {
31 *buf += path; 35 *buf += path;
32 *buf += "\n"; 36 *buf += "\n";
33 for (name, res) in map.modules[module].scope.items.iter() { 37
38 let mut entries = map.modules[module].scope.items.iter().collect::<Vec<_>>();
39 entries.sort_by_key(|(name, _)| *name);
40 for (name, res) in entries {
34 *buf += &format!("{}: {}\n", name, dump_resolution(res)) 41 *buf += &format!("{}: {}\n", name, dump_resolution(res))
35 } 42 }
36 for (name, child) in map.modules[module].children.iter() { 43 for (name, child) in map.modules[module].children.iter() {
@@ -79,21 +86,20 @@ fn crate_def_map_smoke_test() {
79 ", 86 ",
80 ); 87 );
81 assert_snapshot_matches!(map, @r###" 88 assert_snapshot_matches!(map, @r###"
82crate 89 ⋮crate
83V: t v 90 ⋮E: t
84E: t 91 ⋮S: t v
85foo: t 92 ⋮V: t v
86S: t v 93 ⋮foo: t
87 94
88crate::foo 95 ⋮crate::foo
89bar: t 96 ⋮bar: t
90f: v 97 ⋮f: v
91 98
92crate::foo::bar 99 ⋮crate::foo::bar
93Baz: t v 100 ⋮Baz: t v
94E: t 101 ⋮E: t
95"### 102 "###)
96 )
97} 103}
98 104
99#[test] 105#[test]
@@ -113,12 +119,12 @@ fn bogus_paths() {
113 ", 119 ",
114 ); 120 );
115 assert_snapshot_matches!(map, @r###" 121 assert_snapshot_matches!(map, @r###"
116crate 122crate
117foo: t 123 ⋮S: t v
118S: t v 124 ⋮foo: t
119 125
120crate::foo 126crate::foo
121"### 127 "###
122 ) 128 )
123} 129}
124 130
@@ -137,13 +143,13 @@ fn use_as() {
137 ); 143 );
138 assert_snapshot_matches!(map, 144 assert_snapshot_matches!(map,
139 @r###" 145 @r###"
140crate 146crate
141Foo: t v 147Foo: t v
142foo: t 148foo: t
143 149
144crate::foo 150crate::foo
145Baz: t v 151Baz: t v
146"### 152 "###
147 ); 153 );
148} 154}
149 155
@@ -164,21 +170,19 @@ fn use_trees() {
164 pub enum Quux {}; 170 pub enum Quux {};
165 ", 171 ",
166 ); 172 );
167 assert_snapshot_matches!(map, 173 assert_snapshot_matches!(map, @r###"
168 @r###" 174 ⋮crate
169crate 175 ⋮Baz: t v
170Quux: t 176 ⋮Quux: t
171Baz: t v 177 ⋮foo: t
172foo: t 178
173 179 ⋮crate::foo
174crate::foo 180 ⋮bar: t
175bar: t 181
176 182 ⋮crate::foo::bar
177crate::foo::bar 183 ⋮Baz: t v
178Quux: t 184 ⋮Quux: t
179Baz: t v 185 "###);
180"###
181 );
182} 186}
183 187
184#[test] 188#[test]
@@ -199,20 +203,18 @@ fn re_exports() {
199 pub struct Baz; 203 pub struct Baz;
200 ", 204 ",
201 ); 205 );
202 assert_snapshot_matches!(map, 206 assert_snapshot_matches!(map, @r###"
203 @r###" 207 ⋮crate
204crate 208 ⋮Baz: t v
205Baz: t v 209 ⋮foo: t
206foo: t 210
207 211 ⋮crate::foo
208crate::foo 212 ⋮Baz: t v
209bar: t 213 ⋮bar: t
210Baz: t v 214
211 215 ⋮crate::foo::bar
212crate::foo::bar 216 ⋮Baz: t v
213Baz: t v 217 "###);
214"###
215 );
216} 218}
217 219
218#[test] 220#[test]
@@ -237,10 +239,10 @@ fn std_prelude() {
237 }, 239 },
238 ); 240 );
239 assert_snapshot_matches!(map, @r###" 241 assert_snapshot_matches!(map, @r###"
240crate 242crate
241Bar: t v 243Bar: t v
242Baz: t v 244Baz: t v
243"###); 245 "###);
244} 246}
245 247
246#[test] 248#[test]
@@ -254,10 +256,10 @@ fn can_import_enum_variant() {
254 ", 256 ",
255 ); 257 );
256 assert_snapshot_matches!(map, @r###" 258 assert_snapshot_matches!(map, @r###"
257crate 259crate
258V: t v 260 ⋮E: t
259E: t 261 ⋮V: t v
260"### 262 "###
261 ); 263 );
262} 264}
263 265
@@ -285,20 +287,18 @@ fn edition_2015_imports() {
285 }, 287 },
286 ); 288 );
287 289
288 assert_snapshot_matches!(map, 290 assert_snapshot_matches!(map, @r###"
289 @r###" 291 ⋮crate
290crate 292 ⋮bar: t
291bar: t 293 ⋮foo: t
292foo: t 294
293 295 ⋮crate::bar
294crate::bar 296 ⋮Bar: t v
295Bar: t v 297
296 298 ⋮crate::foo
297crate::foo 299 ⋮Bar: t v
298FromLib: t v 300 ⋮FromLib: t v
299Bar: t v 301 "###);
300"###
301 );
302} 302}
303 303
304#[test] 304#[test]
@@ -317,16 +317,14 @@ fn module_resolution_works_for_non_standard_filenames() {
317 }, 317 },
318 ); 318 );
319 319
320 assert_snapshot_matches!(map, 320 assert_snapshot_matches!(map, @r###"
321 @r###" 321 ⋮crate
322crate 322 ⋮Bar: t v
323Bar: t v 323 ⋮foo: t
324foo: t 324
325 325 ⋮crate::foo
326crate::foo 326 ⋮Bar: t v
327Bar: t v 327 "###);
328"###
329 );
330} 328}
331 329
332#[test] 330#[test]
@@ -348,12 +346,10 @@ fn name_res_works_for_broken_modules() {
348 pub struct Baz; 346 pub struct Baz;
349 ", 347 ",
350 ); 348 );
351 assert_snapshot_matches!(map, 349 assert_snapshot_matches!(map, @r###"
352 @r###" 350 ⋮crate
353crate 351 ⋮Baz: _
354Baz: _ 352 "###);
355"###
356 );
357} 353}
358 354
359#[test] 355#[test]
@@ -369,19 +365,17 @@ fn item_map_using_self() {
369 pub struct Baz; 365 pub struct Baz;
370 ", 366 ",
371 ); 367 );
372 assert_snapshot_matches!(map, 368 assert_snapshot_matches!(map, @r###"
373 @r###" 369 ⋮crate
374crate 370 ⋮Baz: t v
375Baz: t v 371 ⋮foo: t
376foo: t 372
377 373 ⋮crate::foo
378crate::foo 374 ⋮bar: t
379bar: t 375
380 376 ⋮crate::foo::bar
381crate::foo::bar 377 ⋮Baz: t v
382Baz: t v 378 "###);
383"###
384 );
385} 379}
386 380
387#[test] 381#[test]
@@ -400,12 +394,10 @@ fn item_map_across_crates() {
400 }, 394 },
401 ); 395 );
402 396
403 assert_snapshot_matches!(map, 397 assert_snapshot_matches!(map, @r###"
404 @r###" 398 ⋮crate
405crate 399 ⋮Baz: t v
406Baz: t v 400 "###);
407"###
408 );
409} 401}
410 402
411#[test] 403#[test]
@@ -430,12 +422,10 @@ fn extern_crate_rename() {
430 }, 422 },
431 ); 423 );
432 424
433 assert_snapshot_matches!(map, 425 assert_snapshot_matches!(map, @r###"
434 @r###" 426 ⋮crate
435crate 427 ⋮Arc: t v
436Arc: t v 428 "###);
437"###
438 );
439} 429}
440 430
441#[test] 431#[test]
@@ -462,9 +452,9 @@ fn extern_crate_rename_2015_edition() {
462 452
463 assert_snapshot_matches!(map, 453 assert_snapshot_matches!(map,
464 @r###" 454 @r###"
465crate 455crate
466Arc: t v 456Arc: t v
467"### 457 "###
468 ); 458 );
469} 459}
470 460
@@ -490,12 +480,10 @@ fn import_across_source_roots() {
490 }, 480 },
491 ); 481 );
492 482
493 assert_snapshot_matches!(map, 483 assert_snapshot_matches!(map, @r###"
494 @r###" 484 ⋮crate
495crate 485 ⋮C: t v
496C: t v 486 "###);
497"###
498 );
499} 487}
500 488
501#[test] 489#[test]
@@ -519,12 +507,10 @@ fn reexport_across_crates() {
519 }, 507 },
520 ); 508 );
521 509
522 assert_snapshot_matches!(map, 510 assert_snapshot_matches!(map, @r###"
523 @r###" 511 ⋮crate
524crate 512 ⋮Baz: t v
525Baz: t v 513 "###);
526"###
527 );
528} 514}
529 515
530#[test] 516#[test]
@@ -544,13 +530,11 @@ fn values_dont_shadow_extern_crates() {
544 }, 530 },
545 ); 531 );
546 532
547 assert_snapshot_matches!(map, 533 assert_snapshot_matches!(map, @r###"
548 @r###" 534 ⋮crate
549crate 535 ⋮Bar: t v
550Bar: t v 536 ⋮foo: v
551foo: v 537 "###);
552"###
553 );
554} 538}
555 539
556#[test] 540#[test]
diff --git a/crates/ra_hir/src/nameres/tests/globs.rs b/crates/ra_hir/src/nameres/tests/globs.rs
index 6e50c7ff6..e1519ca6b 100644
--- a/crates/ra_hir/src/nameres/tests/globs.rs
+++ b/crates/ra_hir/src/nameres/tests/globs.rs
@@ -18,20 +18,20 @@ fn glob_1() {
18 ", 18 ",
19 ); 19 );
20 assert_snapshot_matches!(map, @r###" 20 assert_snapshot_matches!(map, @r###"
21crate 21crate
22bar: t 22 ⋮Baz: t v
23Foo: t v 23Foo: t v
24Baz: t v 24 ⋮bar: t
25foo: t 25foo: t
26 26
27crate::foo 27crate::foo
28bar: t 28 ⋮Baz: t v
29Foo: t v 29Foo: t v
30Baz: t v 30 ⋮bar: t
31 31
32crate::foo::bar 32crate::foo::bar
33Baz: t v 33Baz: t v
34"### 34 "###
35 ); 35 );
36} 36}
37 37
@@ -54,22 +54,22 @@ fn glob_2() {
54 ", 54 ",
55 ); 55 );
56 assert_snapshot_matches!(map, @r###" 56 assert_snapshot_matches!(map, @r###"
57crate 57crate
58bar: t 58 ⋮Baz: t v
59Foo: t v 59Foo: t v
60Baz: t v 60 ⋮bar: t
61foo: t 61foo: t
62 62
63crate::foo 63crate::foo
64bar: t 64 ⋮Baz: t v
65Foo: t v 65Foo: t v
66Baz: t v 66 ⋮bar: t
67 67
68crate::foo::bar 68crate::foo::bar
69bar: t 69 ⋮Baz: t v
70Foo: t v 70Foo: t v
71Baz: t v 71 ⋮bar: t
72"### 72 "###
73 ); 73 );
74} 74}
75 75
@@ -90,9 +90,9 @@ fn glob_across_crates() {
90 }, 90 },
91 ); 91 );
92 assert_snapshot_matches!(map, @r###" 92 assert_snapshot_matches!(map, @r###"
93crate 93crate
94Baz: t v 94Baz: t v
95"### 95 "###
96 ); 96 );
97} 97}
98 98
@@ -109,10 +109,10 @@ fn glob_enum() {
109 ", 109 ",
110 ); 110 );
111 assert_snapshot_matches!(map, @r###" 111 assert_snapshot_matches!(map, @r###"
112crate 112crate
113Foo: t 113 ⋮Bar: t v
114Bar: t v 114Baz: t v
115Baz: t v 115 ⋮Foo: t
116"### 116 "###
117 ); 117 );
118} 118}
diff --git a/crates/ra_hir/src/nameres/tests/macros.rs b/crates/ra_hir/src/nameres/tests/macros.rs
index 8781b026b..f7ca380ad 100644
--- a/crates/ra_hir/src/nameres/tests/macros.rs
+++ b/crates/ra_hir/src/nameres/tests/macros.rs
@@ -18,14 +18,14 @@ fn macro_rules_are_globally_visible() {
18 ", 18 ",
19 ); 19 );
20 assert_snapshot_matches!(map, @r###" 20 assert_snapshot_matches!(map, @r###"
21crate 21crate
22nested: t 22 ⋮Foo: t v
23Foo: t v 23 ⋮nested: t
24 24
25crate::nested 25crate::nested
26Bar: t v 26Bar: t v
27Baz: t v 27Baz: t v
28"###); 28 "###);
29} 29}
30 30
31#[test] 31#[test]
@@ -45,15 +45,15 @@ fn macro_rules_can_define_modules() {
45 ", 45 ",
46 ); 46 );
47 assert_snapshot_matches!(map, @r###" 47 assert_snapshot_matches!(map, @r###"
48crate 48crate
49n1: t 49n1: t
50 50
51crate::n1 51crate::n1
52n2: t 52n2: t
53 53
54crate::n1::n2 54crate::n1::n2
55X: t v 55X: t v
56"###); 56 "###);
57} 57}
58 58
59#[test] 59#[test]
@@ -81,14 +81,14 @@ fn macro_rules_from_other_crates_are_visible() {
81 }, 81 },
82 ); 82 );
83 assert_snapshot_matches!(map, @r###" 83 assert_snapshot_matches!(map, @r###"
84crate 84crate
85bar: t 85 ⋮Bar: t v
86Foo: t v 86Foo: t v
87Bar: t v 87 ⋮bar: t
88 88
89crate::bar 89crate::bar
90bar: t 90 ⋮Bar: t v
91Foo: t v 91Foo: t v
92Bar: t v 92 ⋮bar: t
93"###); 93 "###);
94} 94}
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 2e521183c..082bc5253 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -18,7 +18,7 @@ rowan = "0.5.0"
18# ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here 18# ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here
19# to reduce number of compilations 19# to reduce number of compilations
20text_unit = { version = "0.1.8", features = ["serde"] } 20text_unit = { version = "0.1.8", features = ["serde"] }
21smol_str = { version = "0.1.9", features = ["serde"] } 21smol_str = { version = "0.1.11", features = ["serde"] }
22 22
23ra_text_edit = { path = "../ra_text_edit" } 23ra_text_edit = { path = "../ra_text_edit" }
24ra_parser = { path = "../ra_parser" } 24ra_parser = { path = "../ra_parser" }