bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/highlight_related.rs')
-rw-r--r--crates/ide/src/highlight_related.rs63
1 files changed, 44 insertions, 19 deletions
diff --git a/crates/ide/src/highlight_related.rs b/crates/ide/src/highlight_related.rs
index 2f82ac9755..f886ff7837 100644
--- a/crates/ide/src/highlight_related.rs
+++ b/crates/ide/src/highlight_related.rs
@@ -2,7 +2,9 @@ use hir::Semantics;
use ide_db::{
base_db::{FileId, FilePosition},
defs::{Definition, IdentClass},
- helpers::{for_each_break_expr, for_each_tail_expr, node_ext::walk_expr, pick_best_token},
+ helpers::{
+ for_each_break_and_continue_expr, for_each_tail_expr, node_ext::walk_expr, pick_best_token,
+ },
search::{FileReference, ReferenceCategory, SearchScope},
RootDatabase,
};
@@ -10,7 +12,7 @@ use rustc_hash::FxHashSet;
use syntax::{
ast::{self, HasLoopBody},
match_ast, AstNode,
- SyntaxKind::{IDENT, INT_NUMBER},
+ SyntaxKind::{self, IDENT, INT_NUMBER},
SyntaxNode, SyntaxToken, TextRange, T,
};
@@ -66,7 +68,9 @@ pub(crate) fn highlight_related(
T![for] if config.break_points && token.parent().and_then(ast::ForExpr::cast).is_some() => {
highlight_break_points(token)
}
- T![break] | T![loop] | T![while] if config.break_points => highlight_break_points(token),
+ T![break] | T![loop] | T![while] | T![continue] if config.break_points => {
+ highlight_break_points(token)
+ }
_ if config.references => highlight_references(sema, &syntax, token, file_id),
_ => None,
}
@@ -187,6 +191,7 @@ fn highlight_exit_points(
fn highlight_break_points(token: SyntaxToken) -> Option<Vec<HighlightedRange>> {
fn hl(
+ cursor_token_kind: SyntaxKind,
token: Option<SyntaxToken>,
label: Option<ast::Label>,
body: Option<ast::StmtList>,
@@ -197,11 +202,20 @@ fn highlight_break_points(token: SyntaxToken) -> Option<Vec<HighlightedRange>> {
label.as_ref().map(|it| it.syntax().text_range()),
);
highlights.extend(range.map(|range| HighlightedRange { category: None, range }));
- for_each_break_expr(label, body, &mut |expr| {
- let range: Option<TextRange> = match expr {
- ast::Expr::BreakExpr(break_) => cover_range(
- break_.break_token().map(|it| it.text_range()),
- break_.lifetime().map(|it| it.syntax().text_range()),
+ for_each_break_and_continue_expr(label, body, &mut |expr| {
+ let range: Option<TextRange> = match (cursor_token_kind, expr) {
+ (T![for] | T![while] | T![loop] | T![break], ast::Expr::BreakExpr(break_)) => {
+ cover_range(
+ break_.break_token().map(|it| it.text_range()),
+ break_.lifetime().map(|it| it.syntax().text_range()),
+ )
+ }
+ (
+ T![for] | T![while] | T![loop] | T![continue],
+ ast::Expr::ContinueExpr(continue_),
+ ) => cover_range(
+ continue_.continue_token().map(|it| it.text_range()),
+ continue_.lifetime().map(|it| it.syntax().text_range()),
),
_ => None,
};
@@ -213,6 +227,7 @@ fn highlight_break_points(token: SyntaxToken) -> Option<Vec<HighlightedRange>> {
let lbl = match_ast! {
match parent {
ast::BreakExpr(b) => b.lifetime(),
+ ast::ContinueExpr(c) => c.lifetime(),
ast::LoopExpr(l) => l.label().and_then(|it| it.lifetime()),
ast::ForExpr(f) => f.label().and_then(|it| it.lifetime()),
ast::WhileExpr(w) => w.label().and_then(|it| it.lifetime()),
@@ -227,19 +242,29 @@ fn highlight_break_points(token: SyntaxToken) -> Option<Vec<HighlightedRange>> {
}
None => true,
};
+ let token_kind = token.kind();
for anc in token.ancestors().flat_map(ast::Expr::cast) {
return match anc {
- ast::Expr::LoopExpr(l) if label_matches(l.label()) => {
- hl(l.loop_token(), l.label(), l.loop_body().and_then(|it| it.stmt_list()))
- }
- ast::Expr::ForExpr(f) if label_matches(f.label()) => {
- hl(f.for_token(), f.label(), f.loop_body().and_then(|it| it.stmt_list()))
- }
- ast::Expr::WhileExpr(w) if label_matches(w.label()) => {
- hl(w.while_token(), w.label(), w.loop_body().and_then(|it| it.stmt_list()))
- }
+ ast::Expr::LoopExpr(l) if label_matches(l.label()) => hl(
+ token_kind,
+ l.loop_token(),
+ l.label(),
+ l.loop_body().and_then(|it| it.stmt_list()),
+ ),
+ ast::Expr::ForExpr(f) if label_matches(f.label()) => hl(
+ token_kind,
+ f.for_token(),
+ f.label(),
+ f.loop_body().and_then(|it| it.stmt_list()),
+ ),
+ ast::Expr::WhileExpr(w) if label_matches(w.label()) => hl(
+ token_kind,
+ w.while_token(),
+ w.label(),
+ w.loop_body().and_then(|it| it.stmt_list()),
+ ),
ast::Expr::BlockExpr(e) if e.label().is_some() && label_matches(e.label()) => {
- hl(None, e.label(), e.stmt_list())
+ hl(token_kind, None, e.label(), e.stmt_list())
}
_ => continue,
};
@@ -882,7 +907,7 @@ fn foo() {
check(
r#"
fn foo() {
- 'outer$0: for _ in () {
+ 'outer: fo$0r _ in () {
// ^^^^^^^^^^^
break;
// ^^^^^