Address comments

aibaars · nickrolfe · aibaars · commit 907c3db5caad · 2022-05-11T09:59:42.000+02:00
Co-authored-by: Nick Rolfe &lt;nickrolfe@github.com&gt;
diff --git a/ruby/ql/lib/codeql/ruby/ast/Method.qll b/ruby/ql/lib/codeql/ruby/ast/Method.qll
@@ -253,7 +253,7 @@ class Lambda extends Callable, BodyStmt, TLambda {
 /** A block. */
 class Block extends Callable, StmtSequence, Scope, TBlock {
   /**
-   * Get a local variable declared by this block.
+   * Gets a local variable declared by this block.
    * For example `local` in `{ | param; local| puts param }`.
    */
   LocalVariableWriteAccess getALocalVariable() { result = this.getLocalVariable(_) }
diff --git a/ruby/ql/lib/upgrades/9fdd1d40fd3c3f8f9db8fabf5a353580d14c663a/ruby_call_method.ql b/ruby/ql/lib/upgrades/9fdd1d40fd3c3f8f9db8fabf5a353580d14c663a/ruby_call_method.ql
@@ -18,12 +18,6 @@ class NormalRubyCall extends RubyCall, @ruby_call {
   override RubyMethod getMethod() { result = method }
 }
 
-class ImplicitRubyCall extends RubyCall, @ruby_call {
-  ImplicitRubyCall() { ruby_call_def(this, any(@ruby_argument_list a)) }
-
-  override RubyMethod getMethod() { none() }
-}
-
 class ScopeResolutionCall extends RubyCall, @ruby_scope_resolution {
   private @ruby_token_identifier method;
 
diff --git a/ruby/ql/test/library-tests/ast/TreeSitter.ql b/ruby/ql/test/library-tests/ast/TreeSitter.ql
@@ -2,22 +2,37 @@
  * @kind graph
  */
 
-import codeql.ruby.ast.internal.TreeSitter::Ruby
+import codeql.ruby.ast.internal.TreeSitter
+import codeql.Locations
 
 /**
  * Holds if `node` belongs to the output tree, and its property `key` has the
  * given `value`.
  */
-query predicate nodes(AstNode node, string key, string value) {
+query predicate nodes(Ruby::AstNode node, string key, string value) {
   key = "semmle.label" and
   value = "[" + node.getPrimaryQlClasses() + "] " + node.toString()
+  or
+  key = "semmle.order" and
+  value =
+    any(int i |
+      node =
+        rank[i](Ruby::AstNode n, Location l |
+          l = n.getLocation()
+        |
+          n
+          order by
+            l.getFile().getRelativePath(), l.getFile().getAbsolutePath(), l.getStartLine(),
+            l.getStartColumn(), l.getEndLine() desc, l.getEndColumn() desc, n.toString()
+        )
+    ).toString()
 }
 
 /**
  * Holds if `target` is a child of `source` in the AST, and property `key` of
  * the edge has the given `value`.
  */
-query predicate edges(AstNode source, AstNode target, string key, string value) {
+query predicate edges(Ruby::AstNode source, Ruby::AstNode target, string key, string value) {
   source = target.getParent() and
   key = ["semmle.label", "semmle.order"] and
   value = target.getParentIndex().toString()
