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

Jump to bottom

feat(lsp): goto struct member inside Impl method #3918

Merged
merged 4 commits into from
Jan 3, 2024
Merged

feat(lsp): goto struct member inside Impl method #3918

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ff9c82
feat(lsp): goto struct member inside Impl method
kobyhallx Dec 22, 2023
af5ca78
chore: fix clippy
kobyhallx Dec 27, 2023
92e1d11
chore: reduce resolution through type
kobyhallx Jan 3, 2024
a9247ba
Merge branch 'master' into kh-goto-struct-self-member-access
kobyhallx Jan 3, 2024
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
32 changes: 26 additions & 6 deletions compiler/noirc_frontend/src/node_interner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,9 +1322,9 @@ impl NodeInterner {
let expr_lhs = &expr_member_access.lhs;
let expr_rhs = &expr_member_access.rhs;

let found_ident = self.nodes.get(expr_lhs.into())?;
let lhs_found_ident = self.nodes.get(expr_lhs.into())?;

let ident = match found_ident {
let ident = match lhs_found_ident {
Node::Expression(HirExpression::Ident(ident)) => ident,
_ => return None,
};
Expand All @@ -1333,6 +1333,9 @@ impl NodeInterner {

let local_id = match definition_info.kind {
DefinitionKind::Local(Some(local_id)) => local_id,
DefinitionKind::Local(None) => {
return self.handle_struct_member_access_for_self(expr_lhs, expr_rhs)
}
_ => return None,
};

Expand All @@ -1346,10 +1349,27 @@ impl NodeInterner {
let struct_type = constructor_expression.r#type.borrow();
let field_names = struct_type.field_names();

match field_names.iter().find(|field_name| field_name.0 == expr_rhs.0) {
Some(found) => Some(Location::new(found.span(), struct_type.location.file)),
None => None,
}
field_names.iter().find(|field_name| field_name.0 == expr_rhs.0).map(|found_field_name| {
Location::new(found_field_name.span(), struct_type.location.file)
})
}

fn handle_struct_member_access_for_self(
kobyhallx marked this conversation as resolved.
Show resolved Hide resolved
&self,
expr_lhs: &ExprId,
expr_rhs: &Ident,
) -> Option<Location> {
let lhs_self_struct = match self.id_type(expr_lhs) {
Type::Struct(struct_type, _) => struct_type,
_ => return None,
};

let struct_type = lhs_self_struct.borrow();
let field_names = struct_type.field_names();

field_names.iter().find(|field_name| field_name.0 == expr_rhs.0).map(|found_field_name| {
Location::new(found_field_name.span(), struct_type.location.file)
})
}
}

Expand Down
Loading