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

Use os.EOL instead of \n

Browse Source
This commit is contained in:
Andrew Eisenberg
2022-04-21 08:47:48 -07:00
parent 2ebdbaafa3
commit 44145baca7
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/ql-vscode/src/remote-queries/run-remote-query.ts
View File

@@ -2,6 +2,7 @@ import { CancellationToken, Uri, window } from 'vscode';
import * as path from 'path';
import * as yaml from 'js-yaml';
import * as fs from 'fs-extra';
import * as os from 'os';
import * as tmp from 'tmp-promise';
import {
askForLanguage,
@@ -338,22 +339,25 @@ async function runRemoteQueriesApiRequest(
}
// exported for testng only
const eol = os.EOL;
const eol2 = os.EOL + os.EOL;
export function parseResponse(owner: string, repo: string, response: QueriesResponse) {
const popupMessage = `Successfully scheduled runs. [Click here to see the progress](https://github.com/${owner}/${repo}/actions/runs/${response.workflow_run_id}).`
+ (response.errors ? '\n\nSome repositories could not be scheduled. See extension log for details.' : '');
+ (response.errors ? `${eol2}Some repositories could not be scheduled. See extension log for details.` : '');
let logMessage = `Successfully scheduled runs. See https://github.com/${owner}/${repo}/actions/runs/${response.workflow_run_id}.`;
if (response.repositories_queried) {
logMessage += `\n\nRepositories queried:\n${response.repositories_queried.join(', ')}`;
logMessage += `${eol2}Repositories queried:${eol}${response.repositories_queried.join(', ')}`;
}
if (response.errors) {
logMessage += '\n\nSome repositories could not be scheduled.';
logMessage += `${eol2}Some repositories could not be scheduled.`;
if (response.errors.invalid_repositories?.length) {
logMessage += `\n\nInvalid repositories:\n${response.errors.invalid_repositories.join(', ')}`;
logMessage += `${eol2}Invalid repositories:${eol}${response.errors.invalid_repositories.join(', ')}`;
}
if (response.errors.repositories_without_database?.length) {
logMessage += `\n\nRepositories without databases:\n${response.errors.repositories_without_database.join(', ')}`;
logMessage += '\nThese repositories have been added to the database storage service and we will attempt to create a database for them next time the store is updated.';
logMessage += `${eol2}Repositories without databases:${eol}${response.errors.repositories_without_database.join(', ')}`;
logMessage += `${eol}These repositories have been added to the database storage service and we will attempt to create a database for them next time the store is updated.`;
}
}

3
extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/run-remote-query.test.ts
View File

@@ -1,4 +1,5 @@
import { expect } from 'chai';
import * as os from 'os';
import { parseResponse } from '../../../remote-queries/run-remote-query';
describe('run-remote-query', () => {
@@ -14,7 +15,7 @@ describe('run-remote-query', () => {
['Successfully scheduled runs. See https://github.com/org/name/actions/runs/123.',
'',
'Repositories queried:',
'a/b, c/d'].join('\n')
'a/b, c/d'].join(os.EOL),
);
});