From 64d8ca9d62797641a7344ab4538822fb76969e1f Mon Sep 17 00:00:00 2001 From: Lionel Henry Date: Fri, 27 Jun 2025 15:36:54 +0200 Subject: [PATCH] Extend range of assignment symbols to end of node --- ...symbols__tests__symbol_nested_assignments_enabled.snap | 8 ++++---- .../ark__lsp__symbols__tests__symbol_rhs_braced_list.snap | 8 ++++---- .../ark__lsp__symbols__tests__symbol_rhs_methods.snap | 8 ++++---- crates/ark/src/lsp/symbols.rs | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_nested_assignments_enabled.snap b/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_nested_assignments_enabled.snap index a2d4fed52..b5305f264 100644 --- a/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_nested_assignments_enabled.snap +++ b/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_nested_assignments_enabled.snap @@ -16,7 +16,7 @@ expression: symbols }, end: Position { line: 2, - character: 8, + character: 13, }, }, selection_range: Range { @@ -26,7 +26,7 @@ expression: symbols }, end: Position { line: 2, - character: 8, + character: 13, }, }, children: Some( @@ -76,7 +76,7 @@ expression: symbols }, end: Position { line: 5, - character: 8, + character: 13, }, }, selection_range: Range { @@ -86,7 +86,7 @@ expression: symbols }, end: Position { line: 5, - character: 8, + character: 13, }, }, children: Some( diff --git a/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_rhs_braced_list.snap b/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_rhs_braced_list.snap index 95c351682..f10536e30 100644 --- a/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_rhs_braced_list.snap +++ b/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_rhs_braced_list.snap @@ -15,8 +15,8 @@ expression: "test_symbol(\"\nfoo <- {\n bar <- function() {}\n}\n\")" character: 0, }, end: Position { - line: 1, - character: 3, + line: 3, + character: 1, }, }, selection_range: Range { @@ -25,8 +25,8 @@ expression: "test_symbol(\"\nfoo <- {\n bar <- function() {}\n}\n\")" character: 0, }, end: Position { - line: 1, - character: 3, + line: 3, + character: 1, }, }, children: Some( diff --git a/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_rhs_methods.snap b/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_rhs_methods.snap index b5e6f1922..108646642 100644 --- a/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_rhs_methods.snap +++ b/crates/ark/src/lsp/snapshots/ark__lsp__symbols__tests__symbol_rhs_methods.snap @@ -43,8 +43,8 @@ expression: "test_symbol(\"\n# section ----\nclass <- r6::r6class(\n 'class',\n character: 0, }, end: Position { - line: 2, - character: 5, + line: 11, + character: 1, }, }, selection_range: Range { @@ -53,8 +53,8 @@ expression: "test_symbol(\"\n# section ----\nclass <- r6::r6class(\n 'class',\n character: 0, }, end: Position { - line: 2, - character: 5, + line: 11, + character: 1, }, }, children: Some( diff --git a/crates/ark/src/lsp/symbols.rs b/crates/ark/src/lsp/symbols.rs index e72d6b1a2..bbaf9fc46 100644 --- a/crates/ark/src/lsp/symbols.rs +++ b/crates/ark/src/lsp/symbols.rs @@ -453,8 +453,8 @@ fn collect_assignment( // too busy. let name = contents.node_slice(&lhs)?.to_string(); - let start = convert_point_to_position(contents, lhs.start_position()); - let end = convert_point_to_position(contents, lhs.end_position()); + let start = convert_point_to_position(contents, node.start_position()); + let end = convert_point_to_position(contents, node.end_position()); // Now recurse into RHS let mut children = Vec::new(); @@ -624,7 +624,7 @@ mod tests { }, end: Position { line: 0, - character: 3, + character: 8, }, }; assert_eq!(test_symbol("foo <- 1"), vec![new_symbol(