diff --git a/extensions/ql-vscode/.eslintrc.js b/extensions/ql-vscode/.eslintrc.js index bd42a36c5..b887b3aaf 100644 --- a/extensions/ql-vscode/.eslintrc.js +++ b/extensions/ql-vscode/.eslintrc.js @@ -54,7 +54,6 @@ module.exports = { "import/no-dynamic-required": "off", "import/no-anonymous-default-export": "off", "import/no-commonjs": "off", - "import/no-duplicates": "off", "import/no-mutable-exports": "off", "import/no-namespace": "off", "import/no-unresolved": "off", diff --git a/extensions/ql-vscode/src/databaseFetcher.ts b/extensions/ql-vscode/src/databaseFetcher.ts index 4415d01c0..e1458f7ac 100644 --- a/extensions/ql-vscode/src/databaseFetcher.ts +++ b/extensions/ql-vscode/src/databaseFetcher.ts @@ -9,10 +9,9 @@ import * as Octokit from "@octokit/rest"; import { retry } from "@octokit/plugin-retry"; import { DatabaseManager, DatabaseItem } from "./databases"; -import { showAndLogInformationMessage } from "./helpers"; +import { showAndLogInformationMessage, tmpDir } from "./helpers"; import { reportStreamProgress, ProgressCallback } from "./commandRunner"; import { extLogger } from "./common"; -import { tmpDir } from "./helpers"; import { Credentials } from "./authentication"; import { REPO_REGEX, getErrorMessage } from "./pure/helpers-pure"; diff --git a/extensions/ql-vscode/src/databases-ui.ts b/extensions/ql-vscode/src/databases-ui.ts index fcf450439..fc1b41b89 100644 --- a/extensions/ql-vscode/src/databases-ui.ts +++ b/extensions/ql-vscode/src/databases-ui.ts @@ -9,6 +9,7 @@ import { Uri, window, env, + CancellationToken, } from "vscode"; import * as fs from "fs-extra"; @@ -34,7 +35,6 @@ import { promptImportInternetDatabase, promptImportLgtmDatabase, } from "./databaseFetcher"; -import { CancellationToken } from "vscode"; import { asyncFilter, getErrorMessage } from "./pure/helpers-pure"; import { Credentials } from "./authentication"; import { QueryRunner } from "./queryRunner"; diff --git a/extensions/ql-vscode/src/interface.ts b/extensions/ql-vscode/src/interface.ts index e228117aa..246871b33 100644 --- a/extensions/ql-vscode/src/interface.ts +++ b/extensions/ql-vscode/src/interface.ts @@ -33,6 +33,8 @@ import { GRAPH_TABLE_NAME, RawResultsSortState, NavigationDirection, + getDefaultResultSetName, + ParsedResultSets, } from "./pure/interface-types"; import { Logger } from "./common"; import { commandRunner } from "./commandRunner"; @@ -40,6 +42,7 @@ import { CompletedQueryInfo, interpretResultsSarif, interpretGraphResults, + CompletedLocalQueryInfo, } from "./query-results"; import { QueryEvaluationInfo } from "./run-queries-shared"; import { @@ -54,10 +57,6 @@ import { shownLocationLineDecoration, jumpToLocation, } from "./interface-utils"; -import { - getDefaultResultSetName, - ParsedResultSets, -} from "./pure/interface-types"; import { RawResultSet, transformBqrsResultSet, @@ -65,7 +64,6 @@ import { } from "./pure/bqrs-cli-types"; import { AbstractWebview, WebviewPanelConfig } from "./abstract-webview"; import { PAGE_SIZE } from "./config"; -import { CompletedLocalQueryInfo } from "./query-results"; import { HistoryItemLabelProvider } from "./history-item-label-provider"; /** diff --git a/extensions/ql-vscode/src/query-results.ts b/extensions/ql-vscode/src/query-results.ts index 591335390..463de1156 100644 --- a/extensions/ql-vscode/src/query-results.ts +++ b/extensions/ql-vscode/src/query-results.ts @@ -13,8 +13,8 @@ import { ResultsPaths, SarifInterpretationData, GraphInterpretationData, + DatabaseInfo, } from "./pure/interface-types"; -import { DatabaseInfo } from "./pure/interface-types"; import { QueryStatus } from "./query-status"; import { QueryEvaluationInfo, QueryWithResults } from "./run-queries-shared"; import { formatLegacyMessage } from "./legacy-query-server/run-queries"; diff --git a/extensions/ql-vscode/src/run-queries-shared.ts b/extensions/ql-vscode/src/run-queries-shared.ts index bed2ac301..f2428d83e 100644 --- a/extensions/ql-vscode/src/run-queries-shared.ts +++ b/extensions/ql-vscode/src/run-queries-shared.ts @@ -25,8 +25,7 @@ import { CodeQLCliServer } from "./cli"; import { SELECT_QUERY_NAME } from "./contextual/locationFinder"; import { DatabaseManager } from "./databases"; import { DecodedBqrsChunk } from "./pure/bqrs-cli-types"; -import { extLogger } from "./common"; -import { Logger } from "./common"; +import { extLogger, Logger } from "./common"; import { generateSummarySymbolsFile } from "./log-insights/summary-parser"; import { asError } from "./pure/helpers-pure"; diff --git a/extensions/ql-vscode/src/view/results/alert-table.tsx b/extensions/ql-vscode/src/view/results/alert-table.tsx index 177e3b919..f58fb51bd 100644 --- a/extensions/ql-vscode/src/view/results/alert-table.tsx +++ b/extensions/ql-vscode/src/view/results/alert-table.tsx @@ -18,17 +18,15 @@ import { NavigateMsg, NavigationDirection, SarifInterpretationData, + InterpretedResultsSortColumn, + SortDirection, + InterpretedResultsSortState, } from "../../pure/interface-types"; import { parseSarifPlainTextMessage, parseSarifLocation, isNoLocation, } from "../../pure/sarif-utils"; -import { - InterpretedResultsSortColumn, - SortDirection, - InterpretedResultsSortState, -} from "../../pure/interface-types"; import { vscode } from "../vscode-api"; import { isWholeFileLoc, isLineColumnLoc } from "../../pure/bqrs-utils"; import { ScrollIntoViewHelper } from "./scroll-into-view-helper"; diff --git a/extensions/ql-vscode/src/view/results/graph.tsx b/extensions/ql-vscode/src/view/results/graph.tsx index a818cd737..8614a182f 100644 --- a/extensions/ql-vscode/src/view/results/graph.tsx +++ b/extensions/ql-vscode/src/view/results/graph.tsx @@ -1,12 +1,11 @@ import * as React from "react"; import * as d3 from "d3"; -import { ResultTableProps } from "./result-table-utils"; +import { ResultTableProps, jumpToLocation } from "./result-table-utils"; import { InterpretedResultSet, GraphInterpretationData, } from "../../pure/interface-types"; import { graphviz } from "d3-graphviz"; -import { jumpToLocation } from "./result-table-utils"; import { tryGetLocationFromString } from "../../pure/bqrs-utils"; export type GraphProps = ResultTableProps & { resultSet: InterpretedResultSet; diff --git a/extensions/ql-vscode/src/view/results/raw-results-table.tsx b/extensions/ql-vscode/src/view/results/raw-results-table.tsx index b66b560d4..c30005bbe 100644 --- a/extensions/ql-vscode/src/view/results/raw-results-table.tsx +++ b/extensions/ql-vscode/src/view/results/raw-results-table.tsx @@ -10,8 +10,8 @@ import { RawResultsSortState, NavigateMsg, NavigationDirection, + RawTableResultSet, } 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"; diff --git a/extensions/ql-vscode/src/view/results/result-table-utils.tsx b/extensions/ql-vscode/src/view/results/result-table-utils.tsx index 7496ed310..417667177 100644 --- a/extensions/ql-vscode/src/view/results/result-table-utils.tsx +++ b/extensions/ql-vscode/src/view/results/result-table-utils.tsx @@ -5,9 +5,9 @@ import { RawResultsSortState, QueryMetadata, SortDirection, + ResultSet, } from "../../pure/interface-types"; import { assertNever } from "../../pure/helpers-pure"; -import { ResultSet } from "../../pure/interface-types"; import { vscode } from "../vscode-api"; import { convertNonPrintableChars } from "../../text-utils"; diff --git a/extensions/ql-vscode/src/view/results/results.tsx b/extensions/ql-vscode/src/view/results/results.tsx index c3c4b641a..b31a21e5d 100644 --- a/extensions/ql-vscode/src/view/results/results.tsx +++ b/extensions/ql-vscode/src/view/results/results.tsx @@ -12,10 +12,10 @@ import { GRAPH_TABLE_NAME, ParsedResultSets, NavigateMsg, + ResultSet, } from "../../pure/interface-types"; import { EventHandlers as EventHandlerList } from "./event-handler-list"; import { ResultTables } from "./result-tables"; -import { ResultSet } from "../../pure/interface-types"; import "./resultsView.css"; diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts index a7cfc410f..cb1742087 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts +++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts @@ -12,14 +12,13 @@ import { } from "vscode"; import { QueryHistoryConfig } from "../../../config"; import { DatabaseManager } from "../../../databases"; -import { tmpDir } from "../../../helpers"; +import { tmpDir, walkDirectory } from "../../../helpers"; import { QueryHistoryManager } from "../../../query-history"; import { Credentials } from "../../../authentication"; import { AnalysesResultsManager } from "../../../remote-queries/analyses-results-manager"; import { RemoteQueryResult } from "../../../remote-queries/shared/remote-query-result"; import { DisposableBucket } from "../../disposable-bucket"; import { testDisposeHandler } from "../../test-dispose-handler"; -import { walkDirectory } from "../../../helpers"; import { HistoryItemLabelProvider } from "../../../history-item-label-provider"; import { RemoteQueriesManager } from "../../../remote-queries/remote-queries-manager"; import { ResultsView } from "../../../interface"; diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts index b5b14c457..9993c941b 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts +++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts @@ -11,11 +11,10 @@ import { } from "vscode"; import { QueryHistoryConfig } from "../../../config"; import { DatabaseManager } from "../../../databases"; -import { tmpDir } from "../../../helpers"; +import { tmpDir, walkDirectory } from "../../../helpers"; import { QueryHistoryManager } from "../../../query-history"; import { DisposableBucket } from "../../disposable-bucket"; import { testDisposeHandler } from "../../test-dispose-handler"; -import { walkDirectory } from "../../../helpers"; import { HistoryItemLabelProvider } from "../../../history-item-label-provider"; import { RemoteQueriesManager } from "../../../remote-queries/remote-queries-manager"; import { ResultsView } from "../../../interface";