diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-20 11:49:59 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-20 11:49:59 +0000 |
commit | 6cf3d669e2293d947c618bb5c80fac4d718d6ed2 (patch) | |
tree | ed1e997cb8dc1537d4d2a64b3a73d4b2f78b9d3e /crates/ide/src | |
parent | b28c903b18d8bd9b2010d6e3466d4f903fa0ba67 (diff) | |
parent | 74f8201586435a7a2e7f8fd49c7eb0750a089180 (diff) |
Merge #7357
7357: Dont show runnables from nested mods r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ide/src')
-rw-r--r-- | crates/ide/src/runnables.rs | 67 |
1 files changed, 45 insertions, 22 deletions
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs index 8976f1080..47a85dc45 100644 --- a/crates/ide/src/runnables.rs +++ b/crates/ide/src/runnables.rs | |||
@@ -9,6 +9,7 @@ use syntax::{ | |||
9 | ast::{self, AstNode, AttrsOwner}, | 9 | ast::{self, AstNode, AttrsOwner}, |
10 | match_ast, SyntaxNode, | 10 | match_ast, SyntaxNode, |
11 | }; | 11 | }; |
12 | use test_utils::mark; | ||
12 | 13 | ||
13 | use crate::{ | 14 | use crate::{ |
14 | display::{ToNav, TryToNav}, | 15 | display::{ToNav, TryToNav}, |
@@ -96,28 +97,26 @@ impl Runnable { | |||
96 | pub(crate) fn runnables(db: &RootDatabase, file_id: FileId) -> Vec<Runnable> { | 97 | pub(crate) fn runnables(db: &RootDatabase, file_id: FileId) -> Vec<Runnable> { |
97 | let sema = Semantics::new(db); | 98 | let sema = Semantics::new(db); |
98 | let module = match sema.to_module_def(file_id) { | 99 | let module = match sema.to_module_def(file_id) { |
99 | None => return vec![], | 100 | None => return Vec::new(), |
100 | Some(it) => it, | 101 | Some(it) => it, |
101 | }; | 102 | }; |
102 | 103 | ||
103 | runnables_mod(&sema, module) | 104 | let mut res = Vec::new(); |
105 | runnables_mod(&sema, &mut res, module); | ||
106 | res | ||
104 | } | 107 | } |
105 | 108 | ||
106 | fn runnables_mod(sema: &Semantics<RootDatabase>, module: hir::Module) -> Vec<Runnable> { | 109 | fn runnables_mod(sema: &Semantics<RootDatabase>, acc: &mut Vec<Runnable>, module: hir::Module) { |
107 | let mut res: Vec<Runnable> = module | 110 | acc.extend(module.declarations(sema.db).into_iter().filter_map(|def| { |
108 | .declarations(sema.db) | 111 | let runnable = match def { |
109 | .into_iter() | 112 | hir::ModuleDef::Module(it) => runnable_mod(&sema, it), |
110 | .filter_map(|def| { | 113 | hir::ModuleDef::Function(it) => runnable_fn(&sema, it), |
111 | let runnable = match def { | 114 | _ => None, |
112 | hir::ModuleDef::Module(it) => runnable_mod(&sema, it), | 115 | }; |
113 | hir::ModuleDef::Function(it) => runnable_fn(&sema, it), | 116 | runnable.or_else(|| module_def_doctest(&sema, def)) |
114 | _ => None, | 117 | })); |
115 | }; | ||
116 | runnable.or_else(|| module_def_doctest(&sema, def)) | ||
117 | }) | ||
118 | .collect(); | ||
119 | 118 | ||
120 | res.extend(module.impl_defs(sema.db).into_iter().flat_map(|it| it.items(sema.db)).filter_map( | 119 | acc.extend(module.impl_defs(sema.db).into_iter().flat_map(|it| it.items(sema.db)).filter_map( |
121 | |def| match def { | 120 | |def| match def { |
122 | hir::AssocItem::Function(it) => { | 121 | hir::AssocItem::Function(it) => { |
123 | runnable_fn(&sema, it).or_else(|| module_def_doctest(&sema, it.into())) | 122 | runnable_fn(&sema, it).or_else(|| module_def_doctest(&sema, it.into())) |
@@ -127,12 +126,14 @@ fn runnables_mod(sema: &Semantics<RootDatabase>, module: hir::Module) -> Vec<Run | |||
127 | }, | 126 | }, |
128 | )); | 127 | )); |
129 | 128 | ||
130 | res.extend(module.declarations(sema.db).into_iter().flat_map(|def| match def { | 129 | for def in module.declarations(sema.db) { |
131 | hir::ModuleDef::Module(it) => runnables_mod(sema, it), | 130 | if let hir::ModuleDef::Module(submodule) = def { |
132 | _ => vec![], | 131 | match submodule.definition_source(sema.db).value { |
133 | })); | 132 | hir::ModuleSource::Module(_) => runnables_mod(sema, acc, submodule), |
134 | 133 | hir::ModuleSource::SourceFile(_) => mark::hit!(dont_recurse_in_outline_submodules), | |
135 | res | 134 | } |
135 | } | ||
136 | } | ||
136 | } | 137 | } |
137 | 138 | ||
138 | pub(crate) fn runnable_fn(sema: &Semantics<RootDatabase>, def: hir::Function) -> Option<Runnable> { | 139 | pub(crate) fn runnable_fn(sema: &Semantics<RootDatabase>, def: hir::Function) -> Option<Runnable> { |
@@ -326,6 +327,7 @@ fn has_test_function_or_multiple_test_submodules( | |||
326 | #[cfg(test)] | 327 | #[cfg(test)] |
327 | mod tests { | 328 | mod tests { |
328 | use expect_test::{expect, Expect}; | 329 | use expect_test::{expect, Expect}; |
330 | use test_utils::mark; | ||
329 | 331 | ||
330 | use crate::fixture; | 332 | use crate::fixture; |
331 | 333 | ||
@@ -1050,4 +1052,25 @@ mod tests { | |||
1050 | "#]], | 1052 | "#]], |
1051 | ); | 1053 | ); |
1052 | } | 1054 | } |
1055 | |||
1056 | #[test] | ||
1057 | fn dont_recurse_in_outline_submodules() { | ||
1058 | mark::check!(dont_recurse_in_outline_submodules); | ||
1059 | check( | ||
1060 | r#" | ||
1061 | //- /lib.rs | ||
1062 | $0 | ||
1063 | mod m; | ||
1064 | //- /m.rs | ||
1065 | mod tests { | ||
1066 | #[test] | ||
1067 | fn t() {} | ||
1068 | } | ||
1069 | "#, | ||
1070 | &[], | ||
1071 | expect![[r#" | ||
1072 | [] | ||
1073 | "#]], | ||
1074 | ); | ||
1075 | } | ||
1053 | } | 1076 | } |