feat: Allow specifying project open behaviour after creating new project

README.md

@@ -223,6 +223,7 @@ This extension contributes the following settings:
 - `gradle.debug`: Show extra debug info in the output panel (boolean)
 - `gradle.disableConfirmations`: Disable the warning confirm messages when performing batch actions (eg clear tasks, stop daemons etc) (boolean)
 - `gradle.allowParallelRun`: Allow to run tasks in parallel, each running will create a new terminal. This configuration will override `gradle.reuseTerminals` and always create new task terminals when running or debugging a task.
+- `gradle.projectOpenBehaviour`: Specify the default method of opening newly created project ("Interactive", "Open" or "Add to Workspace")
 
 ## Gradle & Java Settings
 

extension/package.json

@@ -807,6 +807,17 @@
           "default": false,
           "scope": "window",
           "markdownDescription": "Allow to run tasks in parallel, each running will create a new terminal. This configuration will override `gradle.reuseTerminals` and always create new task terminals when running or debugging a task."
+        },
+        "gradle.projectOpenBehaviour": {
+          "default": "Interactive",
+          "type": "string",
+          "scope": "window",
+          "description": "Default method of opening newly created project.",
+          "enum": [
+            "Interactive",
+            "Open",
+            "Add to Workspace"
+          ]
         }
       }
     },

extension/src/commands/CreateProjectCommand.ts

@@ -8,6 +8,7 @@ import { getRunTaskCommandCancellationKey } from "../client/CancellationKeys";
 import { selectProjectTypeStep } from "../createProject/SelectProjectTypeStep";
 import { selectScriptDSLStep } from "../createProject/SelectScriptDSLStep";
 import { IProjectCreationMetadata, IProjectCreationStep, ProjectType, StepResult } from "../createProject/types";
+import { getProjectOpenBehaviour, ProjectOpenBehaviourValue } from "../util/config";
 import { Command } from "./Command";
 
 export const COMMAND_CREATE_PROJECT = "gradle.createProject";
@@ -48,12 +49,42 @@ export class CreateProjectCommand extends Command {
             const success = await this.runSteps(metadata);
             if (success) {
                 await this.createProject(metadata);
-                const openInNewWindow = folders !== undefined;
-                vscode.commands.executeCommand(
-                    "vscode.openFolder",
-                    vscode.Uri.file(metadata.targetFolder),
-                    openInNewWindow
-                );
+                const hasOpenFolder = folders !== undefined;
+                const insideWorkspace: boolean =
+                    folders?.find((workspaceFolder) =>
+                        metadata.targetFolder.startsWith(workspaceFolder.uri?.fsPath)
+                    ) !== undefined;
+                let openProjectBehaviour = getProjectOpenBehaviour();
+                if (openProjectBehaviour === ProjectOpenBehaviourValue.INTERACTIVE) {
+                    const candidates: string[] = [
+                        ProjectOpenBehaviourValue.OPEN,
+                        hasOpenFolder && insideWorkspace === false
+                            ? ProjectOpenBehaviourValue.ADDTOWORKSPACE
+                            : undefined,
+                    ].filter(Boolean) as string[];
+                    const choice = await vscode.window.showInformationMessage(
+                        `Gradle project [${metadata.projectName}] is created under: ${metadata.targetFolder}`,
+                        ...candidates
+                    );
+                    if (choice) {
+                        openProjectBehaviour = choice;
+                    }
+                }
+                if (openProjectBehaviour === ProjectOpenBehaviourValue.OPEN) {
+                    vscode.commands.executeCommand(
+                        "vscode.openFolder",
+                        vscode.Uri.file(metadata.targetFolder),
+                        hasOpenFolder
+                    );
+                } else if (openProjectBehaviour === ProjectOpenBehaviourValue.ADDTOWORKSPACE) {
+                    // check here in case of setting to "Add to Workspace" manually
+                    // if generated folder is inside any current workspace (insideWorkspace === true), extension will do nothing
+                    if (!insideWorkspace) {
+                        vscode.workspace.updateWorkspaceFolders(folders ? folders.length : 0, null, {
+                            uri: vscode.Uri.file(metadata.targetFolder),
+                        });
+                    }
+                }
             }
         }
         return;

extension/src/util/config.ts

@@ -105,6 +105,18 @@ export function getAllowParallelRun(): boolean {
     return vscode.workspace.getConfiguration("gradle").get<boolean>("allowParallelRun", false);
 }
 
+export enum ProjectOpenBehaviourValue {
+    INTERACTIVE = "Interactive",
+    OPEN = "Open",
+    ADDTOWORKSPACE = "Add to Workspace",
+}
+
+export function getProjectOpenBehaviour(): string {
+    return vscode.workspace
+        .getConfiguration("gradle")
+        .get<string>("projectOpenBehaviour", ProjectOpenBehaviourValue.INTERACTIVE);
+}
+
 export function getGradleConfig(): GradleConfig {
     const gradleConfig = new GradleConfig();
     const gradleHome = getConfigJavaImportGradleHome();