Improve the prompt message (#901)

* Improve the prompt message

Signed-off-by: Sheng Chen <[email protected]>

* Fix lint error

* Do not auto pick when no main method in the file

Author: jdneo

src/extension.ts

@@ -266,12 +266,14 @@ async function runJavaFile(uri: vscode.Uri, noDebug: boolean) {
 
     const hasMainMethods: boolean = mainMethods.length > 0;
     const canRunTests: boolean = await canDelegateToJavaTestRunner(uri);
+    const defaultPlaceHolder: string = "Select the main class to run";
 
     if (!hasMainMethods && !canRunTests) {
         const mainClasses: IMainClassOption[] = await utility.searchMainMethods();
-        await launchMain(mainClasses, uri, noDebug);
+        const placeHolder: string = `The file '${path.basename(uri.fsPath)}' is not executable, please select a main class you want to run.`;
+        await launchMain(mainClasses, uri, noDebug, placeHolder, false /*autoPick*/);
     } else if (hasMainMethods && !canRunTests) {
-        await launchMain(mainMethods, uri, noDebug);
+        await launchMain(mainMethods, uri, noDebug, defaultPlaceHolder);
     } else if (!hasMainMethods && canRunTests) {
         await launchTesting(uri, noDebug);
     } else {
@@ -282,7 +284,7 @@ async function runJavaFile(uri: vscode.Uri, noDebug: boolean) {
             { placeHolder: "Please select which kind of task you would like to launch" },
         );
         if (choice === launchMainChoice) {
-            await launchMain(mainMethods, uri, noDebug);
+            await launchMain(mainMethods, uri, noDebug, defaultPlaceHolder);
         } else if (choice === launchTestChoice) {
             await launchTesting(uri, noDebug);
         }
@@ -302,14 +304,15 @@ async function launchTesting(uri: vscode.Uri, noDebug: boolean): Promise<void> {
     noDebug ? vscode.commands.executeCommand("java.test.editor.run", uri) : vscode.commands.executeCommand("java.test.editor.debug", uri);
 }
 
-async function launchMain(mainMethods: IMainClassOption[], uri: vscode.Uri, noDebug: boolean): Promise<void> {
+async function launchMain(mainMethods: IMainClassOption[], uri: vscode.Uri, noDebug: boolean, placeHolder: string,
+                          autoPick: boolean = true): Promise<void> {
     if (!mainMethods || !mainMethods.length) {
         vscode.window.showErrorMessage(
             "Error: Main method not found in the file, please define the main method as: public static void main(String[] args)");
         return;
     }
 
-    const pick = await mainClassPicker.showQuickPickWithRecentlyUsed(mainMethods, "Select the main class to run.");
+    const pick = await mainClassPicker.showQuickPickWithRecentlyUsed(mainMethods, placeHolder, autoPick);
     if (!pick) {
         return;
     }

src/mainClassPicker.ts

@@ -55,12 +55,30 @@ class MainClassPicker {
         }
     }
 
-    // Record the main class picking history in a most recently used cache.
-    public async showQuickPickWithRecentlyUsed(options: IMainClassOption[], placeHolder: string,
-                                               labelFormatter?: (option: IMainClassOption) => string): Promise<IMainClassOption | undefined> {
+    // tslint:disable-next-line
+    public async showQuickPickWithRecentlyUsed(options: IMainClassOption[], placeHolder: string): Promise<IMainClassOption | undefined>;
+    // tslint:disable-next-line
+    public async showQuickPickWithRecentlyUsed(options: IMainClassOption[], placeHolder: string, labelFormatter: Formatter): Promise<IMainClassOption | undefined>;
+    // tslint:disable-next-line
+    public async showQuickPickWithRecentlyUsed(options: IMainClassOption[], placeHolder: string, autoPick: boolean): Promise<IMainClassOption | undefined>;
+    // tslint:disable-next-line
+    public async showQuickPickWithRecentlyUsed(options: IMainClassOption[], placeHolder: string, parameter3?: Formatter | boolean,
+                                               parameter4?: boolean): Promise<IMainClassOption | undefined> {
+        // Record the main class picking history in a most recently used cache.
+        let labelFormatter: Formatter = defaultLabelFormatter;
+        let autoPick: boolean = true;
+        if (typeof parameter3 === "function") {
+            labelFormatter = parameter3;
+        } else if (typeof parameter3 === "boolean") {
+            autoPick = parameter3;
+        }
+        if (typeof parameter4 === "boolean") {
+            autoPick = parameter4;
+        }
+
         if (!options || !options.length) {
             return;
-        } else if (options.length === 1) {
+        } else if (autoPick && options.length === 1) {
             return options[0];
         }