Skip to content

Commit db06558

Browse files
committed
Merge remote-tracking branch 'origin/main' into koesie10/automodel-v2
2 parents 546f668 + 3f89675 commit db06558

File tree

22 files changed

+548
-567
lines changed

22 files changed

+548
-567
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ jobs:
110110
run: |
111111
npm run lint:scenarios
112112
113+
- name: Find deadcode
114+
working-directory: extensions/ql-vscode
115+
run: |
116+
npm run find-deadcode
117+
113118
unit-test:
114119
name: Unit Test
115120
runs-on: ${{ matrix.os }}

docs/test-plan.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ This requires running a MRVA query and seeing the results view.
318318
1. Alphabetically
319319
2. By number of results
320320
3. By popularity
321-
4. By most recent commit
322321
9. Can filter repos
323322
10. Shows correct statistics
324323
1. Total number of results

extensions/ql-vscode/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## [UNRELEASED]
44

5+
- Remove "last updated" information and sorting from variant analysis results view. [#2637](https://github.com/github/vscode-codeql/pull/2637)
56
- Links to code on GitHub now include column numbers as well as line numbers. [#2406](https://github.com/github/vscode-codeql/pull/2406)
67
- No longer highlight trailing commas for jump to definition. [#2615](https://github.com/github/vscode-codeql/pull/2615)
78

extensions/ql-vscode/gulpfile.ts/webpack.config.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ export const config: webpack.Configuration = {
1515
devtool: isDevBuild ? "inline-source-map" : "source-map",
1616
resolve: {
1717
extensions: [".js", ".ts", ".tsx", ".json"],
18-
fallback: {
19-
path: require.resolve("path-browserify"),
20-
},
2118
},
2219
module: {
2320
rules: [

extensions/ql-vscode/package-lock.json

Lines changed: 160 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/ql-vscode/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,11 @@
350350
"enum": [
351351
"alphabetically",
352352
"popularity",
353-
"mostRecentCommit",
354353
"numberOfResults"
355354
],
356355
"enumDescriptions": [
357356
"Sort repositories alphabetically in the results view.",
358357
"Sort repositories by popularity in the results view.",
359-
"Sort repositories by most recent commit in the results view.",
360358
"Sort repositories by number of results in the results view."
361359
],
362360
"description": "The default sorting order for repositories in the variant analysis results view."
@@ -1732,6 +1730,7 @@
17321730
"format": "prettier --write **/*.{ts,tsx} && eslint . --ext .ts,.tsx --fix",
17331731
"lint": "eslint . --ext .js,.ts,.tsx --max-warnings=0",
17341732
"lint:markdown": "markdownlint-cli2 \"../../**/*.{md,mdx}\" \"!**/node_modules/**\" \"!**/.vscode-test/**\" \"!**/build/cli/v*/**\"",
1733+
"find-deadcode": "ts-node scripts/find-deadcode.ts",
17351734
"format-staged": "lint-staged",
17361735
"storybook": "storybook dev -p 6006",
17371736
"build-storybook": "storybook build",
@@ -1762,7 +1761,6 @@
17621761
"nanoid": "^3.2.0",
17631762
"node-fetch": "~2.6.7",
17641763
"p-queue": "^6.0.0",
1765-
"path-browserify": "^1.0.1",
17661764
"react": "^18.2.0",
17671765
"react-dom": "^18.2.0",
17681766
"semver": "~7.5.2",
@@ -1882,6 +1880,7 @@
18821880
"ts-loader": "^9.4.2",
18831881
"ts-node": "^10.7.0",
18841882
"ts-protoc-gen": "^0.9.0",
1883+
"ts-unused-exports": "^9.0.5",
18851884
"typescript": "^5.0.2",
18861885
"webpack": "^5.76.0",
18871886
"webpack-cli": "^5.0.1"
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import { basename, join, relative, resolve } from "path";
2+
import analyzeTsConfig from "ts-unused-exports";
3+
import { containsPath, pathsEqual } from "../src/common/files";
4+
import { exit } from "process";
5+
6+
function ignoreFile(file: string): boolean {
7+
return (
8+
containsPath("gulpfile.ts", file) ||
9+
containsPath(join("src", "stories"), file) ||
10+
pathsEqual(
11+
join("test", "vscode-tests", "jest-runner-installed-extensions.ts"),
12+
file,
13+
) ||
14+
basename(file) === "jest.config.ts" ||
15+
basename(file) === "index.tsx" ||
16+
basename(file) === "index.ts"
17+
);
18+
}
19+
20+
function main() {
21+
const repositoryRoot = resolve(join(__dirname, ".."));
22+
23+
const result = analyzeTsConfig("tsconfig.deadcode.json");
24+
let foundUnusedExports = false;
25+
26+
for (const [filepath, exportNameAndLocations] of Object.entries(result)) {
27+
const relativeFilepath = relative(repositoryRoot, filepath);
28+
29+
if (ignoreFile(relativeFilepath)) {
30+
continue;
31+
}
32+
33+
foundUnusedExports = true;
34+
35+
console.log(relativeFilepath);
36+
for (const exportNameAndLocation of exportNameAndLocations) {
37+
console.log(` ${exportNameAndLocation.exportName}`);
38+
}
39+
console.log();
40+
}
41+
42+
if (foundUnusedExports) {
43+
exit(1);
44+
}
45+
}
46+
47+
main();

extensions/ql-vscode/src/common/interface-types.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -500,13 +500,6 @@ interface SetExternalApiUsagesMessage {
500500
externalApiUsages: ExternalApiUsage[];
501501
}
502502

503-
export interface ShowProgressMessage {
504-
t: "showProgress";
505-
step: number;
506-
maxStep: number;
507-
message: string;
508-
}
509-
510503
interface LoadModeledMethodsMessage {
511504
t: "loadModeledMethods";
512505
modeledMethods: Record<string, ModeledMethod>;
@@ -527,6 +520,10 @@ interface JumpToUsageMessage {
527520
location: ResolvableLocationValue;
528521
}
529522

523+
interface OpenDatabaseMessage {
524+
t: "openDatabase";
525+
}
526+
530527
interface OpenExtensionPackMessage {
531528
t: "openExtensionPack";
532529
}
@@ -558,14 +555,14 @@ interface ModelDependencyMessage {
558555
export type ToDataExtensionsEditorMessage =
559556
| SetExtensionPackStateMessage
560557
| SetExternalApiUsagesMessage
561-
| ShowProgressMessage
562558
| LoadModeledMethodsMessage
563559
| AddModeledMethodsMessage;
564560

565561
export type FromDataExtensionsEditorMessage =
566562
| ViewLoadedMsg
567563
| SwitchModeMessage
568564
| RefreshExternalApiUsages
565+
| OpenDatabaseMessage
569566
| OpenExtensionPackMessage
570567
| JumpToUsageMessage
571568
| SaveModeledMethods

0 commit comments

Comments
 (0)