Skip to content

chore: remove ASKUSER option #686

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
CsCherrYY merged 1 commit into from
Aug 31, 2022
Merged

chore: remove ASKUSER option #686

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
8 changes: 2 additions & 6 deletions src/tasks/buildArtifact/GenerateJarExecutor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ import { globby } from "globby";
import * as _ from "lodash";
import { basename, dirname, extname, isAbsolute, join, normalize, relative } from "path";
import { Disposable, ProgressLocation, QuickInputButtons, QuickPickItem, Uri, window, WorkspaceFolder } from "vscode";
import { sendInfo } from "vscode-extension-telemetry-wrapper";
import { Jdtls } from "../../java/jdtls";
import { INodeData } from "../../java/nodeData";
import { IExportJarStepExecutor } from "./IExportJarStepExecutor";
import { IClasspath, IStepMetadata } from "./IStepMetadata";
import { createPickBox, ExportJarMessages, ExportJarStep, ExportJarTargets, getExtensionApi, toPosixPath } from "./utility";
import { createPickBox, ExportJarMessages, ExportJarStep, getExtensionApi, toPosixPath } from "./utility";

export class GenerateJarExecutor implements IExportJarStepExecutor {

Expand All @@ -34,10 +33,7 @@ export class GenerateJarExecutor implements IExportJarStepExecutor {
throw new Error(ExportJarMessages.fieldUndefinedMessage(ExportJarMessages.Field.WORKSPACEFOLDER, this.currentStep));
}
let destPath = "";
if (stepMetadata.outputPath === ExportJarTargets.SETTING_ASKUSER || stepMetadata.outputPath === "") {
if (stepMetadata.outputPath === ExportJarTargets.SETTING_ASKUSER) {
sendInfo("", { exportJarPath: stepMetadata.outputPath });
}
if (stepMetadata.outputPath === "") {
const outputUri: Uri | undefined = await window.showSaveDialog({
defaultUri: Uri.file(join(folder.uri.fsPath, `${folder.name}.jar`)),
filters: {
Expand Down
6 changes: 0 additions & 6 deletions src/tasks/buildArtifact/utility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ export const stepMap: Map<ExportJarStep, IExportJarStepExecutor> = new Map<Expor
[ExportJarStep.GenerateJar, new GenerateJarExecutor()],
]);

export namespace ExportJarTargets {
export const SETTING_ASKUSER: string = "askUser";
// tslint:disable-next-line: no-invalid-template-strings
export const DEFAULT_OUTPUT_PATH: string = "${workspaceFolder}/${workspaceFolderBasename}.jar";
}

export namespace ExportJarConstants {
export const DEPENDENCIES: string = "dependencies";
export const TEST_DEPENDENCIES: string = "testDependencies";
Expand Down