language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-29 10:58:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

minor: code review tweak

Browse source
This commit is contained in:
gohome001 2025-05-10 13:16:34 +08:00
parent 1d4602e2b0
commit c6e3a4cf20
1 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/ide/src/highlight_related.rs
View file

@ -89,7 +89,7 @@ pub(crate) fn highlight_related(
T![break] | T![loop] | T![while] | T![continue] if config.break_points => { T![break] | T![loop] | T![while] | T![continue] if config.break_points => {
highlight_break_points(sema, token).remove(&file_id) highlight_break_points(sema, token).remove(&file_id)
} }
T![unsafe] if token.parent_ancestors().find_map(ast::BlockExpr::cast).is_some() => { T![unsafe] if token.parent().and_then(ast::BlockExpr::cast).is_some() => {
highlight_unsafe_points(sema, token).remove(&file_id) highlight_unsafe_points(sema, token).remove(&file_id)
} }
T![|] if config.closure_captures => { T![|] if config.closure_captures => {
@ -715,7 +715,7 @@ pub(crate) fn highlight_unsafe_points(
) -> FxHashMap<EditionedFileId, Vec<HighlightedRange>> { ) -> FxHashMap<EditionedFileId, Vec<HighlightedRange>> {
fn hl( fn hl(
sema: &Semantics<'_, RootDatabase>, sema: &Semantics<'_, RootDatabase>,
unsafe_token: Option<SyntaxToken>, unsafe_token: &SyntaxToken,
block_expr: Option<ast::BlockExpr>, block_expr: Option<ast::BlockExpr>,
) -> Option<FxHashMap<EditionedFileId, Vec<HighlightedRange>>> { ) -> Option<FxHashMap<EditionedFileId, Vec<HighlightedRange>>> {
let mut highlights: FxHashMap<EditionedFileId, Vec<_>> = FxHashMap::default(); let mut highlights: FxHashMap<EditionedFileId, Vec<_>> = FxHashMap::default();
@ -728,27 +728,15 @@ pub(crate) fn highlight_unsafe_points(
}; };
// highlight unsafe keyword itself // highlight unsafe keyword itself
let unsafe_token = unsafe_token?;
let unsafe_token_file_id = sema.hir_file_for(&unsafe_token.parent()?); let unsafe_token_file_id = sema.hir_file_for(&unsafe_token.parent()?);
push_to_highlights(unsafe_token_file_id, Some(unsafe_token.text_range())); push_to_highlights(unsafe_token_file_id, Some(unsafe_token.text_range()));
// highlight unsafe operations
if let Some(block) = block_expr { if let Some(block) = block_expr {
if let Some(node) = block.syntax().ancestors().find(|n| ast::Fn::can_cast(n.kind())) { if let Some(body) = sema.body_for(InFile::new(unsafe_token_file_id, block.syntax())) {
if let Some(function) = ast::Fn::cast(node) { let unsafe_ops = sema.get_unsafe_ops(body);
// highlight unsafe keyword of the function for unsafe_op in unsafe_ops {
if let Some(unsafe_token) = function.unsafe_token() { push_to_highlights(unsafe_op.file_id, Some(unsafe_op.value.text_range()));
push_to_highlights(unsafe_token_file_id, Some(unsafe_token.text_range()));
}
// highlight unsafe operations
if let Some(f) = sema.to_def(&function) {
let unsafe_ops = sema.get_unsafe_ops(f.into());
for unsafe_op in unsafe_ops {
push_to_highlights(
unsafe_op.file_id,
Some(unsafe_op.value.text_range()),
);
}
}
} }
} }
} }
@ -756,11 +744,7 @@ pub(crate) fn highlight_unsafe_points(
Some(highlights) Some(highlights)
} }
let Some(block_expr) = token.parent().and_then(ast::BlockExpr::cast) else { hl(sema, &token, token.parent().and_then(ast::BlockExpr::cast)).unwrap_or_default()
return FxHashMap::default();
};
hl(sema, Some(token), Some(block_expr)).unwrap_or_default()
} }
#[cfg(test)] #[cfg(test)]