Use normalized path for checking inclusion

Author: koesie10

extensions/ql-vscode/src/databases/local-databases.ts

@@ -24,7 +24,7 @@ import { DisposableObject } from "../pure/disposable-object";
 import { Logger, extLogger } from "../common";
 import { asError, getErrorMessage } from "../pure/helpers-pure";
 import { QueryRunner } from "../query-server";
-import { pathsEqual } from "../pure/files";
+import { containsPath, pathsEqual } from "../pure/files";
 import { redactableError } from "../pure/errors";
 import {
   getAutogenerateQlPacks,
@@ -1157,7 +1157,7 @@ export class DatabaseManager extends DisposableObject {
     // but storagePath will have an uppercase drive letter. Be sure to compare
     // URIs to URIs only
     if (storageUri) {
-      return uri.fsPath.startsWith(storageUri.fsPath);
+      return containsPath(storageUri.fsPath, uri.fsPath, process.platform);
     }
     return false;
   }

extensions/ql-vscode/src/pure/files.ts

@@ -51,21 +51,37 @@ export async function getDirectoryNamesInsidePath(
   return dirNames;
 }
 
-export function pathsEqual(
-  path1: string,
-  path2: string,
-  platform: NodeJS.Platform,
-): boolean {
+function normalizePath(path: string, platform: NodeJS.Platform): string {
   // On Windows, "C:/", "C:\", and "c:/" are all equivalent. We need
   // to normalize the paths to ensure they all get resolved to the
   // same format. On Windows, we also need to do the comparison
   // case-insensitively.
-  path1 = resolve(path1);
-  path2 = resolve(path2);
+  path = resolve(path);
   if (platform === "win32") {
-    return path1.toLowerCase() === path2.toLowerCase();
+    path = path.toLowerCase();
   }
-  return path1 === path2;
+  return path;
+}
+
+export function pathsEqual(
+  path1: string,
+  path2: string,
+  platform: NodeJS.Platform,
+): boolean {
+  return normalizePath(path1, platform) === normalizePath(path2, platform);
+}
+
+/**
+ * Returns true if path1 contains path2.
+ */
+export function containsPath(
+  path1: string,
+  path2: string,
+  platform: NodeJS.Platform,
+): boolean {
+  return normalizePath(path2, platform).startsWith(
+    normalizePath(path1, platform),
+  );
 }
 
 export async function readDirFullPaths(path: string): Promise<string[]> {