Merge pull request #16801 from hvitved/ruby/element-reference-block

Ruby: Handle element references with blocks

Author: hvitved

ruby/downgrades/40a6b0a5e81115bd870b3a12a1fe954b06362bb7/old.dbscheme

@@ -0,0 +1,4 @@
+description: Remove `ruby_element_reference_block` DB relation
+compatibility: backwards
+
+ruby_element_reference_block.rel: delete

ruby/downgrades/40a6b0a5e81115bd870b3a12a1fe954b06362bb7/ruby.dbscheme

@@ -9,7 +9,7 @@ edition = "2021"
 [dependencies]
 tree-sitter = ">= 0.22.6"
 tree-sitter-embedded-template = { git = "https://github.com/tree-sitter/tree-sitter-embedded-template.git", rev = "38d5004a797298dc42c85e7706c5ceac46a3f29f" }
-tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby.git", rev = "dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b" }
+tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby.git", rev = "0ffe457fb6aabf064f173fd30ea356845cef2513" }
 clap = { version = "4.2", features = ["derive"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }

ruby/downgrades/40a6b0a5e81115bd870b3a12a1fe954b06362bb7/upgrade.properties

@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Element references with blocks, such as `foo[:bar] { |x| puts x}`, are now parsed correctly.

ruby/extractor/Cargo.lock

@@ -112,7 +112,7 @@ class ElementReferenceImpl extends MethodCallImpl, TElementReference {
 
   final override string getMethodNameImpl() { result = "[]" }
 
-  final override Block getBlockImpl() { none() }
+  final override Block getBlockImpl() { toGenerated(result) = g.getBlock() }
 }
 
 abstract class SuperCallImpl extends MethodCallImpl, TSuperCall { }

ruby/extractor/Cargo.toml

@@ -633,6 +633,9 @@ module Ruby {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "ElementReference" }
 
+    /** Gets the node corresponding to the field `block`. */
+    final AstNode getBlock() { ruby_element_reference_block(this, result) }
+
     /** Gets the node corresponding to the field `object`. */
     final UnderscorePrimary getObject() { ruby_element_reference_def(this, result) }
 
@@ -641,7 +644,9 @@ module Ruby {
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      ruby_element_reference_def(this, result) or ruby_element_reference_child(this, _, result)
+      ruby_element_reference_block(this, result) or
+      ruby_element_reference_def(this, result) or
+      ruby_element_reference_child(this, _, result)
     }
   }
 

ruby/ql/lib/change-notes/2024-06-25-element-reference-block.md

@@ -569,6 +569,13 @@ ruby_do_block_def(
   unique int id: @ruby_do_block
 );
 
+@ruby_element_reference_block_type = @ruby_block | @ruby_do_block
+
+ruby_element_reference_block(
+  unique int ruby_element_reference: @ruby_element_reference ref,
+  unique int block: @ruby_element_reference_block_type ref
+);
+
 @ruby_element_reference_child_type = @ruby_block_argument | @ruby_hash_splat_argument | @ruby_pair | @ruby_splat_argument | @ruby_token_forward_argument | @ruby_underscore_expression
 
 #keyset[ruby_element_reference, index]