From 569f47e427e0b9181075291c988446b86c5ba8f9 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 31 Mar 2020 16:02:55 +0200 Subject: Better names for config structs --- crates/ra_ide/src/completion/complete_postfix.rs | 2 +- crates/ra_ide/src/completion/completion_context.rs | 8 ++++---- crates/ra_ide/src/completion/presentation.rs | 12 ++++++------ crates/ra_ide/src/completion/test_utils.rs | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'crates/ra_ide/src/completion') diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs index 0a00054b2..29c2881c6 100644 --- a/crates/ra_ide/src/completion/complete_postfix.rs +++ b/crates/ra_ide/src/completion/complete_postfix.rs @@ -15,7 +15,7 @@ use crate::{ }; pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) { - if !ctx.options.enable_postfix_completions { + if !ctx.config.enable_postfix_completions { return; } diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs index 319e33b61..fdc0da2c5 100644 --- a/crates/ra_ide/src/completion/completion_context.rs +++ b/crates/ra_ide/src/completion/completion_context.rs @@ -11,7 +11,7 @@ use ra_syntax::{ }; use ra_text_edit::AtomTextEdit; -use crate::{completion::CompletionOptions, FilePosition}; +use crate::{completion::CompletionConfig, FilePosition}; /// `CompletionContext` is created early during completion to figure out, where /// exactly is the cursor, syntax-wise. @@ -19,7 +19,7 @@ use crate::{completion::CompletionOptions, FilePosition}; pub(crate) struct CompletionContext<'a> { pub(super) sema: Semantics<'a, RootDatabase>, pub(super) db: &'a RootDatabase, - pub(super) options: &'a CompletionOptions, + pub(super) config: &'a CompletionConfig, pub(super) offset: TextUnit, /// The token before the cursor, in the original file. pub(super) original_token: SyntaxToken, @@ -61,7 +61,7 @@ impl<'a> CompletionContext<'a> { pub(super) fn new( db: &'a RootDatabase, position: FilePosition, - options: &'a CompletionOptions, + config: &'a CompletionConfig, ) -> Option> { let sema = Semantics::new(db); @@ -85,7 +85,7 @@ impl<'a> CompletionContext<'a> { let mut ctx = CompletionContext { sema, db, - options, + config, original_token, token, offset: position.offset, diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs index 60f1b83f3..1c7c0924d 100644 --- a/crates/ra_ide/src/completion/presentation.rs +++ b/crates/ra_ide/src/completion/presentation.rs @@ -106,7 +106,7 @@ impl Completions { }; // Add `<>` for generic types - if ctx.is_path_type && !ctx.has_type_args && ctx.options.add_call_parenthesis { + if ctx.is_path_type && !ctx.has_type_args && ctx.config.add_call_parenthesis { let has_non_default_type_params = match resolution { ScopeDef::ModuleDef(Adt(it)) => it.has_non_default_type_params(ctx.db), ScopeDef::ModuleDef(TypeAlias(it)) => it.has_non_default_type_params(ctx.db), @@ -211,14 +211,14 @@ impl Completions { .detail(function_signature.to_string()); // If not an import, add parenthesis automatically. - if ctx.use_item_syntax.is_none() && !ctx.is_call && ctx.options.add_call_parenthesis { + if ctx.use_item_syntax.is_none() && !ctx.is_call && ctx.config.add_call_parenthesis { tested_by!(inserts_parens_for_function_calls); let (snippet, label) = if params.is_empty() || has_self_param && params.len() == 1 { (format!("{}()$0", name), format!("{}()", name)) } else { builder = builder.trigger_call_info(); - let snippet = if ctx.options.add_call_argument_snippets { + let snippet = if ctx.config.add_call_argument_snippets { let to_skip = if has_self_param { 1 } else { 0 }; let function_params_snippet = function_signature .parameter_names @@ -311,7 +311,7 @@ mod tests { use crate::completion::{ test_utils::{do_completion, do_completion_with_options}, - CompletionItem, CompletionKind, CompletionOptions, + CompletionConfig, CompletionItem, CompletionKind, }; fn do_reference_completion(ra_fixture: &str) -> Vec { @@ -320,7 +320,7 @@ mod tests { fn do_reference_completion_with_options( ra_fixture: &str, - options: CompletionOptions, + options: CompletionConfig, ) -> Vec { do_completion_with_options(ra_fixture, CompletionKind::Reference, &options) } @@ -589,7 +589,7 @@ mod tests { s.f<|> } ", - CompletionOptions { + CompletionConfig { add_call_argument_snippets: false, .. Default::default() } diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs index 136857315..eb90b5279 100644 --- a/crates/ra_ide/src/completion/test_utils.rs +++ b/crates/ra_ide/src/completion/test_utils.rs @@ -1,19 +1,19 @@ //! Runs completion for testing purposes. use crate::{ - completion::{completion_item::CompletionKind, CompletionOptions}, + completion::{completion_item::CompletionKind, CompletionConfig}, mock_analysis::{analysis_and_position, single_file_with_position}, CompletionItem, }; pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec { - do_completion_with_options(code, kind, &CompletionOptions::default()) + do_completion_with_options(code, kind, &CompletionConfig::default()) } pub(crate) fn do_completion_with_options( code: &str, kind: CompletionKind, - options: &CompletionOptions, + options: &CompletionConfig, ) -> Vec { let (analysis, position) = if code.contains("//-") { analysis_and_position(code) -- cgit v1.2.3