Skip to content

Use containsPath where possible #2510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertbrignull merged 1 commit into from
Jun 13, 2023
Merged

Use containsPath where possible #2510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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";
}

Expand Down
6 changes: 3 additions & 3 deletions extensions/ql-vscode/src/databases/local-databases/database-item-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down