aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-02-19 17:07:26 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-02-19 17:07:26 +0000
commit5b617e3bf8252887a3eb1ce76d4b62cbee74e551 (patch)
treec9d87fbdfce3b14c6b75398938790d7966913f34 /crates
parent4142a3adc6b86834540c09babadb2b872fdd3424 (diff)
parent9738fb48a68bee087e441f09edfc56bdbd827f35 (diff)
Merge #859
859: remove ignored macro tests r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir/src/nameres/tests.rs30
-rw-r--r--crates/ra_ide_api/src/mock_analysis.rs2
-rw-r--r--crates/ra_ide_api/tests/test/main.rs19
-rw-r--r--crates/test_utils/src/lib.rs2
4 files changed, 3 insertions, 50 deletions
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 6402c89c0..9b151bb0c 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -402,36 +402,6 @@ fn name_res_works_for_broken_modules() {
402} 402}
403 403
404#[test] 404#[test]
405#[ignore]
406fn item_map_contains_items_from_expansions() {
407 let (item_map, module_id) = item_map(
408 "
409 //- /lib.rs
410 mod foo;
411
412 use crate::foo::bar::Baz;
413 <|>
414
415 //- /foo/mod.rs
416 pub mod bar;
417
418 //- /foo/bar.rs
419 salsa::query_group! {
420 trait Baz {}
421 }
422 ",
423 );
424 check_module_item_map(
425 &item_map,
426 module_id,
427 "
428 Baz: t
429 foo: t
430 ",
431 );
432}
433
434#[test]
435fn item_map_using_self() { 405fn item_map_using_self() {
436 let (item_map, module_id) = item_map( 406 let (item_map, module_id) = item_map(
437 " 407 "
diff --git a/crates/ra_ide_api/src/mock_analysis.rs b/crates/ra_ide_api/src/mock_analysis.rs
index 550d69641..cb12dd0b1 100644
--- a/crates/ra_ide_api/src/mock_analysis.rs
+++ b/crates/ra_ide_api/src/mock_analysis.rs
@@ -18,7 +18,7 @@ impl MockAnalysis {
18 } 18 }
19 /// Creates `MockAnalysis` using a fixture data in the following format: 19 /// Creates `MockAnalysis` using a fixture data in the following format:
20 /// 20 ///
21 /// ```rust,ignore 21 /// ```not_rust
22 /// //- /main.rs 22 /// //- /main.rs
23 /// mod foo; 23 /// mod foo;
24 /// fn main() {} 24 /// fn main() {}
diff --git a/crates/ra_ide_api/tests/test/main.rs b/crates/ra_ide_api/tests/test/main.rs
index a83fbe07b..ff1a0e46b 100644
--- a/crates/ra_ide_api/tests/test/main.rs
+++ b/crates/ra_ide_api/tests/test/main.rs
@@ -4,7 +4,7 @@ use ra_ide_api::{
4 AnalysisChange, CrateGraph, Edition::Edition2018, Query, NavigationTarget, 4 AnalysisChange, CrateGraph, Edition::Edition2018, Query, NavigationTarget,
5 ReferenceSearchResult, 5 ReferenceSearchResult,
6}; 6};
7use ra_syntax::{TextRange, SmolStr}; 7use ra_syntax::SmolStr;
8 8
9#[test] 9#[test]
10fn test_unresolved_module_diagnostic() { 10fn test_unresolved_module_diagnostic() {
@@ -138,20 +138,3 @@ mod foo {
138 assert_eq!(s.name(), "FooInner"); 138 assert_eq!(s.name(), "FooInner");
139 assert_eq!(s.container_name(), Some(&SmolStr::new("foo"))); 139 assert_eq!(s.container_name(), Some(&SmolStr::new("foo")));
140} 140}
141
142#[test]
143#[ignore]
144fn world_symbols_include_stuff_from_macros() {
145 let (analysis, _) = single_file(
146 "
147salsa::query_group! {
148pub trait HirDatabase: SyntaxDatabase {}
149}
150 ",
151 );
152
153 let mut symbols = analysis.symbol_search(Query::new("Hir".into())).unwrap();
154 let s = symbols.pop().unwrap();
155 assert_eq!(s.name(), "HirDatabase");
156 assert_eq!(s.full_range(), TextRange::from_to(33.into(), 44.into()));
157}
diff --git a/crates/test_utils/src/lib.rs b/crates/test_utils/src/lib.rs
index 4d83af00c..7f55779cf 100644
--- a/crates/test_utils/src/lib.rs
+++ b/crates/test_utils/src/lib.rs
@@ -115,7 +115,7 @@ pub struct FixtureEntry {
115 115
116/// Parses text which looks like this: 116/// Parses text which looks like this:
117/// 117///
118/// ```rust,ignore 118/// ```not_rust
119/// //- some meta 119/// //- some meta
120/// line 1 120/// line 1
121/// line 2 121/// line 2