rust-analyzer

diff --git a/crates/hir/src/term_search.rs b/crates/hir/src/term_search.rs
index 00c3e4e31b..5c5ddae19e 100644
--- a/crates/hir/src/term_search.rs
+++ b/crates/hir/src/term_search.rs

@@ -269,7 +269,7 @@ pub struct TermSearchConfig {

pub enable_borrowcheck: bool,

/// Indicate when to squash multiple trees to `Many` as there are too many to keep track

pub many_alternatives_threshold: usize,

- /// Fuel for term search

+ /// Fuel for term search in "units of work"

pub fuel: u64,

}

diff --git a/crates/hir/src/term_search/expr.rs b/crates/hir/src/term_search/expr.rs
index 06372355c5..9f56a1ee55 100644
--- a/crates/hir/src/term_search/expr.rs
+++ b/crates/hir/src/term_search/expr.rs

@@ -474,9 +474,7 @@ impl Expr {

Expr::Method { target, func, .. } => {

match func.as_assoc_item(db).and_then(|it| it.container_or_implemented_trait(db)) {

Some(_) => false,

- None => {

- target.is_many()

- }

+ None => target.is_many(),

}

Expr::Field { expr, .. } => expr.contains_many_in_illegal_pos(db),

diff --git a/crates/hir/src/term_search/tactics.rs b/crates/hir/src/term_search/tactics.rs
index 437e653d88..a26728272d 100644
--- a/crates/hir/src/term_search/tactics.rs
+++ b/crates/hir/src/term_search/tactics.rs

@@ -4,6 +4,7 @@

//! * `ctx` - Context for the term search

//! * `defs` - Set of items in scope at term search target location

//! * `lookup` - Lookup table for types

+//! * `should_continue` - Function that indicates when to stop iterating

//! And they return iterator that yields type trees that unify with the `goal` type.

use std::iter;

@@ -97,6 +98,7 @@ pub(super) fn trivial<'a, DB: HirDatabase>(

/// * `ctx` - Context for the term search

/// * `defs` - Set of items in scope at term search target location

/// * `lookup` - Lookup table for types

+/// * `should_continue` - Function that indicates when to stop iterating

pub(super) fn type_constructor<'a, DB: HirDatabase>(

ctx: &'a TermSearchCtx<'a, DB>,

defs: &'a FxHashSet<ScopeDef>,

@@ -357,6 +359,7 @@ pub(super) fn type_constructor<'a, DB: HirDatabase>(

/// * `ctx` - Context for the term search

/// * `defs` - Set of items in scope at term search target location

/// * `lookup` - Lookup table for types

+/// * `should_continue` - Function that indicates when to stop iterating

pub(super) fn free_function<'a, DB: HirDatabase>(

ctx: &'a TermSearchCtx<'a, DB>,

defs: &'a FxHashSet<ScopeDef>,

@@ -488,6 +491,7 @@ pub(super) fn free_function<'a, DB: HirDatabase>(

/// * `ctx` - Context for the term search

/// * `defs` - Set of items in scope at term search target location

/// * `lookup` - Lookup table for types

+/// * `should_continue` - Function that indicates when to stop iterating

pub(super) fn impl_method<'a, DB: HirDatabase>(

ctx: &'a TermSearchCtx<'a, DB>,

_defs: &'a FxHashSet<ScopeDef>,

@@ -661,6 +665,7 @@ pub(super) fn impl_method<'a, DB: HirDatabase>(

/// * `ctx` - Context for the term search

/// * `defs` - Set of items in scope at term search target location

/// * `lookup` - Lookup table for types

+/// * `should_continue` - Function that indicates when to stop iterating

pub(super) fn struct_projection<'a, DB: HirDatabase>(

ctx: &'a TermSearchCtx<'a, DB>,

_defs: &'a FxHashSet<ScopeDef>,

@@ -734,6 +739,7 @@ pub(super) fn famous_types<'a, DB: HirDatabase>(

/// * `ctx` - Context for the term search

/// * `defs` - Set of items in scope at term search target location

/// * `lookup` - Lookup table for types

+/// * `should_continue` - Function that indicates when to stop iterating

pub(super) fn impl_static_method<'a, DB: HirDatabase>(

ctx: &'a TermSearchCtx<'a, DB>,

_defs: &'a FxHashSet<ScopeDef>,

@@ -905,6 +911,7 @@ pub(super) fn impl_static_method<'a, DB: HirDatabase>(

/// * `ctx` - Context for the term search

/// * `defs` - Set of items in scope at term search target location

/// * `lookup` - Lookup table for types

+/// * `should_continue` - Function that indicates when to stop iterating

pub(super) fn make_tuple<'a, DB: HirDatabase>(

ctx: &'a TermSearchCtx<'a, DB>,

_defs: &'a FxHashSet<ScopeDef>,

diff --git a/crates/ide-assists/src/assist_config.rs b/crates/ide-assists/src/assist_config.rs
index fbe17dbfd7..5d76cb0432 100644
--- a/crates/ide-assists/src/assist_config.rs
+++ b/crates/ide-assists/src/assist_config.rs

@@ -16,4 +16,5 @@ pub struct AssistConfig {

pub prefer_no_std: bool,

pub prefer_prelude: bool,

pub assist_emit_must_use: bool,

+ pub term_search_fuel: u64,

}

diff --git a/crates/ide-assists/src/handlers/term_search.rs b/crates/ide-assists/src/handlers/term_search.rs
index 0f4a8e3aec..d0c6ae2198 100644
--- a/crates/ide-assists/src/handlers/term_search.rs
+++ b/crates/ide-assists/src/handlers/term_search.rs

@@ -1,5 +1,5 @@

//! Term search assist

-use hir::term_search::TermSearchCtx;

+use hir::term_search::{TermSearchConfig, TermSearchCtx};

use ide_db::{

assists::{AssistId, AssistKind, GroupLabel},

famous_defs::FamousDefs,

@@ -34,7 +34,7 @@ pub(crate) fn term_search(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<

sema: &ctx.sema,

scope: &scope,

goal: target_ty,

- config: Default::default(),

+ config: TermSearchConfig { fuel: ctx.config.term_search_fuel, ..Default::default() },

};

let paths = hir::term_search::term_search(&term_search_ctx);

diff --git a/crates/ide-assists/src/tests.rs b/crates/ide-assists/src/tests.rs
index 32d6984102..3b6c951251 100644
--- a/crates/ide-assists/src/tests.rs
+++ b/crates/ide-assists/src/tests.rs

@@ -31,6 +31,7 @@ pub(crate) const TEST_CONFIG: AssistConfig = AssistConfig {

prefer_no_std: false,

prefer_prelude: true,

assist_emit_must_use: false,

+ term_search_fuel: 400,

};

pub(crate) const TEST_CONFIG_NO_SNIPPET_CAP: AssistConfig = AssistConfig {

@@ -46,6 +47,7 @@ pub(crate) const TEST_CONFIG_NO_SNIPPET_CAP: AssistConfig = AssistConfig {

prefer_no_std: false,

prefer_prelude: true,

assist_emit_must_use: false,

+ term_search_fuel: 400,

};

pub(crate) const TEST_CONFIG_IMPORT_ONE: AssistConfig = AssistConfig {

@@ -61,6 +63,7 @@ pub(crate) const TEST_CONFIG_IMPORT_ONE: AssistConfig = AssistConfig {

prefer_no_std: false,

prefer_prelude: true,

assist_emit_must_use: false,

+ term_search_fuel: 400,

};

pub(crate) fn with_single_file(text: &str) -> (RootDatabase, FileId) {

diff --git a/crates/ide-completion/src/completions/expr.rs b/crates/ide-completion/src/completions/expr.rs
index 5ff184ef71..1e31d65fdd 100644
--- a/crates/ide-completion/src/completions/expr.rs
+++ b/crates/ide-completion/src/completions/expr.rs

@@ -354,7 +354,6 @@ pub(crate) fn complete_expr(acc: &mut Completions, ctx: &CompletionContext<'_>)

enable_borrowcheck: false,

many_alternatives_threshold: 1,

fuel: 200,

- ..Default::default()

};

let exprs = hir::term_search::term_search(&term_search_ctx);

diff --git a/crates/ide-completion/src/config.rs b/crates/ide-completion/src/config.rs
index 04563fb0f4..809c305ed8 100644
--- a/crates/ide-completion/src/config.rs
+++ b/crates/ide-completion/src/config.rs

@@ -15,6 +15,7 @@ pub struct CompletionConfig {

pub enable_self_on_the_fly: bool,

pub enable_private_editable: bool,

pub enable_term_search: bool,

+ pub term_search_fuel: u64,

pub full_function_signatures: bool,

pub callable: Option<CallableSnippets>,

pub snippet_cap: Option<SnippetCap>,

diff --git a/crates/ide-completion/src/tests.rs b/crates/ide-completion/src/tests.rs
index 1f032c7df4..70e0aa4e9a 100644
--- a/crates/ide-completion/src/tests.rs
+++ b/crates/ide-completion/src/tests.rs

@@ -80,6 +80,7 @@ pub(crate) const TEST_CONFIG: CompletionConfig = CompletionConfig {

snippets: Vec::new(),

limit: None,

+ term_search_fuel: 200,

};

pub(crate) fn completion_list(ra_fixture: &str) -> String {

diff --git a/crates/ide-diagnostics/src/handlers/typed_hole.rs b/crates/ide-diagnostics/src/handlers/typed_hole.rs
index e78bd2db8b..656d79dc73 100644
--- a/crates/ide-diagnostics/src/handlers/typed_hole.rs
+++ b/crates/ide-diagnostics/src/handlers/typed_hole.rs

@@ -1,6 +1,6 @@

use hir::{

db::ExpandDatabase,

- term_search::{term_search, TermSearchCtx},

+ term_search::{term_search, TermSearchConfig, TermSearchCtx},

ClosureStyle, HirDisplay,

};

use ide_db::{

@@ -47,7 +47,7 @@ fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::TypedHole) -> Option<Vec<Assist>

sema: &ctx.sema,

scope: &scope,

goal: d.expected.clone(),

- config: Default::default(),

+ config: TermSearchConfig { fuel: ctx.config.term_search_fuel, ..Default::default() },

};

let paths = term_search(&term_search_ctx);

diff --git a/crates/ide-diagnostics/src/lib.rs b/crates/ide-diagnostics/src/lib.rs
index c3ced36a69..135824386a 100644
--- a/crates/ide-diagnostics/src/lib.rs
+++ b/crates/ide-diagnostics/src/lib.rs

@@ -232,6 +232,7 @@ pub struct DiagnosticsConfig {

pub insert_use: InsertUseConfig,

pub prefer_no_std: bool,

pub prefer_prelude: bool,

+ pub term_search_fuel: u64,

}

impl DiagnosticsConfig {

@@ -256,6 +257,7 @@ impl DiagnosticsConfig {

prefer_no_std: false,

prefer_prelude: true,

+ term_search_fuel: 400,

}

diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index a1eea8839e..5208aa9bf0 100644
--- a/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/crates/rust-analyzer/src/cli/analysis_stats.rs

@@ -986,6 +986,7 @@ impl flags::AnalysisStats {

prefer_no_std: false,

prefer_prelude: true,

style_lints: false,

+ term_search_fuel: 400,

ide::AssistResolveStrategy::All,

file_id,

diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index e16595c992..6c332ae1cb 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs

@@ -454,6 +454,9 @@ config_data! {

/// Local configurations can be overridden for every crate by placing a `rust-analyzer.toml` on crate root.

/// A config is searched for by traversing a "config tree" in a bottom up fashion. It is chosen by the nearest first principle.

local: struct LocalDefaultConfigData <- LocalConfigInput -> {

+ /// Term search fuel in "units of work" for assists (Defaults to 400).

+ assist_termSearch_fuel: usize = 400,

/// Toggles the additional completions that automatically add imports when completed.

/// Note that your client must specify the `additionalTextEdits` LSP client capability to truly have this feature enabled.

completion_autoimport_enable: bool = true,

@@ -515,6 +518,8 @@ config_data! {

}"#).unwrap(),

/// Whether to enable term search based snippets like `Some(foo.bar().baz())`.

completion_termSearch_enable: bool = false,

+ /// Term search fuel in "units of work" for autocompletion (Defaults to 200).

+ completion_termSearch_fuel: usize = 200,

/// Enables highlighting of related references while the cursor is on `break`, `loop`, `while`, or `for` keywords.

highlightRelated_breakPoints_enable: bool = true,

@@ -1015,6 +1020,7 @@ impl Config {

prefer_no_std: self.imports_preferNoStd(source_root).to_owned(),

assist_emit_must_use: self.assist_emitMustUse().to_owned(),

prefer_prelude: self.imports_preferPrelude(source_root).to_owned(),

+ term_search_fuel: self.assist_termSearch_fuel(source_root).to_owned() as u64,

}

@@ -1048,6 +1054,7 @@ impl Config {

snippets: self.snippets.clone().to_vec(),

limit: self.completion_limit(source_root).to_owned(),

enable_term_search: self.completion_termSearch_enable(source_root).to_owned(),

+ term_search_fuel: self.completion_termSearch_fuel(source_root).to_owned() as u64,

prefer_prelude: self.imports_preferPrelude(source_root).to_owned(),

}

@@ -1067,6 +1074,7 @@ impl Config {

prefer_no_std: self.imports_preferNoStd(source_root).to_owned(),

prefer_prelude: self.imports_preferPrelude(source_root).to_owned(),

style_lints: self.diagnostics_styleLints_enable().to_owned(),

+ term_search_fuel: self.assist_termSearch_fuel(source_root).to_owned() as u64,

}

pub fn expand_proc_attr_macros(&self) -> bool {

diff --git a/crates/rust-analyzer/src/integrated_benchmarks.rs b/crates/rust-analyzer/src/integrated_benchmarks.rs
index 7b385ca9d9..cc83d6246b 100644
--- a/crates/rust-analyzer/src/integrated_benchmarks.rs
+++ b/crates/rust-analyzer/src/integrated_benchmarks.rs

@@ -153,6 +153,7 @@ fn integrated_completion_benchmark() {

prefer_no_std: false,

prefer_prelude: true,

limit: None,

+ term_search_fuel: 200,

};

let position =

FilePosition { file_id, offset: TextSize::try_from(completion_offset).unwrap() };

@@ -197,6 +198,7 @@ fn integrated_completion_benchmark() {

prefer_no_std: false,

prefer_prelude: true,

limit: None,

+ term_search_fuel: 200,

};

let position =

FilePosition { file_id, offset: TextSize::try_from(completion_offset).unwrap() };

@@ -239,6 +241,7 @@ fn integrated_completion_benchmark() {

prefer_no_std: false,

prefer_prelude: true,

limit: None,

+ term_search_fuel: 200,

};

let position =

FilePosition { file_id, offset: TextSize::try_from(completion_offset).unwrap() };

@@ -295,6 +298,7 @@ fn integrated_diagnostics_benchmark() {

prefer_no_std: false,

prefer_prelude: false,

+ term_search_fuel: 400,

};

host.analysis()

.diagnostics(&diagnostics_config, ide::AssistResolveStrategy::None, file_id)

diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc
index e9d60063c6..8993a46d2b 100644
--- a/docs/user/generated_config.adoc
+++ b/docs/user/generated_config.adoc

@@ -9,6 +9,11 @@ for enum variants.

Placeholder expression to use for missing expressions in assists.

+[[rust-analyzer.assist.termSearch.fuel]]rust-analyzer.assist.termSearch.fuel (default: `400`)::

+--

+Term search fuel in "units of work" for assists (Defaults to 400).

+--

[[rust-analyzer.cachePriming.enable]]rust-analyzer.cachePriming.enable (default: `true`)::

@@ -373,6 +378,11 @@ Custom completion snippets.

Whether to enable term search based snippets like `Some(foo.bar().baz())`.

+[[rust-analyzer.completion.termSearch.fuel]]rust-analyzer.completion.termSearch.fuel (default: `200`)::

+--

+Term search fuel in "units of work" for autocompletion (Defaults to 200).

+--

[[rust-analyzer.diagnostics.disabled]]rust-analyzer.diagnostics.disabled (default: `[]`)::

diff --git a/editors/code/package.json b/editors/code/package.json
index c4bbb7932e..6e4fedd992 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json

@@ -534,6 +534,12 @@

"Fill missing expressions with reasonable defaults, `new` or `default` constructors."

]

+ "rust-analyzer.assist.termSearch.fuel": {

+ "markdownDescription": "Term search fuel in \"units of work\" for assists (Defaults to 400).",

+ "default": 400,

+ "type": "integer",

+ "minimum": 0

+ },

"rust-analyzer.cachePriming.enable": {

"markdownDescription": "Warm up caches on project load.",

"default": true,

@@ -930,6 +936,12 @@

"default": false,

"type": "boolean"

+ "rust-analyzer.completion.termSearch.fuel": {

+ "markdownDescription": "Term search fuel in \"units of work\" for autocompletion (Defaults to 200).",

+ "default": 200,

+ "type": "integer",

+ "minimum": 0

+ },

"rust-analyzer.diagnostics.disabled": {

"markdownDescription": "List of rust-analyzer diagnostics to disable.",

"default": [],