Skip to content

Commit 421fe11

Browse files
Normalize paths before doing string comparisons
1 parent 1dcd048 commit 421fe11

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

extensions/ql-vscode/src/data-extensions-editor/modeled-method-fs.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
1414
import { load as loadYaml } from "js-yaml";
1515
import { CodeQLCliServer } from "../codeql-cli/cli";
16+
import { pathsEqual } from "../common/files";
1617

1718
export async function saveModeledMethods(
1819
extensionPack: ExtensionPack,
@@ -75,15 +76,17 @@ export async function listModelFiles(
7576
extensionPackPath: string,
7677
cliServer: CodeQLCliServer,
7778
): Promise<Set<string>> {
78-
const extensions = await cliServer.resolveExtensions(
79+
const result = await cliServer.resolveExtensions(
7980
extensionPackPath,
8081
getOnDiskWorkspaceFolders(),
8182
);
8283

8384
const modelFiles = new Set<string>();
84-
if (extensionPackPath in extensions.data) {
85-
for (const extension of extensions.data[extensionPackPath]) {
86-
modelFiles.add(extension.file);
85+
for (const [path, extensions] of Object.entries(result.data)) {
86+
if (pathsEqual(path, extensionPackPath)) {
87+
for (const extension of extensions) {
88+
modelFiles.add(extension.file);
89+
}
8790
}
8891
}
8992
return modelFiles;

0 commit comments

Comments
 (0)