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

Display EntityValue labels in CSV export (#2170)

Browse Source
This commit is contained in:
Gulshan Singh
2023-03-21 04:59:18 -07:00
committed by GitHub
parent 82d03091d0
commit bb0c53d65d
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/ql-vscode/CHANGELOG.md
View File

@@ -3,6 +3,7 @@
## [UNRELEASED] ## [UNRELEASED]
- Show data flow paths of a variant analysis in a new tab - Show data flow paths of a variant analysis in a new tab
- Show labels of entities in exported CSV results [#2170](https://github.com/github/vscode-codeql/pull/2170)
## 1.8.0 - 9 March 2023 ## 1.8.0 - 9 March 2023

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

@@ -30,7 +30,7 @@ import { nanoid } from "nanoid";
import { CodeQLCliServer } from "./cli"; import { CodeQLCliServer } from "./cli";
import { SELECT_QUERY_NAME } from "./contextual/locationFinder"; import { SELECT_QUERY_NAME } from "./contextual/locationFinder";
import { DatabaseManager } from "./local-databases"; import { DatabaseManager } from "./local-databases";
import { DecodedBqrsChunk } from "./pure/bqrs-cli-types"; import { DecodedBqrsChunk, EntityValue } from "./pure/bqrs-cli-types";
import { extLogger, Logger } from "./common"; import { extLogger, Logger } from "./common";
import { generateSummarySymbolsFile } from "./log-insights/summary-parser"; import { generateSummarySymbolsFile } from "./log-insights/summary-parser";
import { getErrorMessage } from "./pure/helpers-pure"; import { getErrorMessage } from "./pure/helpers-pure";
@@ -351,11 +351,17 @@ export class QueryEvaluationInfo {
chunk.tuples.forEach((tuple) => { chunk.tuples.forEach((tuple) => {
out.write( out.write(
`${tuple `${tuple
.map((v, i) => .map((v, i) => {
chunk.columns[i].kind === "String" if (chunk.columns[i].kind === "String") {
? `"${typeof v === "string" ? v.replaceAll('"', '""') : v}"` return `"${
: v, typeof v === "string" ? v.replaceAll('"', '""') : v
) }"`;
} else if (chunk.columns[i].kind === "Entity") {
return (v as EntityValue).label;
} else {
return v;
}
})
.join(",")}\n`, .join(",")}\n`,
); );
}); });