Merge pull request #2510 from github/robertbrignull/use_contains_path

Use containsPath where possible

Author: robertbrignull

extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts

@@ -14,6 +14,7 @@ import { DatabaseItem } from "../databases/local-databases";
 import { getQlPackPath, QLPACK_FILENAMES } from "../pure/ql";
 import { getErrorMessage } from "../pure/helpers-pure";
 import { ExtensionPack, ExtensionPackModelFile } from "./shared/extension-pack";
+import { containsPath } from "../pure/files";
 
 const maxStep = 3;
 
@@ -347,11 +348,7 @@ async function pickNewModelFile(
           return "File already exists";
         }
 
-        const notInExtensionPack = relative(
-          extensionPack.path,
-          path,
-        ).startsWith("..");
-        if (notInExtensionPack) {
+        if (!containsPath(extensionPack.path, path)) {
           return "File must be in the extension pack";
         }
 

extensions/ql-vscode/src/databases/local-databases/database-item-impl.ts

@@ -2,7 +2,7 @@
 import * as cli from "../../codeql-cli/cli";
 import vscode from "vscode";
 import { FullDatabaseOptions } from "./database-options";
-import { basename, dirname, extname, join, relative } from "path";
+import { basename, dirname, extname, join } from "path";
 import {
   decodeSourceArchiveUri,
   encodeArchiveBasePath,
@@ -12,7 +12,7 @@ import {
 import { DatabaseItem, PersistedDatabaseItem } from "./database-item";
 import { isLikelyDatabaseRoot } from "./db-contents-heuristics";
 import { stat } from "fs-extra";
-import { pathsEqual } from "../../pure/files";
+import { containsPath, pathsEqual } from "../../pure/files";
 import { DatabaseContents } from "./database-contents";
 
 export class DatabaseItemImpl implements DatabaseItem {
@@ -199,7 +199,7 @@ export class DatabaseItemImpl implements DatabaseItem {
     try {
       const stats = await stat(testPath);
       if (stats.isDirectory()) {
-        return !relative(testPath, databasePath).startsWith("..");
+        return containsPath(testPath, databasePath);
       } else {
         // database for /one/two/three/test.ql is at /one/two/three/three.testproj
         const testdir = dirname(testPath);