Skip to content

Show "Prompting" in notification when prompting a single target action #3024

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
sebjulliand merged 1 commit into from
Jan 13, 2026
Merged

Show "Prompting" in notification when prompting a single target action #3024

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
7 changes: 5 additions & 2 deletions src/api/CompileTools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ export namespace CompileTools {
export const DID_NOT_RUN = -123;

interface RunCommandEvents {
writeEvent?: (content: string) => void;
commandConfirm?: (command: string) => Promise<string>;
writeEvent?: (content: string) => void
commandConfirm?: (command: string) => Promise<string>
updateProgress?: (message: string) => void
}

/**
Expand All @@ -40,7 +41,9 @@ export namespace CompileTools {
let commandString = variables.expand(options.command);

if (events.commandConfirm) {
events.updateProgress?.(" - Prompting...");
commandString = await events.commandConfirm(commandString);
events.updateProgress?.("");
}

if (commandString) {
Expand Down
9 changes: 5 additions & 4 deletions src/ui/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ export async function runAction(instance: Instance, uris: vscode.Uri | vscode.Ur
break;
}

task.report({ message: `${processedPath} (${done++}/${targets.length})`, increment })
task.report({ message: `${processedPath}${targets.length > 1 ? ` (${done++}/${targets.length})` : ''}`, increment })

const viewControl = IBMi.connectionManager.get<string>(`postActionView`) || "none";
let actionName = chosenAction.name;
Expand Down Expand Up @@ -372,7 +372,8 @@ export async function runAction(instance: Instance, uris: vscode.Uri | vscode.Ur
env: variables,
}, {
writeEvent: (content) => writeEmitter.fire(content),
commandConfirm: promptOnce ? undefined : commandConfirm
commandConfirm: promptOnce ? undefined : commandConfirm,
updateProgress: message => task.report({ message: `${processedPath}${message}` })
}
);

Expand All @@ -388,7 +389,7 @@ export async function runAction(instance: Instance, uris: vscode.Uri | vscode.Ur
if (isIleCommand && possibleObjects) {
evfeventInfos.length = 0;
if (Array.isArray(possibleObjects)) {
for(const o of possibleObjects) {
for (const o of possibleObjects) {
evfeventInfos.push({
library: o.library || evfeventInfo.library,
object: o.object,
Expand Down Expand Up @@ -652,7 +653,7 @@ function getObjectsFromJoblog(stderr: string): CommandObject[] | undefined {
// Filter lines with EVFEVENT info from server.
const joblogLines = stderr.split(`\n`).filter(line => line.match(/: EVFEVENT:/i));

for(const joblogLine of joblogLines) {
for (const joblogLine of joblogLines) {
const evfevent = joblogLine.match(/: EVFEVENT:(.*)/i) || '';
if (evfevent.length) {
const object = evfevent[1].trim().split(/[,\|/]/);
Expand Down
Loading