Skip to content

Commit 754fa67

Browse files
committed
Autofix import/no-duplicates
1 parent 706f2e3 commit 754fa67

13 files changed

Lines changed: 16 additions & 26 deletions

File tree

extensions/ql-vscode/.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ module.exports = {
5454
"import/no-dynamic-required": "off",
5555
"import/no-anonymous-default-export": "off",
5656
"import/no-commonjs": "off",
57-
"import/no-duplicates": "off",
5857
"import/no-mutable-exports": "off",
5958
"import/no-namespace": "off",
6059
"import/no-unresolved": "off",

extensions/ql-vscode/src/databaseFetcher.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ import * as Octokit from "@octokit/rest";
99
import { retry } from "@octokit/plugin-retry";
1010

1111
import { DatabaseManager, DatabaseItem } from "./databases";
12-
import { showAndLogInformationMessage } from "./helpers";
12+
import { showAndLogInformationMessage, tmpDir } from "./helpers";
1313
import { reportStreamProgress, ProgressCallback } from "./commandRunner";
1414
import { extLogger } from "./common";
15-
import { tmpDir } from "./helpers";
1615
import { Credentials } from "./authentication";
1716
import { REPO_REGEX, getErrorMessage } from "./pure/helpers-pure";
1817

extensions/ql-vscode/src/databases-ui.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
Uri,
1010
window,
1111
env,
12+
CancellationToken,
1213
} from "vscode";
1314
import * as fs from "fs-extra";
1415

@@ -34,7 +35,6 @@ import {
3435
promptImportInternetDatabase,
3536
promptImportLgtmDatabase,
3637
} from "./databaseFetcher";
37-
import { CancellationToken } from "vscode";
3838
import { asyncFilter, getErrorMessage } from "./pure/helpers-pure";
3939
import { Credentials } from "./authentication";
4040
import { QueryRunner } from "./queryRunner";

extensions/ql-vscode/src/interface.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,16 @@ import {
3333
GRAPH_TABLE_NAME,
3434
RawResultsSortState,
3535
NavigationDirection,
36+
getDefaultResultSetName,
37+
ParsedResultSets,
3638
} from "./pure/interface-types";
3739
import { Logger } from "./common";
3840
import { commandRunner } from "./commandRunner";
3941
import {
4042
CompletedQueryInfo,
4143
interpretResultsSarif,
4244
interpretGraphResults,
45+
CompletedLocalQueryInfo,
4346
} from "./query-results";
4447
import { QueryEvaluationInfo } from "./run-queries-shared";
4548
import {
@@ -54,18 +57,13 @@ import {
5457
shownLocationLineDecoration,
5558
jumpToLocation,
5659
} from "./interface-utils";
57-
import {
58-
getDefaultResultSetName,
59-
ParsedResultSets,
60-
} from "./pure/interface-types";
6160
import {
6261
RawResultSet,
6362
transformBqrsResultSet,
6463
ResultSetSchema,
6564
} from "./pure/bqrs-cli-types";
6665
import { AbstractWebview, WebviewPanelConfig } from "./abstract-webview";
6766
import { PAGE_SIZE } from "./config";
68-
import { CompletedLocalQueryInfo } from "./query-results";
6967
import { HistoryItemLabelProvider } from "./history-item-label-provider";
7068

7169
/**

extensions/ql-vscode/src/query-results.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import {
1313
ResultsPaths,
1414
SarifInterpretationData,
1515
GraphInterpretationData,
16+
DatabaseInfo,
1617
} from "./pure/interface-types";
17-
import { DatabaseInfo } from "./pure/interface-types";
1818
import { QueryStatus } from "./query-status";
1919
import { QueryEvaluationInfo, QueryWithResults } from "./run-queries-shared";
2020
import { formatLegacyMessage } from "./legacy-query-server/run-queries";

extensions/ql-vscode/src/run-queries-shared.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ import { CodeQLCliServer } from "./cli";
2525
import { SELECT_QUERY_NAME } from "./contextual/locationFinder";
2626
import { DatabaseManager } from "./databases";
2727
import { DecodedBqrsChunk } from "./pure/bqrs-cli-types";
28-
import { extLogger } from "./common";
29-
import { Logger } from "./common";
28+
import { extLogger, Logger } from "./common";
3029
import { generateSummarySymbolsFile } from "./log-insights/summary-parser";
3130
import { asError } from "./pure/helpers-pure";
3231

extensions/ql-vscode/src/view/results/alert-table.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,15 @@ import {
1818
NavigateMsg,
1919
NavigationDirection,
2020
SarifInterpretationData,
21+
InterpretedResultsSortColumn,
22+
SortDirection,
23+
InterpretedResultsSortState,
2124
} from "../../pure/interface-types";
2225
import {
2326
parseSarifPlainTextMessage,
2427
parseSarifLocation,
2528
isNoLocation,
2629
} from "../../pure/sarif-utils";
27-
import {
28-
InterpretedResultsSortColumn,
29-
SortDirection,
30-
InterpretedResultsSortState,
31-
} from "../../pure/interface-types";
3230
import { vscode } from "../vscode-api";
3331
import { isWholeFileLoc, isLineColumnLoc } from "../../pure/bqrs-utils";
3432
import { ScrollIntoViewHelper } from "./scroll-into-view-helper";

extensions/ql-vscode/src/view/results/graph.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import * as React from "react";
22
import * as d3 from "d3";
3-
import { ResultTableProps } from "./result-table-utils";
3+
import { ResultTableProps, jumpToLocation } from "./result-table-utils";
44
import {
55
InterpretedResultSet,
66
GraphInterpretationData,
77
} from "../../pure/interface-types";
88
import { graphviz } from "d3-graphviz";
9-
import { jumpToLocation } from "./result-table-utils";
109
import { tryGetLocationFromString } from "../../pure/bqrs-utils";
1110
export type GraphProps = ResultTableProps & {
1211
resultSet: InterpretedResultSet<GraphInterpretationData>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010
RawResultsSortState,
1111
NavigateMsg,
1212
NavigationDirection,
13+
RawTableResultSet,
1314
} from "../../pure/interface-types";
14-
import { RawTableResultSet } from "../../pure/interface-types";
1515
import RawTableHeader from "./RawTableHeader";
1616
import RawTableRow from "./RawTableRow";
1717
import { ResultRow } from "../../pure/bqrs-cli-types";

extensions/ql-vscode/src/view/results/result-table-utils.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import {
55
RawResultsSortState,
66
QueryMetadata,
77
SortDirection,
8+
ResultSet,
89
} from "../../pure/interface-types";
910
import { assertNever } from "../../pure/helpers-pure";
10-
import { ResultSet } from "../../pure/interface-types";
1111
import { vscode } from "../vscode-api";
1212
import { convertNonPrintableChars } from "../../text-utils";
1313

0 commit comments

Comments
 (0)