Skip to content

Fix AST Viewer #949

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
dbartol merged 5 commits into from
Sep 8, 2021
Merged

Fix AST Viewer #949

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37ab1b7
Fix AST Viewer
aeisenberg Sep 8, 2021
c4a8b9b
Expand qlpack resolution integration test to all languages
aeisenberg Sep 8, 2021
024d3e6
Remove support for 2.2.6 CLI
aeisenberg Sep 8, 2021
5b4479f
Update changelog
aeisenberg Sep 8, 2021
2c707bf
Merge branch 'main' into aeisenberg/print-ast-fix
Sep 8, 2021
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
24 changes: 11 additions & 13 deletions extensions/ql-vscode/src/contextual/queryResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,24 @@ export async function qlpackOfDatabase(cli: CodeQLCliServer, db: DatabaseItem):
* @returns The found queries from the first pack in which any matching queries were found.
*/
async function resolveQueriesFromPacks(cli: CodeQLCliServer, qlpacks: string[], keyType: KeyType): Promise<string[]> {
const suiteFile = (await tmp.file({
postfix: '.qls'
})).path;
const suiteYaml = [];
for (const qlpack of qlpacks) {
const suiteFile = (await tmp.file({
postfix: '.qls'
})).path;
const suiteYaml = {
qlpack,
suiteYaml.push({
from: qlpack,
queries: '.',
include: {
kind: kindOfKeyType(keyType),
'tags contain': tagOfKeyType(keyType)
}
};
await fs.writeFile(suiteFile, yaml.safeDump(suiteYaml), 'utf8');

const queries = await cli.resolveQueriesInSuite(suiteFile, helpers.getOnDiskWorkspaceFolders());
if (queries.length > 0) {
return queries;
}
});
}
await fs.writeFile(suiteFile, yaml.safeDump(suiteYaml), 'utf8');

return [];
const queries = await cli.resolveQueriesInSuite(suiteFile, helpers.getOnDiskWorkspaceFolders());
return queries;
}

export async function resolveQueries(cli: CodeQLCliServer, qlpacks: QlPacksForLanguage, keyType: KeyType): Promise<string[]> {
Expand Down
14 changes: 14 additions & 0 deletions extensions/ql-vscode/src/vscode-tests/cli-integration/run-cli.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { CodeQLCliServer, QueryInfoByLanguage } from '../../cli';
import { CodeQLExtensionInterface } from '../../extension';
import { skipIfNoCodeQL } from '../ensureCli';
import { getOnDiskWorkspaceFolders } from '../../helpers';
import { resolveQueries } from '../../contextual/queryResolver';
import { KeyType } from '../../contextual/keyType';

/**
* Perform proper integration tests by running the CLI
Expand Down Expand Up @@ -68,4 +70,16 @@ describe('Use cli', function() {
const queryInfo: QueryInfoByLanguage = await cli.resolveQueryByLanguage(getOnDiskWorkspaceFolders(), Uri.file(queryPath));
expect((Object.keys(queryInfo.byLanguage))[0]).to.eql('javascript');
});

it.only('should resolve printAST queries', async function() {
Copy link
Copy Markdown
Contributor

@adityasharad adityasharad Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we make this loop over all languages? The filenames may differ.

Copy link
Copy Markdown
Contributor Author

@aeisenberg aeisenberg Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea. I will change that.

skipIfNoCodeQL(this);

const result = await resolveQueries(cli, {
dbschemePack: 'codeql/javascript-all',
Copy link
Copy Markdown
Contributor

@adityasharad adityasharad Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do these tests get the query repo checkout? If we're splitting over multiple CLI versions, we should use the corresponding codeql-cli/version tags from the query repos, as well as latest main for the last released CLI.

Copy link
Copy Markdown
Contributor Author

@aeisenberg aeisenberg Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, the integration tests checks out the expected codeql version for each CLI version.

dbschemePackIsLibraryPack: true,
queryPack: 'codeql/javascript-queries'
}, KeyType.PrintAstQuery);
expect(result.length).to.eq(1);
expect(result[0].endsWith('javascript/ql/src/printAst.ql')).to.be.true;
});
});