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

Adds interface-types and result-keys to pure

Browse Source 
Will ensure that these files never have vscode dependencies.
This commit is contained in:
Andrew Eisenberg
2020-11-03 11:28:12 -08:00
parent fe1476f875
commit 9ddfd58a2b
20 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/ql-vscode/src/cli.ts
View File

@@ -15,7 +15,7 @@ import { BQRSInfo, DecodedBqrsChunk } from './pure/bqrs-cli-types';
import { CliConfig } from './config';
import { DistributionProvider, FindDistributionResultKind } from './distribution';
import { assertNever } from './pure/helpers-pure';
import { QueryMetadata, SortDirection } from './interface-types';
import { QueryMetadata, SortDirection } from './pure/interface-types';
import { Logger, ProgressReporter } from './logging';
/**
@@ -702,7 +702,7 @@ export class CodeQLCliServer implements Disposable {
private async refreshVersion() {
const distribution = await this.distributionProvider.getDistribution();
switch(distribution.kind) {
switch (distribution.kind) {
case FindDistributionResultKind.CompatibleDistribution:
// eslint-disable-next-line no-fallthrough
case FindDistributionResultKind.IncompatibleDistribution:

2
extensions/ql-vscode/src/compare/compare-interface.ts
View File

@@ -14,7 +14,7 @@ import {
FromCompareViewMessage,
ToCompareViewMessage,
QueryCompareResult,
} from '../interface-types';
} from '../pure/interface-types';
import { Logger } from '../logging';
import { CodeQLCliServer } from '../cli';
import { DatabaseManager } from '../databases';

2
extensions/ql-vscode/src/compare/resultsDiff.ts
View File

@@ -1,5 +1,5 @@
import { RawResultSet } from '../pure/bqrs-cli-types';
import { QueryCompareResult } from '../interface-types';
import { QueryCompareResult } from '../pure/interface-types';
/**
* Compare the rows of two queries. Use deep equality to determine if

2
extensions/ql-vscode/src/compare/view/Compare.tsx
View File

@@ -5,7 +5,7 @@ import * as Rdom from 'react-dom';
import {
ToCompareViewMessage,
SetComparisonsMessage,
} from '../../interface-types';
} from '../../pure/interface-types';
import CompareSelector from './CompareSelector';
import { vscode } from '../../view/vscode-api';
import CompareTable from './CompareTable';

2
extensions/ql-vscode/src/compare/view/CompareTable.tsx
View File

@@ -1,6 +1,6 @@
import * as React from 'react';
import { SetComparisonsMessage } from '../../interface-types';
import { SetComparisonsMessage } from '../../pure/interface-types';
import RawTableHeader from '../../view/RawTableHeader';
import { className } from '../../view/result-table-utils';
import { ResultRow } from '../../pure/bqrs-cli-types';

2
extensions/ql-vscode/src/interface-utils.ts
View File

@@ -17,7 +17,7 @@ import {
isLineColumnLoc
} from './pure/bqrs-utils';
import { DatabaseItem, DatabaseManager } from './databases';
import { ViewSourceFileMsg } from './interface-types';
import { ViewSourceFileMsg } from './pure/interface-types';
import { Logger } from './logging';
import {
LineColumnLocation,

4
extensions/ql-vscode/src/interface.ts
View File

@@ -30,7 +30,7 @@ import {
INTERPRETED_RESULTS_PAGE_SIZE,
ALERTS_TABLE_NAME,
RawResultsSortState,
} from './interface-types';
} from './pure/interface-types';
import { Logger } from './logging';
import { commandRunner } from './helpers';
import * as messages from './pure/messages';
@@ -46,7 +46,7 @@ import {
shownLocationLineDecoration,
jumpToLocation,
} from './interface-utils';
import { getDefaultResultSetName, ParsedResultSets } from './interface-types';
import { getDefaultResultSetName, ParsedResultSets } from './pure/interface-types';
import { RawResultSet, transformBqrsResultSet, ResultSetSchema } from './pure/bqrs-cli-types';
/**

2
extensions/ql-vscode/src/interface-types.ts → extensions/ql-vscode/src/pure/interface-types.ts
View File

@@ -1,5 +1,5 @@
import * as sarif from 'sarif';
import { RawResultSet, ResultRow, ResultSetSchema, Column, ResolvableLocationValue } from './pure/bqrs-cli-types';
import { RawResultSet, ResultRow, ResultSetSchema, Column, ResolvableLocationValue } from './bqrs-cli-types';
/**
* This module contains types and code that are shared between

0
extensions/ql-vscode/src/result-keys.ts → extensions/ql-vscode/src/pure/result-keys.ts
View File

6
extensions/ql-vscode/src/query-results.ts
View File

@@ -6,7 +6,7 @@ import * as cli from './cli';
import * as sarif from 'sarif';
import * as fs from 'fs-extra';
import * as path from 'path';
import { RawResultsSortState, SortedResultSetInfo, DatabaseInfo, QueryMetadata, InterpretedResultsSortState, ResultsPaths } from './interface-types';
import { RawResultsSortState, SortedResultSetInfo, DatabaseInfo, QueryMetadata, InterpretedResultsSortState, ResultsPaths } from './pure/interface-types';
import { QueryHistoryConfig } from './config';
import { QueryHistoryItemOptions } from './query-history';
@@ -96,8 +96,8 @@ export class CompletedQuery implements QueryWithResults {
}
getLabel(): string {
return this.options?.label
|| this.config.format;
return this.options?.label
|| this.config.format;
}
get didRunSuccessfully(): boolean {

2
extensions/ql-vscode/src/run-queries.ts
View File

@@ -16,7 +16,7 @@ import * as cli from './cli';
import * as config from './config';
import { DatabaseItem, getUpgradesDirectories } from './databases';
import * as helpers from './helpers';
import { DatabaseInfo, QueryMetadata, ResultsPaths } from './interface-types';
import { DatabaseInfo, QueryMetadata, ResultsPaths } from './pure/interface-types';
import { logger } from './logging';
import * as messages from './pure/messages';
import { QueryHistoryItemOptions } from './query-history';

2
extensions/ql-vscode/src/view/RawTableHeader.tsx
View File

@@ -1,7 +1,7 @@
import * as React from 'react';
import { vscode } from './vscode-api';
import { RawResultsSortState, SortDirection } from '../interface-types';
import { RawResultsSortState, SortDirection } from '../pure/interface-types';
import { nextSortDirection } from './result-table-utils';
import { Column } from '../pure/bqrs-cli-types';

6
extensions/ql-vscode/src/view/alert-table.tsx
View File

@@ -1,17 +1,17 @@
import * as path from 'path';
import * as React from 'react';
import * as Sarif from 'sarif';
import * as Keys from '../result-keys';
import * as Keys from '../pure/result-keys';
import * as octicons from './octicons';
import { className, renderLocation, ResultTableProps, zebraStripe, selectableZebraStripe, jumpToLocation, nextSortDirection } from './result-table-utils';
import { onNavigation, NavigationEvent } from './results';
import { PathTableResultSet } from '../interface-types';
import { PathTableResultSet } from '../pure/interface-types';
import {
parseSarifPlainTextMessage,
parseSarifLocation,
isNoLocation
} from '../pure/sarif-utils';
import { InterpretedResultsSortColumn, SortDirection, InterpretedResultsSortState } from '../interface-types';
import { InterpretedResultsSortColumn, SortDirection, InterpretedResultsSortState } from '../pure/interface-types';
import { vscode } from './vscode-api';
import { isWholeFileLoc, isLineColumnLoc } from '../pure/bqrs-utils';

4
extensions/ql-vscode/src/view/raw-results-table.tsx
View File

@@ -1,7 +1,7 @@
import * as React from 'react';
import { ResultTableProps, className } from './result-table-utils';
import { RAW_RESULTS_LIMIT, RawResultsSortState } from '../interface-types';
import { RawTableResultSet } from '../interface-types';
import { RAW_RESULTS_LIMIT, RawResultsSortState } from '../pure/interface-types';
import { RawTableResultSet } from '../pure/interface-types';
import RawTableHeader from './RawTableHeader';
import RawTableRow from './RawTableRow';
import { ResultRow } from '../pure/bqrs-cli-types';

4
extensions/ql-vscode/src/view/result-table-utils.tsx
View File

@@ -1,9 +1,9 @@
import * as React from 'react';
import { UrlValue, ResolvableLocationValue } from '../pure/bqrs-cli-types';
import { isStringLoc, tryGetResolvableLocation } from '../pure/bqrs-utils';
import { RawResultsSortState, QueryMetadata, SortDirection } from '../interface-types';
import { RawResultsSortState, QueryMetadata, SortDirection } from '../pure/interface-types';
import { assertNever } from '../pure/helpers-pure';
import { ResultSet } from '../interface-types';
import { ResultSet } from '../pure/interface-types';
import { vscode } from './vscode-api';
export interface ResultTableProps {

11
extensions/ql-vscode/src/view/result-tables.tsx
View File

@@ -13,10 +13,15 @@ import {
getDefaultResultSetName,
ParsedResultSets,
IntoResultsViewMsg
} from '../interface-types';
} from '../pure/interface-types';
import { PathTable } from './alert-table';
import { RawTable } from './raw-results-table';
import { ResultTableProps, tableSelectionHeaderClassName, toggleDiagnosticsClassName, alertExtrasClassName } from './result-table-utils';
import {
ResultTableProps,
tableSelectionHeaderClassName,
toggleDiagnosticsClassName,
alertExtrasClassName
} from './result-table-utils';
import { vscode } from './vscode-api';
@@ -279,7 +284,7 @@ export class ResultTables
break;
default:
// noop
// noop
}
}

4
extensions/ql-vscode/src/view/results.tsx
View File

@@ -12,10 +12,10 @@ import {
ResultsPaths,
ALERTS_TABLE_NAME,
ParsedResultSets
} from '../interface-types';
} from '../pure/interface-types';
import { EventHandlers as EventHandlerList } from './event-handler-list';
import { ResultTables } from './result-tables';
import { ResultSet } from '../interface-types';
import { ResultSet } from '../pure/interface-types';
import { vscode } from './vscode-api';
/**

2
extensions/ql-vscode/src/view/vscode-api.ts
View File

@@ -1,4 +1,4 @@
import { FromCompareViewMessage, FromResultsViewMsg } from '../interface-types';
import { FromCompareViewMessage, FromResultsViewMsg } from '../pure/interface-types';
export interface VsCodeApi {
/**

2
extensions/ql-vscode/src/vscode-tests/no-workspace/interface-utils.test.ts
View File

@@ -8,7 +8,7 @@ import {
fileUriToWebviewUri,
tryResolveLocation,
} from '../../interface-utils';
import { getDefaultResultSetName } from '../../interface-types';
import { getDefaultResultSetName } from '../../pure/interface-types';
import { DatabaseItem } from '../../databases';
describe('interface-utils', () => {

4
extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts
View File

@@ -9,7 +9,7 @@ import { CompletedQuery, interpretResults } from '../../query-results';
import { QueryInfo, QueryWithResults, tmpDir } from '../../run-queries';
import { QueryHistoryConfig } from '../../config';
import { EvaluationResult, QueryResultType } from '../../pure/messages';
import { SortDirection, SortedResultSetInfo } from '../../interface-types';
import { SortDirection, SortedResultSetInfo } from '../../pure/interface-types';
import { CodeQLCliServer, SourceInfo } from '../../cli';
chai.use(chaiAsPromised);
@@ -204,7 +204,7 @@ describe('CompletedQuery', () => {
});
function mockCompletedQuery() {
return new CompletedQuery(
return new CompletedQuery(
mockQueryWithResults(),
mockQueryHistoryConfig()
);