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.

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

feat: resolve range patterns to their structs #18370

Merged
merged 4 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions crates/hir/src/semantics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
self.imp.descend_node_at_offset(node, offset).filter_map(|mut it| it.find_map(N::cast))
}

pub fn resolve_range_pat(&self, range_pat: &ast::RangePat) -> Option<Struct> {
self.imp.resolve_range_pat(range_pat).map(Struct::from)
}

pub fn resolve_range_expr(&self, range_expr: &ast::RangeExpr) -> Option<Struct> {
self.imp.resolve_range_expr(range_expr).map(Struct::from)
}
Expand Down Expand Up @@ -1361,6 +1365,10 @@ impl<'db> SemanticsImpl<'db> {
self.analyze(call.syntax())?.resolve_method_call_fallback(self.db, call)
}

fn resolve_range_pat(&self, range_pat: &ast::RangePat) -> Option<StructId> {
self.analyze(range_pat.syntax())?.resolve_range_pat(self.db, range_pat)
}

fn resolve_range_expr(&self, range_expr: &ast::RangeExpr) -> Option<StructId> {
self.analyze(range_expr.syntax())?.resolve_range_expr(self.db, range_expr)
}
Expand Down
19 changes: 19 additions & 0 deletions crates/hir/src/source_analyzer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,25 @@ impl SourceAnalyzer {
}
}

pub(crate) fn resolve_range_pat(
&self,
db: &dyn HirDatabase,
range_pat: &ast::RangePat,
) -> Option<StructId> {
let path: ModPath = match (range_pat.op_kind()?, range_pat.start(), range_pat.end()) {
(RangeOp::Exclusive, None, Some(_)) => path![core::ops::RangeTo],
(RangeOp::Exclusive, Some(_), None) => path![core::ops::RangeFrom],
(RangeOp::Exclusive, Some(_), Some(_)) => path![core::ops::Range],
(RangeOp::Inclusive, None, Some(_)) => path![core::ops::RangeToInclusive],
(RangeOp::Inclusive, Some(_), Some(_)) => path![core::ops::RangeInclusive],

(RangeOp::Exclusive, None, None) => return None,
(RangeOp::Inclusive, None, None) => return None,
(RangeOp::Inclusive, Some(_), None) => return None,
};
self.resolver.resolve_known_struct(db.upcast(), &path)
}

pub(crate) fn resolve_range_expr(
&self,
db: &dyn HirDatabase,
Expand Down
12 changes: 10 additions & 2 deletions crates/ide-db/src/defs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ impl IdentClass {
.map(IdentClass::NameClass)
.or_else(|| NameRefClass::classify_lifetime(sema, &lifetime).map(IdentClass::NameRefClass))
},
ast::RangeExpr(range_expr) => OperatorClass::classify_range(sema, &range_expr).map(IdentClass::Operator),
ast::RangePat(range_pat) => OperatorClass::classify_range_pat(sema, &range_pat).map(IdentClass::Operator),
ast::RangeExpr(range_expr) => OperatorClass::classify_range_expr(sema, &range_expr).map(IdentClass::Operator),
ast::AwaitExpr(await_expr) => OperatorClass::classify_await(sema, &await_expr).map(IdentClass::Operator),
ast::BinExpr(bin_expr) => OperatorClass::classify_bin(sema, &bin_expr).map(IdentClass::Operator),
ast::IndexExpr(index_expr) => OperatorClass::classify_index(sema, &index_expr).map(IdentClass::Operator),
Expand Down Expand Up @@ -558,7 +559,14 @@ pub enum OperatorClass {
}

impl OperatorClass {
pub fn classify_range(
pub fn classify_range_pat(
sema: &Semantics<'_, RootDatabase>,
range_pat: &ast::RangePat,
) -> Option<OperatorClass> {
sema.resolve_range_pat(range_pat).map(OperatorClass::Range)
}

pub fn classify_range_expr(
sema: &Semantics<'_, RootDatabase>,
range_expr: &ast::RangeExpr,
) -> Option<OperatorClass> {
Expand Down
93 changes: 87 additions & 6 deletions crates/ide/src/goto_definition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ pub(crate) fn goto_definition(
return Some(vec![x]);
}
}

Some(
IdentClass::classify_node(sema, &parent)?
.definitions()
Expand Down Expand Up @@ -460,7 +461,87 @@ mod tests {
}

#[test]
fn goto_def_range() {
fn goto_def_pat_range_to_inclusive() {
check_name(
"RangeToInclusive",
r#"
//- minicore: range
fn f(ch: char) -> bool {
match ch {
..$0='z' => true,
_ => false
}
}
"#,
);
}

#[test]
fn goto_def_pat_range_to() {
check_name(
"RangeTo",
r#"
//- minicore: range
fn f(ch: char) -> bool {
match ch {
.$0.'z' => true,
_ => false
}
}
"#,
);
}

#[test]
fn goto_def_pat_range() {
check_name(
"Range",
r#"
//- minicore: range
fn f(ch: char) -> bool {
match ch {
'a'.$0.'z' => true,
_ => false
}
}
"#,
);
}

#[test]
fn goto_def_pat_range_inclusive() {
check_name(
"RangeInclusive",
r#"
//- minicore: range
fn f(ch: char) -> bool {
match ch {
'a'..$0='z' => true,
_ => false
}
}
"#,
);
}

#[test]
fn goto_def_pat_range_from() {
check_name(
"RangeFrom",
r#"
//- minicore: range
fn f(ch: char) -> bool {
match ch {
'a'..$0 => true,
_ => false
}
}
"#,
);
}

#[test]
fn goto_def_expr_range() {
check_name(
"Range",
r#"
Expand All @@ -471,7 +552,7 @@ let x = 0.$0.1;
}

#[test]
fn goto_def_range_from() {
fn goto_def_expr_range_from() {
check_name(
"RangeFrom",
r#"
Expand All @@ -484,7 +565,7 @@ fn f(arr: &[i32]) -> &[i32] {
}

#[test]
fn goto_def_range_inclusive() {
fn goto_def_expr_range_inclusive() {
check_name(
"RangeInclusive",
r#"
Expand All @@ -495,7 +576,7 @@ let x = 0.$0.=1;
}

#[test]
fn goto_def_range_full() {
fn goto_def_expr_range_full() {
check_name(
"RangeFull",
r#"
Expand All @@ -508,7 +589,7 @@ fn f(arr: &[i32]) -> &[i32] {
}

#[test]
fn goto_def_range_to() {
fn goto_def_expr_range_to() {
check_name(
"RangeTo",
r#"
Expand All @@ -521,7 +602,7 @@ fn f(arr: &[i32]) -> &[i32] {
}

#[test]
fn goto_def_range_to_inclusive() {
fn goto_def_expr_range_to_inclusive() {
check_name(
"RangeToInclusive",
r#"
Expand Down