Skip to content

Add support for showing code flows #1187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charisk merged 1 commit into from
Mar 9, 2022
Merged

Add support for showing code flows #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 37 additions & 15 deletions extensions/ql-vscode/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion extensions/ql-vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@
"dependencies": {
"@octokit/rest": "^18.5.6",
"@primer/octicons-react": "^16.3.0",
"@primer/react": "^34.3.0",
"@primer/react": "^35.0.0-rc.c106d292",
"child-process-promise": "^2.2.1",
"classnames": "~2.2.6",
"d3": "^6.3.1",
Expand Down
198 changes: 197 additions & 1 deletion extensions/ql-vscode/src/remote-queries/sample-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ export const sampleRemoteQueryResult: RemoteQueryResult = {
const createAnalysisResults = (n: number) => Array(n).fill(
{
message: 'This shell command depends on an uncontrolled [absolute path](1).',
shortDescription: 'Shell command built from environment values',
severity: 'Error',
filePath: 'npm-packages/meteor-installer/config.js',
codeSnippet: {
Expand All @@ -113,7 +114,202 @@ const createAnalysisResults = (n: number) => Array(n).fill(
startLine: 255,
startColumn: 28,
endColumn: 62
}
},
codeFlows: [
{
threadFlows: [
{
filePath: 'npm-packages/meteor-installer/config.js',
highlightedRegion: {
startLine: 35,
startColumn: 20,
endColumn: 61
},
codeSnippet: {
startLine: 33,
endLine: 37,
text: '\nconst meteorLocalFolder = \'.meteor\';\nconst meteorPath = path.resolve(rootPath, meteorLocalFolder);\n\nmodule.exports = {\n'
}
},
{
filePath: 'npm-packages/meteor-installer/config.js',
highlightedRegion: {
startLine: 35,
startColumn: 7,
endColumn: 61
},
codeSnippet: {
startLine: 33,
endLine: 37,
text: '\nconst meteorLocalFolder = \'.meteor\';\nconst meteorPath = path.resolve(rootPath, meteorLocalFolder);\n\nmodule.exports = {\n'
}
},
{
filePath: 'npm-packages/meteor-installer/config.js',
highlightedRegion: {
startLine: 40,
startColumn: 3,
endColumn: 13
},
codeSnippet: {
startLine: 38,
endLine: 42,
text: ' METEOR_LATEST_VERSION,\n extractPath: rootPath,\n meteorPath,\n release: process.env.INSTALL_METEOR_VERSION || METEOR_LATEST_VERSION,\n rootPath,\n'
}
},
{
filePath: 'npm-packages/meteor-installer/install.js',
highlightedRegion: {
startLine: 12,
startColumn: 3,
endColumn: 13
},
codeSnippet: {
startLine: 10,
endLine: 14,
text: 'const os = require(\'os\');\nconst {\n meteorPath,\n release,\n startedPath,\n'
}
},
{
filePath: 'npm-packages/meteor-installer/install.js',
highlightedRegion: {
startLine: 11,
startColumn: 7,
endLine: 22,
endColumn: 27
},
codeSnippet: {
startLine: 9,
endLine: 24,
text: 'const tmp = require(\'tmp\');\nconst os = require(\'os\');\nconst {\n meteorPath,\n release,\n startedPath,\n extractPath,\n isWindows,\n rootPath,\n sudoUser,\n isSudo,\n isMac,\n METEOR_LATEST_VERSION,\n} = require(\'./config.js\');\nconst { uninstall } = require(\'./uninstall\');\nconst {\n'
}
},
{
filePath: 'npm-packages/meteor-installer/install.js',
highlightedRegion: {
startLine: 255,
startColumn: 42,
endColumn: 52
},
codeSnippet: {
startLine: 253,
endLine: 257,
text: ' if (isWindows()) {\n //set for the current session and beyond\n child_process.execSync(`setx path "${meteorPath}/;%path%`);\n return;\n }\n'
}
},
{
filePath: 'npm-packages/meteor-installer/install.js',
highlightedRegion: {
startLine: 255,
startColumn: 28,
endColumn: 62
},
codeSnippet: {
startLine: 253,
endLine: 257,
text: ' if (isWindows()) {\n //set for the current session and beyond\n child_process.execSync(`setx path "${meteorPath}/;%path%`);\n return;\n }\n'
}
}
]
},
{
threadFlows: [
{
filePath: 'npm-packages/meteor-installer/config2.js',
highlightedRegion: {
startLine: 35,
startColumn: 20,
endColumn: 61
},
codeSnippet: {
startLine: 33,
endLine: 37,
text: '\nconst meteorLocalFolder = \'.meteor\';\nconst meteorPath = path.resolve(rootPath, meteorLocalFolder);\n\nmodule.exports = {\n'
}
},
{
filePath: 'npm-packages/meteor-installer/config2.js',
highlightedRegion: {
startLine: 35,
startColumn: 7,
endColumn: 61
},
codeSnippet: {
startLine: 33,
endLine: 37,
text: '\nconst meteorLocalFolder = \'.meteor\';\nconst meteorPath = path.resolve(rootPath, meteorLocalFolder);\n\nmodule.exports = {\n'
}
},
{
filePath: 'npm-packages/meteor-installer/config2.js',
highlightedRegion: {
startLine: 40,
startColumn: 3,
endColumn: 13
},
codeSnippet: {
startLine: 38,
endLine: 42,
text: ' METEOR_LATEST_VERSION,\n extractPath: rootPath,\n meteorPath,\n release: process.env.INSTALL_METEOR_VERSION || METEOR_LATEST_VERSION,\n rootPath,\n'
}
},
{
filePath: 'npm-packages/meteor-installer/install2.js',
highlightedRegion: {
startLine: 12,
startColumn: 3,
endColumn: 13
},
codeSnippet: {
startLine: 10,
endLine: 14,
text: 'const os = require(\'os\');\nconst {\n meteorPath,\n release,\n startedPath,\n'
}
},
{
filePath: 'npm-packages/meteor-installer/install2.js',
highlightedRegion: {
startLine: 11,
startColumn: 7,
endLine: 22,
endColumn: 27
},
codeSnippet: {
startLine: 9,
endLine: 24,
text: 'const tmp = require(\'tmp\');\nconst os = require(\'os\');\nconst {\n meteorPath,\n release,\n startedPath,\n extractPath,\n isWindows,\n rootPath,\n sudoUser,\n isSudo,\n isMac,\n METEOR_LATEST_VERSION,\n} = require(\'./config.js\');\nconst { uninstall } = require(\'./uninstall\');\nconst {\n'
}
},
{
filePath: 'npm-packages/meteor-installer/install2.js',
highlightedRegion: {
startLine: 255,
startColumn: 42,
endColumn: 52
},
codeSnippet: {
startLine: 253,
endLine: 257,
text: ' if (isWindows()) {\n //set for the current session and beyond\n child_process.execSync(`setx path "${meteorPath}/;%path%`);\n return;\n }\n'
}
},
{
filePath: 'npm-packages/meteor-installer/install2.js',
highlightedRegion: {
startLine: 255,
startColumn: 28,
endColumn: 62
},
codeSnippet: {
startLine: 253,
endLine: 257,
text: ' if (isWindows()) {\n //set for the current session and beyond\n child_process.execSync(`setx path "${meteorPath}/;%path%`);\n return;\n }\n'
}
}
]
}
]

}
);

Expand Down
Loading