Skip to content

fix: Multiple export jar terminals exist at the same time #498

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

Closed
wants to merge 1 commit into from
Closed

fix: Multiple export jar terminals exist at the same time #498

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
25 changes: 18 additions & 7 deletions src/exportJarSteps/ExportJarTaskProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { IExportJarStepExecutor } from "./IExportJarStepExecutor";
import { IClasspath, IStepMetadata } from "./IStepMetadata";
import { IMainClassInfo } from "./ResolveMainClassExecutor";
import {
disposeLastTerminal,
ExportJarConstants, ExportJarMessages, ExportJarStep, failMessage, getExtensionApi,
resetStepMetadata, stepMap, successMessage, toPosixPath, toWinPath,
} from "./utility";
Expand Down Expand Up @@ -55,7 +56,7 @@ export async function executeExportJarTask(node?: INodeData): Promise<void> {
throw new Error(ExportJarMessages.stepErrorMessage(ExportJarMessages.StepAction.FINDEXECUTOR, ExportJarStep.ResolveJavaProject));
}
await resolveJavaProjectExecutor.execute(stepMetadata);
tasks.executeTask(ExportJarTaskProvider.getTask(stepMetadata));
tasks.executeTask(ExportJarTaskProvider.getDefaultTask(stepMetadata));
} catch (err) {
if (err) {
failMessage(`${err}`);
Expand All @@ -68,20 +69,20 @@ export class ExportJarTaskProvider implements TaskProvider {

public static exportJarType: string = "java";

public static getTask(stepMetadata: IStepMetadata): Task {
public static getDefaultTask(stepMetadata: IStepMetadata): Task {
if (!stepMetadata.workspaceFolder) {
throw new Error(ExportJarMessages.fieldUndefinedMessage(ExportJarMessages.Field.WORKSPACEFOLDER, ExportJarStep.ResolveTask));
}
const defaultDefinition: IExportJarTaskDefinition = {
type: ExportJarTaskProvider.exportJarType,
label: `${ExportJarTaskProvider.exportJarType}: exportjar:default`,
label: "exportjar:default",
targetPath: Settings.getExportJarTargetPath(),
elements: [],
mainClass: undefined,
};
const task: Task = new Task(defaultDefinition, stepMetadata.workspaceFolder, "exportjar:default", ExportJarTaskProvider.exportJarType,
new CustomExecution(async (resolvedDefinition: TaskDefinition): Promise<Pseudoterminal> => {
return new ExportJarTaskTerminal(resolvedDefinition, stepMetadata);
return new ExportJarTaskTerminal(resolvedDefinition, stepMetadata, false);
}));
task.presentationOptions.reveal = TaskRevealKind.Never;
return task;
Expand All @@ -102,7 +103,7 @@ export class ExportJarTaskProvider implements TaskProvider {
elements: [],
classpaths: [],
};
return new ExportJarTaskTerminal(resolvedDefinition, stepMetadata);
return new ExportJarTaskTerminal(resolvedDefinition, stepMetadata, isExportingJar);
}));
resolvedTask.presentationOptions.reveal = TaskRevealKind.Never;
return resolvedTask;
Expand Down Expand Up @@ -149,7 +150,7 @@ export class ExportJarTaskProvider implements TaskProvider {
elements: [],
classpaths: [],
};
return new ExportJarTaskTerminal(resolvedDefinition, stepMetadata);
return new ExportJarTaskTerminal(resolvedDefinition, stepMetadata, isExportingJar);
}), undefined);
defaultTask.presentationOptions.reveal = TaskRevealKind.Never;
this.tasks.push(defaultTask);
Expand All @@ -167,15 +168,25 @@ class ExportJarTaskTerminal implements Pseudoterminal {
public onDidClose?: Event<void> = this.closeEmitter.event;

private stepMetadata: IStepMetadata;
private isBusy: boolean;
private terminalLabel: string | undefined;

constructor(exportJarTaskDefinition: IExportJarTaskDefinition, stepMetadata: IStepMetadata) {
constructor(exportJarTaskDefinition: IExportJarTaskDefinition, stepMetadata: IStepMetadata, isBusy: boolean) {
this.stepMetadata = stepMetadata;
this.stepMetadata.mainClass = exportJarTaskDefinition.mainClass;
this.stepMetadata.outputPath = exportJarTaskDefinition.targetPath;
this.stepMetadata.elements = exportJarTaskDefinition.elements || [];
this.terminalLabel = exportJarTaskDefinition.label;
this.isBusy = isBusy;
}

public async open(_initialDimensions: TerminalDimensions | undefined): Promise<void> {
if (this.isBusy) {
this.closeEmitter.fire();
disposeLastTerminal(this.terminalLabel);
return;
}
isExportingJar = true;
let exportResult: boolean | undefined;
try {
if (!this.stepMetadata.workspaceFolder) {
Expand Down
11 changes: 11 additions & 0 deletions src/exportJarSteps/utility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,14 @@ export async function getExtensionApi(): Promise<any> {
}
return extensionApi;
}

export function disposeLastTerminal(name: string | undefined): void {
if (!name) {
return;
}
const terminals = window.terminals;
const presenterTerminals = terminals.filter((terminal) => terminal.name.indexOf(name) >= 0);
if (presenterTerminals.length > 0) {
presenterTerminals[presenterTerminals.length - 1].dispose();
}
}