From 6d04ef46f428069ca6b01750bf5cdb6991bc6bb4 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 26 May 2021 11:43:18 +0200
Subject: [PATCH] Change more Ruby to QL

---
 ql/src/codeql/files/FileSystem.qll | 2 +-
 tools/autobuild.cmd                | 2 +-
 tools/autobuild.sh                 | 8 ++++----
 tools/index-files.cmd              | 6 +++---
 tools/index-files.sh               | 6 +++---
 tools/qltest.cmd                   | 2 +-
 tools/qltest.sh                    | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ql/src/codeql/files/FileSystem.qll b/ql/src/codeql/files/FileSystem.qll
index c66dc7c3b2c..5eee97fa971 100644
--- a/ql/src/codeql/files/FileSystem.qll
+++ b/ql/src/codeql/files/FileSystem.qll
@@ -178,7 +178,7 @@ class File extends Container, @file {
       token = this.getAToken() and
       l = token.getLocation() and
       line in [l.getStartLine() .. l.getEndLine()] and
-      if token instanceof @token_comment then comment = true else comment = false
+      if token instanceof @token_block_comment then comment = true else comment = false
     )
   }
 
diff --git a/tools/autobuild.cmd b/tools/autobuild.cmd
index 2d88262927f..4ac59f466a3 100644
--- a/tools/autobuild.cmd
+++ b/tools/autobuild.cmd
@@ -5,6 +5,6 @@ type NUL && "%CODEQL_DIST%\codeql.exe" database index-files ^
     --include-extension=.erb ^
     --size-limit=5m ^
     --language=ruby ^
-    "%CODEQL_EXTRACTOR_RUBY_WIP_DATABASE%"
+    "%CODEQL_EXTRACTOR_QL_WIP_DATABASE%"
 
 exit /b %ERRORLEVEL%
diff --git a/tools/autobuild.sh b/tools/autobuild.sh
index b50fd89f8aa..ba30bd74b3b 100755
--- a/tools/autobuild.sh
+++ b/tools/autobuild.sh
@@ -3,9 +3,9 @@
 set -eu
 
 exec "${CODEQL_DIST}/codeql" database index-files \
-    --include-extension=.rb \
-    --include-extension=.erb \
+    --include-extension=.ql \
+    --include-extension=.qll \
     --size-limit=5m \
-    --language=ruby \
+    --language=ql \
     --working-dir=.\
-    "$CODEQL_EXTRACTOR_RUBY_WIP_DATABASE"
+    "$CODEQL_EXTRACTOR_QL_WIP_DATABASE"
diff --git a/tools/index-files.cmd b/tools/index-files.cmd
index bc96895a988..f34b06f2aed 100644
--- a/tools/index-files.cmd
+++ b/tools/index-files.cmd
@@ -1,8 +1,8 @@
 @echo off
 
-type NUL && "%CODEQL_EXTRACTOR_RUBY_ROOT%\tools\win64\extractor.exe" ^
+type NUL && "%CODEQL_EXTRACTOR_QL_ROOT%\tools\win64\extractor.exe" ^
         --file-list "%1" ^
-        --source-archive-dir "%CODEQL_EXTRACTOR_RUBY_SOURCE_ARCHIVE_DIR%" ^
-        --output-dir "%CODEQL_EXTRACTOR_RUBY_TRAP_DIR%"
+        --source-archive-dir "%CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR%" ^
+        --output-dir "%CODEQL_EXTRACTOR_QL_TRAP_DIR%"
 
 exit /b %ERRORLEVEL%
diff --git a/tools/index-files.sh b/tools/index-files.sh
index cfd5a360a27..c4bff226747 100755
--- a/tools/index-files.sh
+++ b/tools/index-files.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-exec "${CODEQL_EXTRACTOR_RUBY_ROOT}/tools/${CODEQL_PLATFORM}/extractor" \
+exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/extractor" \
         --file-list "$1" \
-        --source-archive-dir "$CODEQL_EXTRACTOR_RUBY_SOURCE_ARCHIVE_DIR" \
-        --output-dir "$CODEQL_EXTRACTOR_RUBY_TRAP_DIR"
+        --source-archive-dir "$CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR" \
+        --output-dir "$CODEQL_EXTRACTOR_QL_TRAP_DIR"
diff --git a/tools/qltest.cmd b/tools/qltest.cmd
index f8e01030750..972afb64aaa 100644
--- a/tools/qltest.cmd
+++ b/tools/qltest.cmd
@@ -6,6 +6,6 @@ type NUL && "%CODEQL_DIST%\codeql.exe" database index-files ^
     --include-extension=.erb ^
     --size-limit=5m ^
     --language=ruby ^
-    "%CODEQL_EXTRACTOR_RUBY_WIP_DATABASE%"
+    "%CODEQL_EXTRACTOR_QL_WIP_DATABASE%"
 
 exit /b %ERRORLEVEL%
diff --git a/tools/qltest.sh b/tools/qltest.sh
index 874357a6318..8c13850176d 100755
--- a/tools/qltest.sh
+++ b/tools/qltest.sh
@@ -9,4 +9,4 @@ exec "${CODEQL_DIST}/codeql" database index-files \
     --size-limit=5m \
     --language=ruby \
     --working-dir=.\
-    "$CODEQL_EXTRACTOR_RUBY_WIP_DATABASE"
+    "$CODEQL_EXTRACTOR_QL_WIP_DATABASE"