Fix quick-query error in .qll files
Fixes https://github.com/github/vscode-codeql/issues/293
This commit is contained in:
Родитель
22003e1375
Коммит
5fd2596537
|
@ -313,7 +313,7 @@ type SelectedQuery = {
|
||||||
* @param selectedResourceUri The selected resource when the command was run.
|
* @param selectedResourceUri The selected resource when the command was run.
|
||||||
* @param quickEval Whether the command being run is `Quick Evaluation`.
|
* @param quickEval Whether the command being run is `Quick Evaluation`.
|
||||||
*/
|
*/
|
||||||
async function determineSelectedQuery(selectedResourceUri: vscode.Uri | undefined, quickEval: boolean): Promise<SelectedQuery> {
|
export async function determineSelectedQuery(selectedResourceUri: vscode.Uri | undefined, quickEval: boolean): Promise<SelectedQuery> {
|
||||||
const editor = vscode.window.activeTextEditor;
|
const editor = vscode.window.activeTextEditor;
|
||||||
|
|
||||||
// Choose which QL file to use.
|
// Choose which QL file to use.
|
||||||
|
@ -336,8 +336,15 @@ async function determineSelectedQuery(selectedResourceUri: vscode.Uri | undefine
|
||||||
}
|
}
|
||||||
const queryPath = queryUri.fsPath || '';
|
const queryPath = queryUri.fsPath || '';
|
||||||
|
|
||||||
if (!queryPath.endsWith('.ql')) {
|
if (quickEval) {
|
||||||
throw new Error('The selected resource is not a CodeQL query file; It should have the extension ".ql".');
|
if (!(queryPath.endsWith('.ql') || queryPath.endsWith('.qll'))) {
|
||||||
|
throw new Error('The selected resource is not a CodeQL file; It should have the extension ".ql" or ".qll".');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (!(queryPath.endsWith('.ql'))) {
|
||||||
|
throw new Error('The selected resource is not a CodeQL query file; It should have the extension ".ql".');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Whether we chose the file from the active editor or from a context menu,
|
// Whether we chose the file from the active editor or from a context menu,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче