Bump to r-lib/tree-sitter-r@9a63f59

The diagnostic gets a little worse, but that is because it is captured as a parse failure, and tree-sitter doesn't give us specifics about WHY a parse fails

Author: DavisVaughan

Cargo.lock

@@ -47,7 +47,7 @@ stdext = { path = "../stdext" }
 tokio = { version = "1.26.0", features = ["full"] }
 tower-lsp = "0.19.0"
 tree-sitter = "0.23.0"
-tree-sitter-r = { git = "https://github.com/r-lib/tree-sitter-r", rev = "c094bd57652f8a08edc31d79a31222268fe798ee" }
+tree-sitter-r = { git = "https://github.com/r-lib/tree-sitter-r", rev = "9a63f592f0d8736912b474260a49931766542ae4" }
 uuid = "1.3.0"
 url = "2.4.1"
 walkdir = "2"

crates/ark/Cargo.toml

@@ -711,61 +711,6 @@ fn recurse_parenthesized_expression(
     ().ok()
 }
 
-// TODO: This should be a syntax check, as the grammar should not allow
-// two `Argument` nodes side by side
-fn check_call_like_next_sibling(
-    child: Node,
-    parent_type: &NodeType,
-    context: &mut DiagnosticContext,
-    diagnostics: &mut Vec<Diagnostic>,
-) -> Result<()> {
-    let Some(next) = child.next_sibling() else {
-        return ().ok();
-    };
-
-    let close = match parent_type {
-        NodeType::Call => ")",
-        NodeType::Subset => "]",
-        NodeType::Subset2 => "]]",
-        _ => bail!("Parent must be a call, subset, or subset2 node."),
-    };
-
-    let ok = match next.node_type() {
-        NodeType::Comma => true,
-        NodeType::Anonymous(kind) if kind.as_str() == close => true,
-        NodeType::Comment => true,
-        // Should be handled elsewhere
-        NodeType::Error => true,
-        _ => false,
-    };
-
-    if ok {
-        return ().ok();
-    }
-
-    // Children can be arbitrarily large, so report the issue between the end of `child`
-    // and the start of `next` (it's not really the child's fault anyways,
-    // it's the fault of the thing right after it).
-    let start_byte = child.end_byte();
-    let start_point = child.end_position();
-    let end_byte = next.start_byte();
-    let end_point = next.start_position();
-
-    let range = Range {
-        start_byte,
-        start_point,
-        end_byte,
-        end_point,
-    };
-
-    let range = convert_tree_sitter_range_to_lsp_range(context.contents, range);
-    let message = "Expected ',' between expressions.";
-    let diagnostic = Diagnostic::new_simple(range, message.into());
-    diagnostics.push(diagnostic);
-
-    ().ok()
-}
-
 /// Default recursion for arguments of a call-like node
 ///
 /// This applies for function calls, subset, and subset2, all of which are guaranteed
@@ -792,8 +737,6 @@ fn recurse_call_like_arguments_default(
     // every function behaves like `list()`, which is our default model of
     // strict evaluation.
     with_in_call_like_arguments(context, |context| {
-        let call_type = node.node_type();
-
         let Some(arguments) = node.child_by_field_name("arguments") else {
             return Ok(());
         };
@@ -803,9 +746,6 @@ fn recurse_call_like_arguments_default(
         let children = arguments.children_by_field_name("argument", &mut cursor);
 
         for child in children {
-            // Warn if the next sibling is neither a comma nor the correct closing delimiter
-            check_call_like_next_sibling(child, &call_type, context, diagnostics)?;
-
             // Recurse into `value`s
             if let Some(value) = child.child_by_field_name("value") {
                 recurse(value, context, diagnostics)?;
@@ -1111,23 +1051,6 @@ foo
         })
     }
 
-    #[test]
-    fn test_expression_after_call_argument() {
-        r_task(|| {
-            let text = "match(1, 2 3)";
-            let document = Document::new(text, None);
-
-            let diagnostics = generate_diagnostics(document, DEFAULT_STATE.clone());
-            assert_eq!(diagnostics.len(), 1);
-
-            // Diagnostic highlights between the `2` and `3`
-            let diagnostic = diagnostics.get(0).unwrap();
-            insta::assert_snapshot!(diagnostic.message);
-            assert_eq!(diagnostic.range.start, Position::new(0, 10));
-            assert_eq!(diagnostic.range.end, Position::new(0, 11));
-        })
-    }
-
     #[test]
     fn test_no_diagnostic_for_dot_dot_i() {
         r_task(|| {

crates/ark/src/lsp/diagnostics.rs

@@ -526,4 +526,18 @@ function(x {
         assert_eq!(diagnostic.range.start, Position::new(3, 0));
         assert_eq!(diagnostic.range.end, Position::new(3, 1));
     }
+
+    #[test]
+    fn test_repeated_call_arguments_without_delimiter() {
+        let text = "match(1, 2 3)";
+
+        let diagnostics = text_diagnostics(text);
+        assert_eq!(diagnostics.len(), 1);
+
+        // Diagnostic highlights the `2`
+        let diagnostic = diagnostics.get(0).unwrap();
+        insta::assert_snapshot!(diagnostic.message);
+        assert_eq!(diagnostic.range.start, Position::new(0, 9));
+        assert_eq!(diagnostic.range.end, Position::new(0, 10));
+    }
 }

crates/ark/src/lsp/diagnostics_syntax.rs

@@ -0,0 +1,5 @@
+---
+source: crates/ark/src/lsp/diagnostics_syntax.rs
+expression: diagnostic.message
+---
+Syntax error