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

Fix unit test and add comments/todos

Browse Source
This commit is contained in:
Andrew Eisenberg
2022-02-17 13:07:10 -08:00
parent 969dd26041
commit a502ee85d1
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
extensions/ql-vscode/src/query-history.ts
View File

@@ -492,8 +492,9 @@ export class QueryHistoryManager extends DisposableObject {
singleItem: QueryHistoryInfo, singleItem: QueryHistoryInfo,
multiSelect: QueryHistoryInfo[] multiSelect: QueryHistoryInfo[]
): Promise<void> { ): Promise<void> {
// TODO will support remote queries
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
if (!this.assertSingleQuery(finalMultiSelect) || finalSingleItem.t !== 'local') { if (!this.assertSingleQuery(finalMultiSelect) || (finalSingleItem && finalSingleItem.t !== 'local')) {
return; return;
} }
@@ -581,7 +582,8 @@ export class QueryHistoryManager extends DisposableObject {
): Promise<void> { ): Promise<void> {
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
if (!this.assertSingleQuery(finalMultiSelect) || finalSingleItem.t !== 'local') { // TODO will support remote queries
if (!this.assertSingleQuery(finalMultiSelect) || finalSingleItem?.t !== 'local') {
return; return;
} }
@@ -605,7 +607,8 @@ export class QueryHistoryManager extends DisposableObject {
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
try { try {
if (finalSingleItem.t !== 'local') { // local queries only
if (finalSingleItem?.t !== 'local') {
throw new Error('Please select a local query.'); throw new Error('Please select a local query.');
} }
@@ -628,8 +631,9 @@ export class QueryHistoryManager extends DisposableObject {
singleItem: QueryHistoryInfo, singleItem: QueryHistoryInfo,
multiSelect: QueryHistoryInfo[] multiSelect: QueryHistoryInfo[]
) { ) {
// TODO will support remote queries
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
if (!this.assertSingleQuery(finalMultiSelect) || finalSingleItem.t !== 'local') { if (!this.assertSingleQuery(finalMultiSelect) || (finalSingleItem && finalSingleItem?.t !== 'local')) {
return; return;
} }
@@ -660,6 +664,7 @@ export class QueryHistoryManager extends DisposableObject {
singleItem: LocalQueryInfo, singleItem: LocalQueryInfo,
multiSelect: LocalQueryInfo[] multiSelect: LocalQueryInfo[]
) { ) {
// Local queries only
if (!this.assertSingleQuery(multiSelect)) { if (!this.assertSingleQuery(multiSelect)) {
return; return;
} }
@@ -679,6 +684,8 @@ export class QueryHistoryManager extends DisposableObject {
singleItem: QueryHistoryInfo, singleItem: QueryHistoryInfo,
multiSelect: QueryHistoryInfo[] multiSelect: QueryHistoryInfo[]
) { ) {
// Local queries only
// In the future, we may support cancelling remote queries, but this is not a short term plan.
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
(finalMultiSelect || [finalSingleItem]).forEach((item) => { (finalMultiSelect || [finalSingleItem]).forEach((item) => {
@@ -694,7 +701,8 @@ export class QueryHistoryManager extends DisposableObject {
) { ) {
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
if (!this.assertSingleQuery(finalMultiSelect) || finalSingleItem.t !== 'local') { // TODO will support remote queries
if (!this.assertSingleQuery(finalMultiSelect) || (finalSingleItem && finalSingleItem?.t !== 'local')) {
return; return;
} }
@@ -719,7 +727,8 @@ export class QueryHistoryManager extends DisposableObject {
) { ) {
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
if (!this.assertSingleQuery(finalMultiSelect) || finalSingleItem.t !== 'local' || !finalSingleItem.completedQuery) { // Local queries only
if (!this.assertSingleQuery(finalMultiSelect) || !finalSingleItem || finalSingleItem.t !== 'local' || !finalSingleItem.completedQuery) {
return; return;
} }
@@ -743,7 +752,8 @@ export class QueryHistoryManager extends DisposableObject {
) { ) {
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
if (!this.assertSingleQuery(finalMultiSelect) || finalSingleItem.t !== 'local' || !finalSingleItem.completedQuery) { // Local queries only
if (!this.assertSingleQuery(finalMultiSelect) || !finalSingleItem || finalSingleItem.t !== 'local' || !finalSingleItem.completedQuery) {
return; return;
} }
const query = finalSingleItem.completedQuery.query; const query = finalSingleItem.completedQuery.query;
@@ -764,7 +774,8 @@ export class QueryHistoryManager extends DisposableObject {
) { ) {
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
if (!this.assertSingleQuery(finalMultiSelect) || finalSingleItem.t !== 'local' || !finalSingleItem.completedQuery) { // Local queries only
if (!this.assertSingleQuery(finalMultiSelect) || !finalSingleItem || finalSingleItem.t !== 'local' || !finalSingleItem.completedQuery) {
return; return;
} }
@@ -779,7 +790,8 @@ export class QueryHistoryManager extends DisposableObject {
) { ) {
const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect); const { finalSingleItem, finalMultiSelect } = this.determineSelection(singleItem, multiSelect);
if (!this.assertSingleQuery(finalMultiSelect) || finalSingleItem.t !== 'local' || !finalSingleItem.completedQuery) { // Local queries only
if (!this.assertSingleQuery(finalMultiSelect) || !finalSingleItem || finalSingleItem.t !== 'local' || !finalSingleItem.completedQuery) {
return; return;
} }