From 012fb28e258f91011d78630dc2384b9e983ee06d Mon Sep 17 00:00:00 2001
From: erik-krogh <erik-krogh@github.com>
Date: Thu, 10 Nov 2022 15:38:51 +0100
Subject: [PATCH] only extract .html.erb files instead of all .erb files

---
 javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java | 2 +-
 .../extractor/src/com/semmle/js/extractor/FileExtractor.java    | 2 +-
 .../extractor/tests/vue/input/{rails.erb => rails.html.erb}     | 0
 .../vue/output/trap/{rails.erb.trap => rails.html.erb.trap}     | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename javascript/extractor/tests/vue/input/{rails.erb => rails.html.erb} (100%)
 rename javascript/extractor/tests/vue/output/trap/{rails.erb.trap => rails.html.erb.trap} (100%)

diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
index 9d5a4c3b52b..7f28d93a183 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
@@ -141,7 +141,7 @@ import com.semmle.util.trap.TrapWriter;
  *   <li>All JavaScript files, that is, files with one of the extensions supported by {@link
  *       FileType#JS} (currently ".js", ".jsx", ".mjs", ".cjs", ".es6", ".es").
  *   <li>All HTML files, that is, files with with one of the extensions supported by {@link
- *       FileType#HTML} (currently ".htm", ".html", ".xhtm", ".xhtml", ".vue", ".erb").
+ *       FileType#HTML} (currently ".htm", ".html", ".xhtm", ".xhtml", ".vue", ".html.erb").
  *   <li>All YAML files, that is, files with one of the extensions supported by {@link
  *       FileType#YAML} (currently ".raml", ".yaml", ".yml").
  *   <li>Files with base name "package.json" or "tsconfig.json", and files whose base name
diff --git a/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
index 77871a95fbe..45bd48bf408 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
@@ -104,7 +104,7 @@ public class FileExtractor {
 
   /** Information about supported file types. */
   public static enum FileType {
-    HTML(".htm", ".html", ".xhtm", ".xhtml", ".vue", ".hbs", ".ejs", ".njk", ".erb") {
+    HTML(".htm", ".html", ".xhtm", ".xhtml", ".vue", ".hbs", ".ejs", ".njk", ".html.erb") {
       @Override
       public IExtractor mkExtractor(ExtractorConfig config, ExtractorState state) {
         return new HTMLExtractor(config, state);
diff --git a/javascript/extractor/tests/vue/input/rails.erb b/javascript/extractor/tests/vue/input/rails.html.erb
similarity index 100%
rename from javascript/extractor/tests/vue/input/rails.erb
rename to javascript/extractor/tests/vue/input/rails.html.erb
diff --git a/javascript/extractor/tests/vue/output/trap/rails.erb.trap b/javascript/extractor/tests/vue/output/trap/rails.html.erb.trap
similarity index 100%
rename from javascript/extractor/tests/vue/output/trap/rails.erb.trap
rename to javascript/extractor/tests/vue/output/trap/rails.html.erb.trap