Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

language server logs: Fix missing menu entries when using remoting (#20495)

Browse source 
This fixes the language server log menu only showing a single entry when
using SSH remoting.

Culprit was the `return menu;` statement that should've been a
`continue;`

Rest of the change is just refactoring.

Release Notes:

- Fixed `language server logs` menu only showing a single entry when
using SSH remoting.

Co-authored-by: Bennet <bennet@zed.dev>
This commit is contained in:
Thorsten Ball 2024-11-11 11:26:00 +01:00 • committed by GitHub
parent a97ab5eb3d
commit be8cc1146a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/language_tools/src/lsp_log.rs
View file

@ -751,7 +751,7 @@ impl LspLogView {
let mut rows = log_store let mut rows = log_store
.language_servers .language_servers
.iter() .iter()
.filter_map(|(server_id, state)| match &state.kind { .map(|(server_id, state)| match &state.kind {
LanguageServerKind::Local { .. } | LanguageServerKind::Remote { .. } => { LanguageServerKind::Local { .. } | LanguageServerKind::Remote { .. } => {
let worktree_root_name = state let worktree_root_name = state
.worktree_id .worktree_id
@ -759,8 +759,7 @@ impl LspLogView {
.map(|worktree| worktree.read(cx).root_name().to_string()) .map(|worktree| worktree.read(cx).root_name().to_string())
.unwrap_or_else(|| "Unknown worktree".to_string()); .unwrap_or_else(|| "Unknown worktree".to_string());
let state = log_store.language_servers.get(&server_id)?; LogMenuItem {
Some(LogMenuItem {
server_id: *server_id, server_id: *server_id,
server_name: state.name.clone().unwrap_or(unknown_server.clone()), server_name: state.name.clone().unwrap_or(unknown_server.clone()),
server_kind: state.kind.clone(), server_kind: state.kind.clone(),
@ -768,10 +767,10 @@ impl LspLogView {
rpc_trace_enabled: state.rpc_state.is_some(), rpc_trace_enabled: state.rpc_state.is_some(),
selected_entry: self.active_entry_kind, selected_entry: self.active_entry_kind,
trace_level: lsp::TraceValue::Off, trace_level: lsp::TraceValue::Off,
}) }
} }
LanguageServerKind::Global => Some(LogMenuItem { LanguageServerKind::Global => LogMenuItem {
server_id: *server_id, server_id: *server_id,
server_name: state.name.clone().unwrap_or(unknown_server.clone()), server_name: state.name.clone().unwrap_or(unknown_server.clone()),
server_kind: state.kind.clone(), server_kind: state.kind.clone(),
@ -779,7 +778,7 @@ impl LspLogView {
rpc_trace_enabled: state.rpc_state.is_some(), rpc_trace_enabled: state.rpc_state.is_some(),
selected_entry: self.active_entry_kind, selected_entry: self.active_entry_kind,
trace_level: lsp::TraceValue::Off, trace_level: lsp::TraceValue::Off,
}), },
}) })
.chain( .chain(
self.project self.project
@ -1186,7 +1185,7 @@ impl Render for LspLogToolbarItemView {
); );
// We do not support tracing for remote language servers right now // We do not support tracing for remote language servers right now
if row.server_kind.is_remote() { if row.server_kind.is_remote() {
return menu; continue;
} }
menu = menu.entry( menu = menu.entry(
SERVER_TRACE, SERVER_TRACE,