Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-10 07:04:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make workspace_symbol_search_* workspace

Browse source
This commit is contained in:
Ali Bektas 2024-08-22 20:53:40 +02:00
parent e4edbf4601
commit 3a4efb4141
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
crates/rust-analyzer/src/config.rs
View file

@ -252,8 +252,6 @@ config_data! {
config_data! { config_data! {
workspace: struct WorkspaceDefaultConfigData <- WorkspaceConfigInput -> { workspace: struct WorkspaceDefaultConfigData <- WorkspaceConfigInput -> {
/// Pass `--all-targets` to cargo invocation. /// Pass `--all-targets` to cargo invocation.
cargo_allTargets: bool = true, cargo_allTargets: bool = true,
/// Automatically refresh project info via `cargo metadata` on /// Automatically refresh project info via `cargo metadata` on
@ -447,6 +445,16 @@ config_data! {
/// available on a nightly build. /// available on a nightly build.
rustfmt_rangeFormatting_enable: bool = false, rustfmt_rangeFormatting_enable: bool = false,
/// Workspace symbol search kind.
workspace_symbol_search_kind: WorkspaceSymbolSearchKindDef = WorkspaceSymbolSearchKindDef::OnlyTypes,
/// Limits the number of items returned from a workspace symbol search (Defaults to 128).
/// Some clients like vs-code issue new searches on result filtering and don't require all results to be returned in the initial search.
/// Other clients requires all results upfront and might require a higher limit.
workspace_symbol_search_limit: usize = 128,
/// Workspace symbol search scope.
workspace_symbol_search_scope: WorkspaceSymbolSearchScopeDef = WorkspaceSymbolSearchScopeDef::Workspace,
} }
} }
@ -731,14 +739,6 @@ config_data! {
/// Whether to insert closing angle brackets when typing an opening angle bracket of a generic argument list. /// Whether to insert closing angle brackets when typing an opening angle bracket of a generic argument list.
typing_autoClosingAngleBrackets_enable: bool = false, typing_autoClosingAngleBrackets_enable: bool = false,
/// Workspace symbol search kind.
workspace_symbol_search_kind: WorkspaceSymbolSearchKindDef = WorkspaceSymbolSearchKindDef::OnlyTypes,
/// Limits the number of items returned from a workspace symbol search (Defaults to 128).
/// Some clients like vs-code issue new searches on result filtering and don't require all results to be returned in the initial search.
/// Other clients requires all results upfront and might require a higher limit.
workspace_symbol_search_limit: usize = 128,
/// Workspace symbol search scope.
workspace_symbol_search_scope: WorkspaceSymbolSearchScopeDef = WorkspaceSymbolSearchScopeDef::Workspace,
} }
} }
@ -2019,19 +2019,19 @@ impl Config {
} }
} }
pub fn workspace_symbol(&self) -> WorkspaceSymbolConfig { pub fn workspace_symbol(&self, source_root: Option<SourceRootId>) -> WorkspaceSymbolConfig {
WorkspaceSymbolConfig { WorkspaceSymbolConfig {
search_scope: match self.workspace_symbol_search_scope() { search_scope: match self.workspace_symbol_search_scope(source_root) {
WorkspaceSymbolSearchScopeDef::Workspace => WorkspaceSymbolSearchScope::Workspace, WorkspaceSymbolSearchScopeDef::Workspace => WorkspaceSymbolSearchScope::Workspace,
WorkspaceSymbolSearchScopeDef::WorkspaceAndDependencies => { WorkspaceSymbolSearchScopeDef::WorkspaceAndDependencies => {
WorkspaceSymbolSearchScope::WorkspaceAndDependencies WorkspaceSymbolSearchScope::WorkspaceAndDependencies
} }
}, },
search_kind: match self.workspace_symbol_search_kind() { search_kind: match self.workspace_symbol_search_kind(source_root) {
WorkspaceSymbolSearchKindDef::OnlyTypes => WorkspaceSymbolSearchKind::OnlyTypes, WorkspaceSymbolSearchKindDef::OnlyTypes => WorkspaceSymbolSearchKind::OnlyTypes,
WorkspaceSymbolSearchKindDef::AllSymbols => WorkspaceSymbolSearchKind::AllSymbols, WorkspaceSymbolSearchKindDef::AllSymbols => WorkspaceSymbolSearchKind::AllSymbols,
}, },
search_limit: *self.workspace_symbol_search_limit(), search_limit: *self.workspace_symbol_search_limit(source_root),
} }
} }

2
crates/rust-analyzer/src/handlers/request.rs
View file

@ -565,7 +565,7 @@ pub(crate) fn handle_workspace_symbol(
) -> anyhow::Result<Option<lsp_types::WorkspaceSymbolResponse>> { ) -> anyhow::Result<Option<lsp_types::WorkspaceSymbolResponse>> {
let _p = tracing::info_span!("handle_workspace_symbol").entered(); let _p = tracing::info_span!("handle_workspace_symbol").entered();
let config = snap.config.workspace_symbol(); let config = snap.config.workspace_symbol(None);
let (all_symbols, libs) = decide_search_scope_and_kind(&params, &config); let (all_symbols, libs) = decide_search_scope_and_kind(&params, &config);
let query = { let query = {