Skip to content

Only pop-up build errors notification when the errors are on the running project's classpath #1263

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
testforstephen merged 1 commit into from
Nov 21, 2022
Merged

Only pop-up build errors notification when the errors are on the running project's classpath #1263

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
42 changes: 33 additions & 9 deletions src/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import * as utility from "./utility";

const JAVA_DEBUG_CONFIGURATION = "java.debug.settings";
const ON_BUILD_FAILURE_PROCEED = "onBuildFailureProceed";
const CANCELLED_CODE = -32800;

enum CompileWorkspaceStatus {
FAILED = 0,
Expand All @@ -19,25 +20,44 @@ enum CompileWorkspaceStatus {
CANCELLED = 3,
}

export async function buildWorkspace(progressReporter: IProgressReporter): Promise<boolean> {
export interface BuildParams {
readonly mainClass: string;
readonly projectName?: string;
readonly filePath?: string;
readonly isFullBuild: boolean;
}

export async function buildWorkspace(params: BuildParams, progressReporter: IProgressReporter): Promise<boolean> {
const startAt = new Date().getTime();
const buildResult = await instrumentOperation("build", async (operationId: string) => {
let error;
let status;
try {
await commands.executeJavaExtensionCommand(commands.JAVA_BUILD_WORKSPACE, false, progressReporter.getCancellationToken());
status = await commands.executeJavaLanguageServerCommand(commands.JAVA_BUILD_WORKSPACE,
JSON.stringify(params),
progressReporter.getCancellationToken());
} catch (err) {
error = err;
status = (err && err.code === CANCELLED_CODE) ? CompileWorkspaceStatus.CANCELLED : err;
}

return {
error,
status,
operationId,
};
})();

if (progressReporter.isCancelled() || buildResult.error === CompileWorkspaceStatus.CANCELLED) {
if (progressReporter.isCancelled() || buildResult.status === CompileWorkspaceStatus.CANCELLED) {
return false;
} else if (buildResult.status === CompileWorkspaceStatus.SUCCEED) {
return true;
} else {
return handleBuildFailure(buildResult.operationId, buildResult.error, progressReporter);
const elapsed = new Date().getTime() - startAt;
const humanVisibleDelay = elapsed < 150 ? 150 : 0;
await new Promise(resolve => {
setTimeout(() => { // set a timeout so user still can see a compiling message.
resolve(null);
}, humanVisibleDelay);
});
return handleBuildFailure(buildResult.operationId, buildResult.status, progressReporter);
}
}

Expand All @@ -62,12 +82,16 @@ async function handleBuildFailure(operationId: string, err: any, progressReporte
}

progressReporter.hide(true);
const ans = await vscode.window.showErrorMessage("Build failed, do you want to continue?", "Proceed", "Fix...", "Cancel");
const ans = await vscode.window.showErrorMessage("Build failed, do you want to continue?", "Continue", "Always Continue", "Fix...");
sendInfo(operationId, {
operationName: "build",
choiceForBuildError: ans || "esc",
});
if (ans === "Proceed") {
if (ans === "Continue") {
return true;
} else if (ans === "Always Continue") {
const debugSettings: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("java.debug.settings");
debugSettings?.update("onBuildFailureProceed", true);
return true;
} else if (ans === "Fix...") {
showFixSuggestions(operationId);
Expand Down
2 changes: 1 addition & 1 deletion src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const JAVA_RESOLVE_MAINCLASS = "vscode.java.resolveMainClass";

export const JAVA_VALIDATE_LAUNCHCONFIG = "vscode.java.validateLaunchConfig";

export const JAVA_BUILD_WORKSPACE = "java.workspace.compile";
export const JAVA_BUILD_WORKSPACE = "vscode.java.buildWorkspace";

export const JAVA_EXECUTE_WORKSPACE_COMMAND = "java.execute.workspaceCommand";

Expand Down
26 changes: 14 additions & 12 deletions src/configurationProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,28 +248,30 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
config.internalConsoleOptions = "neverOpen";
}

if (needsBuildWorkspace()) {
progressReporter.report("Compiling...");
const proceed = await buildWorkspace(progressReporter);
if (!proceed) {
return undefined;
}
}

if (progressReporter.isCancelled()) {
return undefined;
}
if (!config.mainClass) {
progressReporter.report("Resolving main class...");
} else {
progressReporter.report("Resolving launch configuration...");
}

progressReporter.report("Resolving main class...");
const mainClassOption = await this.resolveAndValidateMainClass(folder && folder.uri, config, progressReporter);
if (!mainClassOption || !mainClassOption.mainClass) { // Exit silently if the user cancels the prompt fix by ESC.
// Exit the debug session.
return undefined;
}

if (needsBuildWorkspace()) {
progressReporter.report("Compiling...");
const proceed = await buildWorkspace({
mainClass: mainClassOption.mainClass,
projectName: mainClassOption.projectName,
isFullBuild: false,
}, progressReporter);
if (!proceed) {
return undefined;
}
}

progressReporter.report("Resolving launch configuration...");
config.mainClass = mainClassOption.mainClass;
config.projectName = mainClassOption.projectName;
Expand Down