Skip to content

Commit

Permalink
Param doc, variable renamed for clarity
Browse files Browse the repository at this point in the history
  • Loading branch information
Razz4780 committed Feb 4, 2025
1 parent decfba7 commit d75ea50
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
12 changes: 8 additions & 4 deletions src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,12 @@ export class MirrordAPI {
* setting env vars, both from system, and from `launch.json` (`configEnv`).
*
* Has 60 seconds timeout
*
* @param quickPickSelection target selected by the user from the quick pick widget.
* `undefined` if we found the target in the config,
* and the widget was not shown.
*/
async binaryExecute(target: UserSelection | undefined, configFile: string | null, executable: string | null, configEnv: EnvVars): Promise<MirrordExecution> {
async binaryExecute(quickPickSelection: UserSelection | undefined, configFile: string | null, executable: string | null, configEnv: EnvVars): Promise<MirrordExecution> {
tickMirrordForTeamsCounter();
tickFeedbackCounter();
tickDiscordCounter();
Expand All @@ -387,11 +391,11 @@ export class MirrordAPI {
reject("timeout");
}, 120 * 1000);

const args = makeMirrordArgs(target?.path, configFile, executable);
const args = makeMirrordArgs(quickPickSelection?.path, configFile, executable);
let env: EnvVars;
if (target?.namespace) {
if (quickPickSelection?.namespace) {
// eslint-disable-next-line @typescript-eslint/naming-convention
env = { MIRRORD_TARGET_NAMESPACE: target.namespace, ...configEnv };
env = { MIRRORD_TARGET_NAMESPACE: quickPickSelection.namespace, ...configEnv };
} else {
env = configEnv;
}
Expand Down
6 changes: 3 additions & 3 deletions src/debugger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ async function main(
let mirrordApi = new MirrordAPI(cliPath);

config.env ||= {};
let target: UserSelection | undefined = undefined;
let quickPickSelection: UserSelection | undefined = undefined;

let configPath = await MirrordConfigManager.getInstance().resolveMirrordConfig(folder, config);
const verifiedConfig = await mirrordApi.verifyConfig(configPath, config.env);
Expand All @@ -123,7 +123,7 @@ async function main(

try {
const quickPick = await TargetQuickPick.new(getTargets);
target = await quickPick.showAndGet();
quickPickSelection = await quickPick.showAndGet();
} catch (err) {
mirrordFailure(`mirrord failed to list targets: ${err}`);
return null;
Expand Down Expand Up @@ -152,7 +152,7 @@ async function main(

let executionInfo;
try {
executionInfo = await mirrordApi.binaryExecute(target, configPath?.path || null, executable, config.env);
executionInfo = await mirrordApi.binaryExecute(quickPickSelection, configPath?.path || null, executable, config.env);
} catch (err) {
mirrordFailure(`mirrord preparation failed: ${err}`);
return null;
Expand Down

0 comments on commit d75ea50

Please sign in to comment.