Skip to content

Commit

Permalink
Merge pull request #3255 from github/dependabot/npm_and_yarn/extensio…
Browse files Browse the repository at this point in the history
…ns/ql-vscode/prettier-3.2.4

Bump prettier from 3.1.1 to 3.2.4 in /extensions/ql-vscode
  • Loading branch information
norascheuch authored Jan 19, 2024
2 parents f1a915e + fc41360 commit 8690f76
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 19 deletions.
8 changes: 4 additions & 4 deletions extensions/ql-vscode/package-lock.json

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
Original file line number Diff line number Diff line change
Expand Up @@ -2047,7 +2047,7 @@
"mini-css-extract-plugin": "^2.6.1",
"npm-run-all": "^4.1.5",
"patch-package": "^8.0.0",
"prettier": "^3.0.0",
"prettier": "^3.2.4",
"storybook": "^7.6.7",
"tar-stream": "^3.0.0",
"through2": "^4.0.2",
Expand Down
5 changes: 3 additions & 2 deletions extensions/ql-vscode/scripts/util/vscode-versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ export async function getVersionInformation(
vscodeVersion: string,
): Promise<VersionInformation> {
const vsCodePackageJson = await getVsCodePackageJson(vscodeVersion);
const electronVersion = minVersion(vsCodePackageJson.devDependencies.electron)
?.version;
const electronVersion = minVersion(
vsCodePackageJson.devDependencies.electron,
)?.version;
if (!electronVersion) {
throw new Error("Could not find Electron version");
}
Expand Down
17 changes: 9 additions & 8 deletions extensions/ql-vscode/src/common/readonly.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
export type DeepReadonly<T> = T extends Array<infer R>
? DeepReadonlyArray<R>
: // eslint-disable-next-line @typescript-eslint/ban-types
T extends Function
? T
: T extends object
? DeepReadonlyObject<T>
: T;
export type DeepReadonly<T> =
T extends Array<infer R>
? DeepReadonlyArray<R>
: // eslint-disable-next-line @typescript-eslint/ban-types
T extends Function
? T
: T extends object
? DeepReadonlyObject<T>
: T;

interface DeepReadonlyArray<T> extends ReadonlyArray<DeepReadonly<T>> {}

Expand Down
5 changes: 3 additions & 2 deletions extensions/ql-vscode/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,9 @@ function getCommands(
"codeQL.restartLegacyQueryServerOnConfigChange": restartQueryServer,
"codeQL.restartQueryServerOnExternalConfigChange": restartQueryServer,
"codeQL.copyVersion": async () => {
const text = `CodeQL extension version: ${extension?.packageJSON
.version} \nCodeQL CLI version: ${await getCliVersion()} \nPlatform: ${platform()} ${arch()}`;
const text = `CodeQL extension version: ${
extension?.packageJSON.version
} \nCodeQL CLI version: ${await getCliVersion()} \nPlatform: ${platform()} ${arch()}`;
await env.clipboard.writeText(text);
void showAndLogInformationMessage(extLogger, text);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ export function filterAndSortRepositoriesWithResults<
filterSortState.repositoryIds.length > 0
) {
return repositories
.filter(
(repo) => filterSortState.repositoryIds?.includes(repo.repository.id),
.filter((repo) =>
filterSortState.repositoryIds?.includes(repo.repository.id),
)
.sort(compareWithResults(filterSortState));
}
Expand Down

0 comments on commit 8690f76

Please sign in to comment.