Ruby: Implement inline expectation comments for .erb files.

Author: geoffw0

ruby/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll

@@ -4,11 +4,51 @@ private import codeql.util.test.InlineExpectationsTest
 module Impl implements InlineExpectationsTestSig {
   private import codeql.ruby.ast.internal.TreeSitter
 
+  private newtype TAnyComment =
+    RubyComment(Ruby::Comment comment) or
+    ErbComment(R::ErbComment comment)
+
+  private class AnyComment extends TAnyComment {
+    string toString() {
+      exists(Ruby::Comment c |
+        this = RubyComment(c) and
+        result = c.toString()
+      )
+      or
+      exists(R::ErbComment c |
+        this = ErbComment(c) and
+        result = c.toString()
+      )
+    }
+
+    Location getLocation() {
+      exists(Ruby::Comment c |
+        this = RubyComment(c) and
+        result = c.getLocation()
+      )
+      or
+      exists(R::ErbComment c |
+        this = ErbComment(c) and
+        result = c.getLocation()
+      )
+    }
+  }
+
   /**
    * A class representing line comments in Ruby.
    */
-  class ExpectationComment extends Ruby::Comment {
-    string getContents() { result = this.getValue().suffix(1) }
+  class ExpectationComment extends AnyComment {
+    string getContents() {
+      exists(Ruby::Comment c |
+        this = RubyComment(c) and
+        result = c.getValue().suffix(1)
+      )
+      or
+      exists(R::ErbComment c |
+        this = ErbComment(c) and
+        result = c.getValue().suffix(1)
+      )
+    }
   }
 
   class Location = R::Location;

ruby/ql/test/library-tests/frameworks/sinatra/Flow.expected

@@ -23,7 +23,6 @@ nodes
 | views/index.erb:2:10:2:12 | call to foo | semmle.label | call to foo |
 subpaths
 testFailures
-| views/index.erb:2:10:2:12 | call to foo | Unexpected result: hasTaintFlow |
 #select
 | app.rb:95:10:95:14 | @user | app.rb:103:13:103:22 | call to source | app.rb:95:10:95:14 | @user | $@ | app.rb:103:13:103:22 | call to source | call to source |
 | views/index.erb:2:10:2:12 | call to foo | app.rb:75:12:75:17 | call to params | views/index.erb:2:10:2:12 | call to foo | $@ | app.rb:75:12:75:17 | call to params | call to params |