Skip to content

Commit 45f5323

Browse files
committed
Auto merge of #18366 - Veykril:veykril/push-uvwvwzxnkmnz, r=Veykril
Fix status bar messagen not being marked markdown Closes #18323
2 parents 17055aa + 2324324 commit 45f5323

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

crates/rust-analyzer/src/handlers/request.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -489,12 +489,12 @@ pub(crate) fn handle_document_symbol(
489489
tags.push(SymbolTag::DEPRECATED)
490490
};
491491

492-
#[allow(deprecated)]
493492
let doc_symbol = lsp_types::DocumentSymbol {
494493
name: symbol.label,
495494
detail: symbol.detail,
496495
kind: to_proto::structure_node_kind(symbol.kind),
497496
tags: Some(tags),
497+
#[allow(deprecated)]
498498
deprecated: Some(symbol.deprecated),
499499
range: to_proto::range(&line_index, symbol.node_range),
500500
selection_range: to_proto::range(&line_index, symbol.navigation_range),
@@ -539,18 +539,11 @@ pub(crate) fn handle_document_symbol(
539539
url: &Url,
540540
res: &mut Vec<SymbolInformation>,
541541
) {
542-
let mut tags = Vec::new();
543-
544-
#[allow(deprecated)]
545-
if let Some(true) = symbol.deprecated {
546-
tags.push(SymbolTag::DEPRECATED)
547-
}
548-
549-
#[allow(deprecated)]
550542
res.push(SymbolInformation {
551543
name: symbol.name.clone(),
552544
kind: symbol.kind,
553-
tags: Some(tags),
545+
tags: symbol.tags.clone(),
546+
#[allow(deprecated)]
554547
deprecated: symbol.deprecated,
555548
location: Location::new(url.clone(), symbol.range),
556549
container_name,

editors/code/src/ctx.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ export class Ctx implements RustAnalyzerExtensionApi {
446446
return;
447447
}
448448
if (status.message) {
449-
statusBar.tooltip.appendText(status.message);
449+
statusBar.tooltip.appendMarkdown(status.message);
450450
}
451451
if (statusBar.tooltip.value) {
452452
statusBar.tooltip.appendMarkdown("\n\n---\n\n");

0 commit comments

Comments
 (0)