Merge pull request #340 from github/mergeback

Merge rc/3.3 into main

Author: aibaars

.github/workflows/build.yml

@@ -2,9 +2,13 @@ name: Build / Release
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - 'rc/*'
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - 'rc/*'
   workflow_dispatch:
     inputs:
       tag:

.github/workflows/dataset_measure.yml

@@ -2,11 +2,15 @@ name: Collect database stats
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - 'rc/*'
     paths:
       - ql/lib/ruby.dbscheme
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - 'rc/*'
     paths:
       - ql/lib/ruby.dbscheme
   workflow_dispatch:

.github/workflows/qhelp.yml

@@ -2,7 +2,9 @@ name: Query help preview
 
 on:
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - 'rc/*'
     paths:
       - "**/*.qhelp"
 

.github/workflows/qltest.yml

@@ -2,9 +2,13 @@ name: Run QL Tests
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - 'rc/*'
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - 'rc/*'
 
 env:
   CARGO_TERM_COLOR: always

.github/workflows/sync_files.yml

@@ -2,9 +2,13 @@ name: Check synchronized files
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - 'rc/*'
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - 'rc/*'
 
 jobs:
   sync:

Cargo.lock

@@ -11,7 +11,7 @@ flate2 = "1.0"
 node-types = { path = "../node-types" }
 tree-sitter = "0.19"
 tree-sitter-embedded-template = "0.19"
-tree-sitter-ruby = "0.19"
+tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby.git", rev = "bb6a42e42b048627a74a127d3e0184c1eef01de9" }
 clap = "2.33"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }

extractor/Cargo.toml

@@ -12,4 +12,4 @@ node-types = { path = "../node-types" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }
 tree-sitter-embedded-template = "0.19"
-tree-sitter-ruby = "0.19"
+tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby.git", rev = "bb6a42e42b048627a74a127d3e0184c1eef01de9" }

generator/Cargo.toml

@@ -197,3 +197,19 @@ class BlockArgument extends Expr, TBlockArgument {
     pred = "getValue" and result = this.getValue()
   }
 }
+
+/**
+ * A `...` expression that contains forwarded arguments.
+ * ```rb
+ * foo(...)
+ * ```
+ */
+class ForwardedArguments extends Expr, TForwardArgument {
+  private Ruby::ForwardArgument g;
+
+  ForwardedArguments() { this = TForwardArgument(g) }
+
+  final override string getAPrimaryQlClass() { result = "ForwardedArguments" }
+
+  final override string toString() { result = "..." }
+}

ql/lib/codeql/ruby/ast/Call.qll

@@ -233,3 +233,16 @@ class SplatParameter extends NamedParameter, TSplatParameter {
 
   final override string getName() { result = g.getName().getValue() }
 }
+
+/**
+ * A special `...` parameter that forwards positional/keyword/block arguments:
+ * ```rb
+ * def foo(...)
+ * end
+ * ```
+ */
+class ForwardParameter extends Parameter, TForwardParameter {
+  final override string getAPrimaryQlClass() { result = "ForwardParameter" }
+
+  final override string toString() { result = "..." }
+}