Skip to content

Commit f07d9cf

Browse files
committed
Update wording to be more clear
1 parent b7bfd9e commit f07d9cf

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

extensions/ql-vscode/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@
375375
"title": "CodeQL: Clear Cache"
376376
},
377377
{
378-
"command": "codeQL.installPacks",
379-
"title": "CodeQL: Install Packs"
378+
"command": "codeQL.installPackDependencies",
379+
"title": "CodeQL: Install Pack Dependencies"
380380
},
381381
{
382382
"command": "codeQL.downloadPacks",

extensions/ql-vscode/src/extension.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ import { RemoteQuery } from './remote-queries/remote-query';
8383
import { URLSearchParams } from 'url';
8484
import { RemoteQueriesInterfaceManager } from './remote-queries/remote-queries-interface';
8585
import { sampleRemoteQuery, sampleRemoteQueryResult } from './remote-queries/sample-data';
86-
import { handleDownloadPacks, handleInstallPacks } from './packaging';
86+
import { handleDownloadPacks, handleInstallPackDependencies } from './packaging';
8787

8888
/**
8989
* extension.ts
@@ -924,12 +924,12 @@ async function activateWithInstalledDistribution(
924924
}));
925925

926926
ctx.subscriptions.push(
927-
commandRunnerWithProgress('codeQL.installPacks', async (
927+
commandRunnerWithProgress('codeQL.installPackDependencies', async (
928928
progress: ProgressCallback
929929
) =>
930-
await handleInstallPacks(cliServer, progress),
930+
await handleInstallPackDependencies(cliServer, progress),
931931
{
932-
title: 'Installing packs',
932+
title: 'Installing pack dependencies',
933933
}
934934
));
935935

extensions/ql-vscode/src/packaging.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export async function handleDownloadPacks(
7171
void showAndLogInformationMessage('Finished downloading packs.');
7272
} catch (error) {
7373
void showAndLogErrorMessage(
74-
'Unable to download all packs. See logs for more details.'
74+
'Unable to download all packs. See log for more details.'
7575
);
7676
}
7777
}
@@ -87,7 +87,7 @@ interface QLPackQuickPickItem extends QuickPickItem {
8787
* @param cliServer The CLI server.
8888
* @param progress A progress callback.
8989
*/
90-
export async function handleInstallPacks(
90+
export async function handleInstallPackDependencies(
9191
cliServer: CodeQLCliServer,
9292
progress: ProgressCallback,
9393
): Promise<void> {
@@ -96,7 +96,7 @@ export async function handleInstallPacks(
9696
} or later.`);
9797
}
9898
progress({
99-
message: 'Choose packs to install',
99+
message: 'Choose packs to install dependencies for',
100100
step: 1,
101101
maxStep: 2,
102102
});
@@ -106,13 +106,13 @@ export async function handleInstallPacks(
106106
packRootDir: value,
107107
}));
108108
const packsToInstall = await window.showQuickPick(quickPickItems, {
109-
placeHolder: 'Select packs to install',
109+
placeHolder: 'Select packs to install dependencies for',
110110
canPickMany: true,
111111
ignoreFocusOut: true,
112112
});
113113
if (packsToInstall && packsToInstall.length > 0) {
114114
progress({
115-
message: 'Installing packs. This may take a few minutes.',
115+
message: 'Installing dependencies. This may take a few minutes.',
116116
step: 2,
117117
maxStep: 2,
118118
});
@@ -131,10 +131,10 @@ export async function handleInstallPacks(
131131
if (failedPacks.length > 0) {
132132
void logger.log(`Errors:\n${errors.join('\n')}`);
133133
throw new Error(
134-
`Unable to install packs: ${failedPacks.join(', ')}. See log for more details.`
134+
`Unable to install pack dependencies for: ${failedPacks.join(', ')}. See log for more details.`
135135
);
136136
} else {
137-
void showAndLogInformationMessage('Finished installing packs.');
137+
void showAndLogInformationMessage('Finished installing pack dependencies.');
138138
}
139139
} else {
140140
throw new UserCancellationException('No packs selected.');

extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ describe('Packaging commands', function() {
101101
},
102102
]);
103103

104-
await mod.handleInstallPacks(cli, progress);
104+
await mod.handleInstallPackDependencies(cli, progress);
105105
expect(showAndLogInformationMessageSpy.firstCall.args[0]).to.contain(
106-
'Finished installing packs.'
106+
'Finished installing pack dependencies.'
107107
);
108108
});
109109

@@ -118,11 +118,11 @@ describe('Packaging commands', function() {
118118

119119
try {
120120
// expect this to throw an error
121-
await mod.handleInstallPacks(cli, progress);
121+
await mod.handleInstallPackDependencies(cli, progress);
122122
// This line should not be reached
123123
expect(true).to.be.false;
124124
} catch (error) {
125-
expect(error.message).to.contain('Unable to install packs:');
125+
expect(error.message).to.contain('Unable to install pack dependencies');
126126
}
127127
});
128128
});

0 commit comments

Comments
 (0)