Skip to content

modify method_name_from_identifier_node to return node as well #2

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

Open
jeandm-isc wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

modify method_name_from_identifier_node to return node as well #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions crates/objectscript-core/src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,11 +935,11 @@ pub fn cls_is_scope_node(node: Node) -> bool {
/// that method’s name (sliced from `content`).
///
/// Returns `None` if no method definition is found within a bounded parent walk.
pub fn method_name_from_identifier_node(
node: Node,
pub fn method_node_and_name_from_identifier_node<'a>(
node: Node<'a>,
content: &str,
mut iteration: usize,
) -> Option<String> {
) -> Option<(Node<'a>, String)> {
if iteration > 10 {
eprintln!("Iteration MAX reached");
generic_exit_statements("COMMON (no struct)", "method_name_from_identifier_node");
Expand All @@ -961,7 +961,7 @@ pub fn method_name_from_identifier_node(
generic_exit_statements("COMMON (no struct)", "method_name_from_identifier_node");
return None;
};
Some(method_name.to_string())
Some((method_name_node, method_name.to_string()))
}
_ => {
iteration += 1;
Expand All @@ -970,7 +970,7 @@ pub fn method_name_from_identifier_node(
generic_exit_statements("COMMON (no struct)", "method_name_from_identifier_node");
return None;
};
method_name_from_identifier_node(new_node, content, iteration)
method_node_and_name_from_identifier_node(new_node, content, iteration)
}
}
}
Expand Down