Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: inconsistent err messages #12577

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: inconsistent err messages #12577

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59fc063
feat: better error display when summoning diagnostics picker
nik-rev Jan 17, 2025
c2620f3
fix: use error color when no language server supports X
nik-rev Jan 17, 2025
b5d7e19
fix: return early when no diagnostics
nik-rev Jan 17, 2025
82f5c5a
feat: remove "no diagnostics" message
nik-rev Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions helix-term/src/commands/lsp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ macro_rules! language_server_with_feature {
match language_server {
Some(language_server) => language_server,
None => {
$editor.set_status(format!(
$editor.set_error(format!(
"No configured language server supports {}",
$feature
));
Expand Down Expand Up @@ -534,13 +534,20 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
pub fn diagnostics_picker(cx: &mut Context) {
let doc = doc!(cx.editor);
if let Some(uri) = doc.uri() {
let diagnostics = cx.editor.diagnostics.get(&uri).cloned().unwrap_or_default();
let picker = diag_picker(
cx,
[(uri, diagnostics)].into(),
DiagnosticsFormat::HideSourcePath,
);
cx.push_layer(Box::new(overlaid(picker)));
if let Some(diagnostics) = cx.editor.diagnostics.get(&uri).cloned() {
let picker = diag_picker(
cx,
[(uri, diagnostics)].into(),
DiagnosticsFormat::HideSourcePath,
);
cx.push_layer(Box::new(overlaid(picker)));
} else {
cx.editor
.set_error("No configured language server supports diagnostics")
};
} else {
// this happens for example, when we are in a [scratch] buffer
cx.editor.set_error("Invalid buffer path")
}
}

Expand Down
Loading