Skip to content

Commit 6daa780

Browse files
robertbrignullrobertbrignull
authored
Merge branch 'main' into robertbrignull/release-indenting
2 parents 0b6d828 + c0f3adc commit 6daa780

13 files changed

Lines changed: 254 additions & 63 deletions

File tree

‎.github/codeql/codeql-config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: "CodeQL config"
22
queries:
33
- name: Run standard queries
44
uses: security-and-quality
5+
- name: Experimental queries
6+
uses: security-experimental
57
- name: Run custom javascript queries
68
uses: ./.github/codeql/queries
79
paths:

‎extensions/ql-vscode/CHANGELOG.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
## [UNRELEASED]
44

5+
## 1.8.0 - 9 March 2023
6+
57
- Send telemetry about unhandled errors happening within the extension. [#2125](https://github.com/github/vscode-codeql/pull/2125)
6-
- Enable multi-repository variant analysis. [#2121](https://github.com/github/vscode-codeql/pull/2121)
7-
- Enable collection of telemetry concerning interactions with UI elements, including buttons, links, and other inputs. [#2114](https://github.com/github/vscode-codeql/pull/2114)
8+
- Enable multi-repository variant analysis. [#2144](https://github.com/github/vscode-codeql/pull/2144)
89

910
## 1.7.11 - 1 March 2023
1011

‎extensions/ql-vscode/gulpfile.ts/deploy.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,6 @@ export async function deployPackage(
9393
);
9494
await copyPackage(sourcePath, distPath);
9595

96-
// This is necessary for vsce to know the dependencies
97-
await copyDirectory(
98-
resolve(sourcePath, "node_modules"),
99-
resolve(distPath, "node_modules"),
100-
);
101-
10296
return {
10397
distPath,
10498
name: packageJson.name,

‎extensions/ql-vscode/gulpfile.ts/package.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export async function packageExtension(): Promise<void> {
1717
"..",
1818
`${deployedPackage.name}-${deployedPackage.version}.vsix`,
1919
),
20+
"--no-dependencies",
2021
];
2122
const proc = spawn(resolve(__dirname, "../node_modules/.bin/vsce"), args, {
2223
cwd: deployedPackage.distPath,

‎extensions/ql-vscode/package-lock.json‎

Lines changed: 2 additions & 2 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: 73 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "CodeQL for Visual Studio Code",
55
"author": "GitHub",
66
"private": true,
7-
"version": "1.7.12",
7+
"version": "1.8.1",
88
"publisher": "GitHub",
99
"license": "MIT",
1010
"icon": "media/VS-marketplace-CodeQL-icon.png",
@@ -44,11 +44,6 @@
4444
"onView:test-explorer",
4545
"onCommand:codeQL.checkForUpdatesToCLI",
4646
"onCommand:codeQL.authenticateToGitHub",
47-
"onCommand:codeQLDatabases.chooseDatabaseFolder",
48-
"onCommand:codeQLDatabases.chooseDatabaseArchive",
49-
"onCommand:codeQLDatabases.chooseDatabaseInternet",
50-
"onCommand:codeQLDatabases.chooseDatabaseGithub",
51-
"onCommand:codeQL.setCurrentDatabase",
5247
"onCommand:codeQL.viewAst",
5348
"onCommand:codeQL.viewCfg",
5449
"onCommand:codeQL.openReferencedFile",
@@ -57,16 +52,6 @@
5752
"onCommand:codeQL.chooseDatabaseArchive",
5853
"onCommand:codeQL.chooseDatabaseInternet",
5954
"onCommand:codeQL.chooseDatabaseGithub",
60-
"onCommand:codeQLDatabases.chooseDatabase",
61-
"onCommand:codeQLDatabases.setCurrentDatabase",
62-
"onCommand:codeQLVariantAnalysisRepositories.openConfigFile",
63-
"onCommand:codeQLVariantAnalysisRepositories.addNewDatabase",
64-
"onCommand:codeQLVariantAnalysisRepositories.addNewList",
65-
"onCommand:codeQLVariantAnalysisRepositories.setSelectedItem",
66-
"onCommand:codeQLVariantAnalysisRepositories.setSelectedItemContextMenu",
67-
"onCommand:codeQLVariantAnalysisRepositories.renameItemContextMenu",
68-
"onCommand:codeQLVariantAnalysisRepositories.openOnGitHubContextMenu",
69-
"onCommand:codeQLVariantAnalysisRepositories.removeItemContextMenu",
7055
"onCommand:codeQL.quickQuery",
7156
"onCommand:codeQL.restartQueryServer",
7257
"onWebviewPanel:resultsView",
@@ -322,6 +307,10 @@
322307
"command": "codeQL.runVariantAnalysis",
323308
"title": "CodeQL: Run Variant Analysis"
324309
},
310+
{
311+
"command": "codeQL.runVariantAnalysisContextEditor",
312+
"title": "CodeQL: Run Variant Analysis"
313+
},
325314
{
326315
"command": "codeQL.exportSelectedVariantAnalysisResults",
327316
"title": "CodeQL: Export Variant Analysis Results"
@@ -334,10 +323,22 @@
334323
"command": "codeQL.quickEval",
335324
"title": "CodeQL: Quick Evaluation"
336325
},
326+
{
327+
"command": "codeQL.quickEvalContextEditor",
328+
"title": "CodeQL: Quick Evaluation"
329+
},
337330
{
338331
"command": "codeQL.openReferencedFile",
339332
"title": "CodeQL: Open Referenced File"
340333
},
334+
{
335+
"command": "codeQL.openReferencedFileContextEditor",
336+
"title": "CodeQL: Open Referenced File"
337+
},
338+
{
339+
"command": "codeQL.openReferencedFileContextExplorer",
340+
"title": "CodeQL: Open Referenced File"
341+
},
341342
{
342343
"command": "codeQL.previewQueryHelp",
343344
"title": "CodeQL: Preview Query Help"
@@ -433,10 +434,26 @@
433434
"command": "codeQL.viewAst",
434435
"title": "CodeQL: View AST"
435436
},
437+
{
438+
"command": "codeQL.viewAstContextExplorer",
439+
"title": "CodeQL: View AST"
440+
},
441+
{
442+
"command": "codeQL.viewAstContextEditor",
443+
"title": "CodeQL: View AST"
444+
},
436445
{
437446
"command": "codeQL.viewCfg",
438447
"title": "CodeQL: View CFG"
439448
},
449+
{
450+
"command": "codeQL.viewCfgContextExplorer",
451+
"title": "CodeQL: View CFG"
452+
},
453+
{
454+
"command": "codeQL.viewCfgContextEditor",
455+
"title": "CodeQL: View CFG"
456+
},
440457
{
441458
"command": "codeQL.upgradeCurrentDatabase",
442459
"title": "CodeQL: Upgrade Current Database"
@@ -825,12 +842,12 @@
825842
{
826843
"command": "codeQLQueryHistory.removeHistoryItem",
827844
"group": "7_queryHistory@0",
828-
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
845+
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledRemoteResultsItemWithoutLogs || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
829846
},
830847
{
831848
"command": "codeQLQueryHistory.removeHistoryItem",
832849
"group": "inline",
833-
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
850+
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledRemoteResultsItemWithoutLogs || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
834851
},
835852
{
836853
"command": "codeQLQueryHistory.renameItem",
@@ -930,12 +947,12 @@
930947
"when": "resourceScheme == codeql-zip-archive || explorerResourceIsFolder || resourceExtname == .zip"
931948
},
932949
{
933-
"command": "codeQL.viewAst",
950+
"command": "codeQL.viewAstContextExplorer",
934951
"group": "9_qlCommands",
935952
"when": "resourceScheme == codeql-zip-archive && !explorerResourceIsFolder && !listMultiSelection"
936953
},
937954
{
938-
"command": "codeQL.viewCfg",
955+
"command": "codeQL.viewCfgContextExplorer",
939956
"group": "9_qlCommands",
940957
"when": "resourceScheme == codeql-zip-archive && config.codeQL.canary"
941958
},
@@ -945,7 +962,7 @@
945962
"when": "resourceScheme != codeql-zip-archive"
946963
},
947964
{
948-
"command": "codeQL.openReferencedFile",
965+
"command": "codeQL.openReferencedFileContextExplorer",
949966
"group": "9_qlCommands",
950967
"when": "resourceExtname == .qlref"
951968
},
@@ -981,7 +998,8 @@
981998
"when": "editorLangId == ql && resourceExtname == .ql"
982999
},
9831000
{
984-
"command": "codeQL.exportSelectedVariantAnalysisResults"
1001+
"command": "codeQL.runVariantAnalysisContextEditor",
1002+
"when": "false"
9851003
},
9861004
{
9871005
"command": "codeQL.runQueries",
@@ -991,10 +1009,22 @@
9911009
"command": "codeQL.quickEval",
9921010
"when": "editorLangId == ql"
9931011
},
1012+
{
1013+
"command": "codeQL.quickEvalContextEditor",
1014+
"when": "false"
1015+
},
9941016
{
9951017
"command": "codeQL.openReferencedFile",
9961018
"when": "resourceExtname == .qlref"
9971019
},
1020+
{
1021+
"command": "codeQL.openReferencedFileContextEditor",
1022+
"when": "false"
1023+
},
1024+
{
1025+
"command": "codeQL.openReferencedFileContextExplorer",
1026+
"when": "false"
1027+
},
9981028
{
9991029
"command": "codeQL.previewQueryHelp",
10001030
"when": "resourceExtname == .qhelp && isWorkspaceTrusted"
@@ -1007,10 +1037,26 @@
10071037
"command": "codeQL.viewAst",
10081038
"when": "resourceScheme == codeql-zip-archive"
10091039
},
1040+
{
1041+
"command": "codeQL.viewAstContextEditor",
1042+
"when": "false"
1043+
},
1044+
{
1045+
"command": "codeQL.viewAstContextExplorer",
1046+
"when": "false"
1047+
},
10101048
{
10111049
"command": "codeQL.viewCfg",
10121050
"when": "resourceScheme == codeql-zip-archive && config.codeQL.canary"
10131051
},
1052+
{
1053+
"command": "codeQL.viewCfgContextExplorer",
1054+
"when": "false"
1055+
},
1056+
{
1057+
"command": "codeQL.viewCfgContextEditor",
1058+
"when": "false"
1059+
},
10141060
{
10151061
"command": "codeQLVariantAnalysisRepositories.openConfigFile",
10161062
"when": "false"
@@ -1234,23 +1280,23 @@
12341280
"when": "editorLangId == ql && resourceExtname == .ql"
12351281
},
12361282
{
1237-
"command": "codeQL.runVariantAnalysis",
1283+
"command": "codeQL.runVariantAnalysisContextEditor",
12381284
"when": "editorLangId == ql && resourceExtname == .ql"
12391285
},
12401286
{
1241-
"command": "codeQL.viewAst",
1287+
"command": "codeQL.viewAstContextEditor",
12421288
"when": "resourceScheme == codeql-zip-archive"
12431289
},
12441290
{
1245-
"command": "codeQL.viewCfg",
1291+
"command": "codeQL.viewCfgContextEditor",
12461292
"when": "resourceScheme == codeql-zip-archive && config.codeQL.canary"
12471293
},
12481294
{
1249-
"command": "codeQL.quickEval",
1295+
"command": "codeQL.quickEvalContextEditor",
12501296
"when": "editorLangId == ql"
12511297
},
12521298
{
1253-
"command": "codeQL.openReferencedFile",
1299+
"command": "codeQL.openReferencedFileContextEditor",
12541300
"when": "resourceExtname == .qlref"
12551301
},
12561302
{

0 commit comments

Comments
 (0)