From 35b7b9fd8517f24981f2d6976ca3fc32aa88184a Mon Sep 17 00:00:00 2001
From: Jinbo Wang <jinbwan@microsoft.com>
Date: Thu, 17 Nov 2022 16:33:56 +0800
Subject: [PATCH] Only pop-up build errors notification when the errors are on
 the running project's classpath

---
 src/build.ts                 | 42 ++++++++++++++++++++++++++++--------
 src/commands.ts              |  2 +-
 src/configurationProvider.ts | 26 +++++++++++-----------
 3 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/build.ts b/src/build.ts
index 1e0387ba..698dc65a 100644
--- a/src/build.ts
+++ b/src/build.ts
@@ -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,
@@ -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);
     }
 }
 
@@ -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);
diff --git a/src/commands.ts b/src/commands.ts
index b1368447..2419ec8f 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -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";
 
diff --git a/src/configurationProvider.ts b/src/configurationProvider.ts
index 13c1ef62..8bfa496b 100644
--- a/src/configurationProvider.ts
+++ b/src/configurationProvider.ts
@@ -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;