Autofix prefer-template

Author: elenatanasoiu

extensions/ql-vscode/.eslintrc.js

@@ -66,7 +66,6 @@ module.exports = {
     "no-fallthrough": "off",
     "no-console": "off",
     "no-shadow": "off",
-    "prefer-template": "off",
     "github/array-foreach": "off",
     "github/no-then": "off",
   },

extensions/ql-vscode/gulpfile.ts/deploy.ts

@@ -55,7 +55,7 @@ export async function deployPackage(
     if (isDevBuild) {
       // NOTE: rootPackage.name had better not have any regex metacharacters
       const oldDevBuildPattern = new RegExp(
-        "^" + packageJson.name + "[^/]+-dev[0-9.]+\\.vsix$",
+        `^${packageJson.name}[^/]+-dev[0-9.]+\\.vsix$`,
       );
       // Dev package filenames are of the form
       //    vscode-codeql-0.0.1-dev.2019.9.27.19.55.20.vsix
@@ -67,8 +67,7 @@ export async function deployPackage(
         });
       const now = new Date();
       packageJson.version =
-        packageJson.version +
-        `-dev.${now.getUTCFullYear()}.${
+        `${packageJson.version}-dev.${now.getUTCFullYear()}.${
           now.getUTCMonth() + 1
         }.${now.getUTCDate()}` +
         `.${now.getUTCHours()}.${now.getUTCMinutes()}.${now.getUTCSeconds()}`;

extensions/ql-vscode/gulpfile.ts/textmate.ts

@@ -61,11 +61,11 @@ function getNodeMatchText(rule: any): string {
     for (const patternIndex in rule.patterns) {
       const pattern = rule.patterns[patternIndex];
       if (pattern.include !== null) {
-        patterns.push("(?" + pattern.include + ")");
+        patterns.push(`(?${pattern.include})`);
       }
     }
 
-    return "(?:" + patterns.join("|") + ")";
+    return `(?:${patterns.join("|")})`;
   } else {
     return "";
   }
@@ -149,8 +149,8 @@ function visitAllMatchesInRule(rule: any, action: (match: any) => any) {
  * @param key Base key of the property to be transformed.
  */
 function expandPatternMatchProperties(rule: any, key: "begin" | "end") {
-  const patternKey = key + "Pattern";
-  const capturesKey = key + "Captures";
+  const patternKey = `${key}Pattern`;
+  const capturesKey = `${key}Captures`;
   const pattern = rule[patternKey];
   if (pattern !== undefined) {
     const patterns: string[] = Array.isArray(pattern) ? pattern : [pattern];
@@ -207,7 +207,7 @@ function transformFile(yaml: any) {
   });
 
   if (yaml.regexOptions !== undefined) {
-    const regexOptions = "(?" + yaml.regexOptions + ")";
+    const regexOptions = `(?${yaml.regexOptions})`;
     visitAllRulesInFile(yaml, (rule) => {
       visitAllMatchesInRule(rule, (match) => {
         return regexOptions + match;

extensions/ql-vscode/gulpfile.ts/typescript.ts

@@ -9,24 +9,16 @@ function goodReporter(): ts.reporter.Reporter {
     error: (error, typescript) => {
       if (error.tsFile) {
         console.log(
-          "[" +
-            gray("gulp-typescript") +
-            "] " +
-            red(
-              error.fullFilename +
-                "(" +
-                (error.startPosition!.line + 1) +
-                "," +
-                error.startPosition!.character +
-                "): ",
-            ) +
-            "error TS" +
-            error.diagnostic.code +
-            ": " +
-            typescript.flattenDiagnosticMessageText(
-              error.diagnostic.messageText,
-              "\n",
-            ),
+          `[${gray("gulp-typescript")}] ${red(
+            `${error.fullFilename}(${error.startPosition!.line + 1},${
+              error.startPosition!.character
+            }): `,
+          )}error TS${
+            error.diagnostic.code
+          }: ${typescript.flattenDiagnosticMessageText(
+            error.diagnostic.messageText,
+            "\n",
+          )}`,
         );
       } else {
         console.log(error.message);
@@ -39,7 +31,7 @@ const tsProject = ts.createProject("tsconfig.json");
 
 export function cleanOutput() {
   return tsProject.projectDirectory
-    ? del(tsProject.projectDirectory + "/out/*")
+    ? del(`${tsProject.projectDirectory}/out/*`)
     : Promise.resolve();
 }
 

extensions/ql-vscode/scripts/add-fields-to-scenarios.ts

@@ -82,7 +82,7 @@ async function addFieldsToRepository(repository: RepositoryWithMetadata) {
 
 async function addFieldsToScenarios() {
   if (!(await pathExists(scenariosDirectory))) {
-    console.error("Scenarios directory does not exist: " + scenariosDirectory);
+    console.error(`Scenarios directory does not exist: ${scenariosDirectory}`);
     return;
   }
 

extensions/ql-vscode/scripts/fix-scenario-file-numbering.ts

@@ -26,7 +26,7 @@ const scenarioDirectory = resolve(scenariosDirectory, scenarioName);
 async function fixScenarioFiles() {
   console.log(scenarioDirectory);
   if (!(await pathExists(scenarioDirectory))) {
-    console.error("Scenario directory does not exist: " + scenarioDirectory);
+    console.error(`Scenario directory does not exist: ${scenarioDirectory}`);
     return;
   }
 

extensions/ql-vscode/scripts/lint-scenarios.ts

@@ -25,15 +25,15 @@ async function lintScenarios() {
   const ajv = new Ajv();
 
   if (!ajv.validateSchema(schema)) {
-    throw new Error("Invalid schema: " + ajv.errorsText());
+    throw new Error(`Invalid schema: ${ajv.errorsText()}`);
   }
 
   const validate = await ajv.compile(schema);
 
   let invalidFiles = 0;
 
   if (!(await pathExists(scenariosDirectory))) {
-    console.error("Scenarios directory does not exist: " + scenariosDirectory);
+    console.error(`Scenarios directory does not exist: ${scenariosDirectory}`);
     // Do not exit with a non-zero status code, as this is not a fatal error.
     return;
   }

extensions/ql-vscode/src/archive-filesystem-provider.ts

@@ -75,7 +75,7 @@ export function encodeSourceArchiveUri(ref: ZipFileReference): vscode.Uri {
   if (encodedPath.startsWith("/")) {
     sourceArchiveZipPathStartIndex = 0;
   } else {
-    encodedPath = "/" + encodedPath;
+    encodedPath = `/${encodedPath}`;
     sourceArchiveZipPathStartIndex = 1;
   }
 
@@ -85,7 +85,7 @@ export function encodeSourceArchiveUri(ref: ZipFileReference): vscode.Uri {
   const sourceArchiveZipPathEndIndex =
     sourceArchiveZipPathStartIndex + sourceArchiveZipPath.length;
   const authority = `${sourceArchiveZipPathStartIndex}-${sourceArchiveZipPathEndIndex}`;
-  return vscode.Uri.parse(zipArchiveScheme + ":/", true).with({
+  return vscode.Uri.parse(`${zipArchiveScheme}:/`, true).with({
     path: encodedPath,
     authority,
   });

extensions/ql-vscode/src/cli.ts

@@ -930,9 +930,7 @@ export class CodeQLCliServer implements Disposable {
     const additionalArgs = sourceInfo
       ? [
           "--dot-location-url-format",
-          "file://" +
-            sourceInfo.sourceLocationPrefix +
-            "{path}:{start:line}:{start:column}:{end:line}:{end:column}",
+          `file://${sourceInfo.sourceLocationPrefix}{path}:{start:line}:{start:column}:{end:line}:{end:column}`,
         ]
       : [];
 

extensions/ql-vscode/src/databaseFetcher.ts

@@ -753,7 +753,7 @@ async function promptForLanguage(
  */
 async function ensureZippedSourceLocation(databasePath: string): Promise<void> {
   const srcFolderPath = join(databasePath, "src");
-  const srcZipPath = srcFolderPath + ".zip";
+  const srcZipPath = `${srcFolderPath}.zip`;
 
   if ((await pathExists(srcFolderPath)) && !(await pathExists(srcZipPath))) {
     await zip(srcFolderPath, srcZipPath);