Skip to content

Commit 81a7950

Browse files
CsCherrYYjdneo
andauthored
fix: Can show default output file name in export jar (#404)
Co-authored-by: Sheng Chen <[email protected]>
1 parent 35820eb commit 81a7950

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

src/exportJarSteps/GenerateJarExecutor.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Jdtls } from "../java/jdtls";
1111
import { INodeData } from "../java/nodeData";
1212
import { IExportJarStepExecutor } from "./IExportJarStepExecutor";
1313
import { IClasspath, IStepMetadata } from "./IStepMetadata";
14-
import { createPickBox, ExportJarMessages, ExportJarStep, ExportJarTargets, getExtensionApi, saveDialog, toPosixPath } from "./utility";
14+
import { createPickBox, ExportJarMessages, ExportJarStep, ExportJarTargets, getExtensionApi, toPosixPath } from "./utility";
1515

1616
export class GenerateJarExecutor implements IExportJarStepExecutor {
1717

@@ -38,7 +38,12 @@ export class GenerateJarExecutor implements IExportJarStepExecutor {
3838
if (stepMetadata.outputPath === ExportJarTargets.SETTING_ASKUSER) {
3939
sendInfo("", { exportJarPath: stepMetadata.outputPath });
4040
}
41-
const outputUri: Uri | undefined = await saveDialog(folder.uri, "Generate");
41+
const outputUri: Uri | undefined = await window.showSaveDialog({
42+
defaultUri: Uri.file(join(folder.uri.fsPath, `${folder.name}.jar`)),
43+
filters: {
44+
"Java Archive": ["jar"],
45+
},
46+
});
4247
if (!outputUri) {
4348
return Promise.reject();
4449
}

src/exportJarSteps/utility.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { EOL, platform } from "os";
55
import { posix, win32 } from "path";
6-
import { commands, Extension, extensions, QuickInputButtons, QuickPick, QuickPickItem, SaveDialogOptions, Uri, window } from "vscode";
6+
import { commands, Extension, extensions, QuickInputButtons, QuickPick, QuickPickItem, Uri, window } from "vscode";
77
import { sendOperationError } from "vscode-extension-telemetry-wrapper";
88
import { Commands } from "../commands";
99
import { GenerateJarExecutor } from "./GenerateJarExecutor";
@@ -97,17 +97,6 @@ export interface IMessageOption {
9797
arguments?: any;
9898
}
9999

100-
export async function saveDialog(workSpaceUri: Uri, title: string): Promise<Uri | undefined> {
101-
const options: SaveDialogOptions = {
102-
saveLabel: title,
103-
defaultUri: workSpaceUri,
104-
filters: {
105-
"Java Archive": ["jar"],
106-
},
107-
};
108-
return Promise.resolve(await window.showSaveDialog(options));
109-
}
110-
111100
export function failMessage(message: string, option?: IMessageOption): void {
112101
sendOperationError("", Commands.VIEW_PACKAGE_EXPORT_JAR, new Error(message));
113102
if (option === undefined) {

0 commit comments

Comments
 (0)