mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Don't create array entry if workspace contains no queries

Browse Source
This commit is contained in:
Robert
2023-05-24 17:49:41 +01:00
parent ff88a8d491
commit 301149fd32
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/ql-vscode/src/queries-panel/query-discovery.ts
View File

@@ -99,22 +99,26 @@ export class QueryDiscovery
): Promise<FileTreeDirectory[]> { ): Promise<FileTreeDirectory[]> {
const rootDirectories = []; const rootDirectories = [];
for (const workspaceFolder of workspaceFolders) { for (const workspaceFolder of workspaceFolders) {
rootDirectories.push( const root = await this.discoverQueriesInWorkspace(workspaceFolder);
await this.discoverQueriesInWorkspace(workspaceFolder), if (root !== undefined) {
); rootDirectories.push(root);
}
} }
return rootDirectories; return rootDirectories;
} }
private async discoverQueriesInWorkspace( private async discoverQueriesInWorkspace(
workspaceFolder: WorkspaceFolder, workspaceFolder: WorkspaceFolder,
): Promise<FileTreeDirectory> { ): Promise<FileTreeDirectory | undefined> {
const fullPath = workspaceFolder.uri.fsPath; const fullPath = workspaceFolder.uri.fsPath;
const name = workspaceFolder.name; const name = workspaceFolder.name;
const rootDirectory = new FileTreeDirectory(fullPath, name);
const resolvedQueries = await this.cliServer.resolveQueries(fullPath); const resolvedQueries = await this.cliServer.resolveQueries(fullPath);
if (resolvedQueries.length === 0) {
return undefined;
}
const rootDirectory = new FileTreeDirectory(fullPath, name);
for (const queryPath of resolvedQueries) { for (const queryPath of resolvedQueries) {
const relativePath = normalize(relative(fullPath, queryPath)); const relativePath = normalize(relative(fullPath, queryPath));
const dirName = dirname(relativePath); const dirName = dirname(relativePath);