remove ErbFile refs

Author: alexrford

ql/src/codeql_ruby/frameworks/ActionController.qll

@@ -68,7 +68,8 @@ class ActionControllerActionMethod extends Method, HTTP::Server::RequestHandler:
    * corresponding template file at
    * `<source_prefix>/app/views/<subpath>/<method_name>.html.erb`.
    */
-  ErbFile getDefaultTemplateFile() {
+  // TODO: result should be `ErbFile`
+  File getDefaultTemplateFile() {
     exists(string templatePath, string sourcePrefix, string subPath, string controllerPath |
       controllerPath = this.getLocation().getFile().getAbsolutePath() and
       sourcePrefix = controllerPath.regexpCapture("^(.*)/app/controllers/.*$", 1) and
@@ -183,7 +184,8 @@ class ActionControllerHelperMethod extends Method {
  * Gets an `ActionControllerControllerClass` associated with the given `ErbFile`
  * according to Rails path conventions.
  */
-ActionControllerControllerClass getAssociatedControllerClass(ErbFile f) {
+// TODO: parameter should be `ErbFile`
+ActionControllerControllerClass getAssociatedControllerClass(File f) {
   exists(string localPrefix, string sourcePrefix, string controllerPath |
     controllerPath = result.getLocation().getFile().getAbsolutePath() and
     sourcePrefix = f.getAbsolutePath().regexpCapture("^(.*)/app/views/(?:.*?)/(?:[^/]*)$", 1) and

ql/src/codeql_ruby/frameworks/ActionView.qll

@@ -11,7 +11,8 @@ predicate inActionViewContext(AstNode n) {
   n.getEnclosingModule() instanceof ViewComponentClass
   or
   // Within a template
-  n.getLocation().getFile() instanceof ErbFile
+  // TODO: n.getLocation().getFile() instanceof ErbFile
+  n.getLocation().getFile().getExtension() = "erb"
 }
 
 /**
@@ -35,7 +36,10 @@ private class ActionViewContextCall extends MethodCall {
     inActionViewContext(this)
   }
 
-  predicate isInErbFile() { this.getLocation().getFile() instanceof ErbFile }
+  predicate isInErbFile() {
+    // TODO: this.getLocation().getFile() instanceof ErbFile
+    this.getLocation().getFile().getExtension() = "erb"
+  }
 }
 
 /** A call to the `raw` method to output a value without HTML escaping. */
@@ -94,7 +98,8 @@ abstract class RenderCall extends MethodCall {
   /**
    * Get the template file to be rendered by this call, if any.
    */
-  ErbFile getTemplateFile() { result.getAbsolutePath().matches(this.getTemplatePathPatterns()) }
+  // TODO: parameter should be `ErbFile`
+  File getTemplateFile() { result.getAbsolutePath().matches(this.getTemplatePathPatterns()) }
 
   /**
    * Get the local variables passed as context to the renderer

ql/test/library-tests/frameworks/ActionController.ql

@@ -14,6 +14,7 @@ query predicate redirectToCalls(RedirectToCall c) { any() }
 
 query predicate actionControllerHelperMethods(ActionControllerHelperMethod m) { any() }
 
-query predicate getAssociatedControllerClasses(ActionControllerControllerClass cls, ErbFile f) {
+// TODO: second parameter should be `ErbFile`
+query predicate getAssociatedControllerClasses(ActionControllerControllerClass cls, File f) {
   cls = getAssociatedControllerClass(f)
 }