aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_assists/src/lib.rs
diff options
context:
space:
mode:
authorJeremy Kolb <[email protected]>2020-07-15 14:45:30 +0100
committerJeremy Kolb <[email protected]>2020-07-15 14:45:30 +0100
commit21c1504ca972d59307a065f72154e50bd32aa763 (patch)
treee6c25847e4de5a87bf677ea2e23f2efa9343ba5f /crates/ra_assists/src/lib.rs
parent6a7d1d4412cd1047f309605156ea9f6cd8f3d997 (diff)
Move allow list into AssistConfig
Diffstat (limited to 'crates/ra_assists/src/lib.rs')
-rw-r--r--crates/ra_assists/src/lib.rs12
1 files changed, 3 insertions, 9 deletions
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 13a283760..465b90415 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -86,14 +86,9 @@ impl Assist {
86 /// 86 ///
87 /// Assists are returned in the "unresolved" state, that is only labels are 87 /// Assists are returned in the "unresolved" state, that is only labels are
88 /// returned, without actual edits. 88 /// returned, without actual edits.
89 pub fn unresolved( 89 pub fn unresolved(db: &RootDatabase, config: &AssistConfig, range: FileRange) -> Vec<Assist> {
90 db: &RootDatabase,
91 config: &AssistConfig,
92 range: FileRange,
93 allowed: Option<Vec<AssistKind>>,
94 ) -> Vec<Assist> {
95 let sema = Semantics::new(db); 90 let sema = Semantics::new(db);
96 let ctx = AssistContext::new(sema, config, range, allowed); 91 let ctx = AssistContext::new(sema, config, range);
97 let mut acc = Assists::new_unresolved(&ctx); 92 let mut acc = Assists::new_unresolved(&ctx);
98 handlers::all().iter().for_each(|handler| { 93 handlers::all().iter().for_each(|handler| {
99 handler(&mut acc, &ctx); 94 handler(&mut acc, &ctx);
@@ -109,10 +104,9 @@ impl Assist {
109 db: &RootDatabase, 104 db: &RootDatabase,
110 config: &AssistConfig, 105 config: &AssistConfig,
111 range: FileRange, 106 range: FileRange,
112 allowed: Option<Vec<AssistKind>>,
113 ) -> Vec<ResolvedAssist> { 107 ) -> Vec<ResolvedAssist> {
114 let sema = Semantics::new(db); 108 let sema = Semantics::new(db);
115 let ctx = AssistContext::new(sema, config, range, allowed); 109 let ctx = AssistContext::new(sema, config, range);
116 let mut acc = Assists::new_resolved(&ctx); 110 let mut acc = Assists::new_resolved(&ctx);
117 handlers::all().iter().for_each(|handler| { 111 handlers::all().iter().for_each(|handler| {
118 handler(&mut acc, &ctx); 112 handler(&mut acc, &ctx);