cybercyst/nushell
1
0
Fork 0
mirror of https://github.com/nushell/nushell.git synced 2025-05-05 23:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): verbose signature help response for less well supported editors (#15353)

Browse Source 
# Description

Some editors (like zed) will fail to mark the active parameter if not
set in the outmost structure.

# User-Facing Changes

# Tests + Formatting

Adjusted

# After Submitting
This commit is contained in:
zc he 2025-03-20 22:55:03 +08:00 committed by GitHub
parent 862d53bb6e
commit e89bb2ee96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-lsp/src/lib.rs
View File

@ -660,7 +660,7 @@ mod tests {
client_connection client_connection
.receiver .receiver
.recv_timeout(Duration::from_secs(2)) .recv_timeout(Duration::from_secs(3))
.unwrap() .unwrap()
} }
} }

11
crates/nu-lsp/src/signature.rs
View File

@ -162,15 +162,16 @@ impl LanguageServer {
parameters.push(arg_to_param_info(rest_arg)); parameters.push(arg_to_param_info(rest_arg));
} }
let max_idx = parameters.len().saturating_sub(1) as u32; let max_idx = parameters.len().saturating_sub(1) as u32;
let active_parameter = Some(param_num_before_pos.min(max_idx));
Some(SignatureHelp { Some(SignatureHelp {
signatures: vec![SignatureInformation { signatures: vec![SignatureInformation {
label: Self::get_signature_label(&active_signature), label: Self::get_signature_label(&active_signature),
documentation: str_to_doc(active_signature.description), documentation: str_to_doc(active_signature.description),
parameters: Some(parameters), parameters: Some(parameters),
active_parameter: Some(std::cmp::min(param_num_before_pos, max_idx)), active_parameter,
}], }],
active_signature: Some(0), active_signature: Some(0),
active_parameter: None, active_parameter,
}) })
} }
} }
@ -315,7 +316,8 @@ mod tests {
], ],
"activeParameter": 1 "activeParameter": 1
}], }],
"activeSignature": 0 "activeSignature": 0,
"activeParameter": 1
}) })
); );
@ -332,7 +334,8 @@ mod tests {
], ],
"activeParameter": 2 "activeParameter": 2
}], }],
"activeSignature": 0 "activeSignature": 0,
"activeParameter": 2
}) })
); );
} }