Skip to content

Commit 4e7f6c2

Browse files
committed
Feature flag for arg snippets
1 parent 21f40f2 commit 4e7f6c2

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

crates/ra_ide/src/completion/presentation.rs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,25 @@ impl Completions {
221221
let (snippet, label) = if params.is_empty() || has_self_param && params.len() == 1 {
222222
(format!("{}()$0", name), format!("{}()", name))
223223
} else {
224-
let to_skip = if has_self_param { 1 } else { 0 };
225-
let function_params_snippet =
226-
join(
224+
let snippet = if ctx
225+
.db
226+
.feature_flags
227+
.get("completion.insertion.add-argument-sippets")
228+
{
229+
let to_skip = if has_self_param { 1 } else { 0 };
230+
let function_params_snippet = join(
227231
function_signature.parameter_names.iter().skip(to_skip).enumerate().map(
228232
|(index, param_name)| format!("${{{}:{}}}", index + 1, param_name),
229233
),
230234
)
231235
.separator(", ")
232236
.to_string();
233-
(format!("{}({})$0", name, function_params_snippet), format!("{}(…)", name))
237+
format!("{}({})$0", name, function_params_snippet)
238+
} else {
239+
format!("{}($0)", name)
240+
};
241+
242+
(snippet, format!("{}(…)", name))
234243
};
235244
builder = builder.lookup_by(name).label(label).insert_snippet(snippet);
236245
}

crates/ra_ide_db/src/feature_flags.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ impl Default for FeatureFlags {
5454
FeatureFlags::new(&[
5555
("lsp.diagnostics", true),
5656
("completion.insertion.add-call-parenthesis", true),
57+
("completion.insertion.add-argument-sippets", true),
5758
("completion.enable-postfix", true),
5859
("notifications.workspace-loaded", true),
5960
("notifications.cargo-toml-not-found", true),

editors/code/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@
197197
"type": "boolean",
198198
"description": "Whether to add parenthesis when completing functions"
199199
},
200+
"completion.insertion.add-argument-sippets": {
201+
"type": "boolean",
202+
"description": "Whether to add argument snippets when completing functions"
203+
},
200204
"completion.enable-postfix": {
201205
"type": "boolean",
202206
"description": "Whether to show postfix snippets like `dbg`, `if`, `not`, etc."

0 commit comments

Comments
 (0)