feat: Show Gradle commands in Project Manager's submenu

extension/package.json

@@ -332,6 +332,11 @@
         "command": "gradle.createProjectAdvanced",
         "category": "Gradle",
         "title": "Create a Gradle Java Project... (Advanced)"
+      },
+      {
+        "command": "gradle.showGradleProjectsView",
+        "category": "Gradle",
+        "title": "Focus on Gradle Projects View"
       }
     ],
     "menus": {
@@ -471,6 +476,10 @@
         {
           "command": "gradle.createProject",
           "when": "!java:projectManagerActivated"
+        },
+        {
+          "command": "gradle.showGradleProjectsView",
+          "when": "false"
         }
       ],
       "view/title": [
@@ -653,6 +662,16 @@
           "command": "gradle.showTasks",
           "group": "gradle@0"
         }
+      ],
+      "javaProject.gradle": [
+        {
+          "command": "gradle.showGradleProjectsView",
+          "group": "gradle@20"
+        },
+        {
+          "command": "gradle.openBuildFile",
+          "group": "gradle@30"
+        }
       ]
     },
     "configuration": {

extension/src/commands/Commands.ts

@@ -74,6 +74,7 @@ import { GradleDaemonsTreeDataProvider, GradleTasksTreeDataProvider, RecentTasks
 import { Command } from "./Command";
 import { COMMAND_CREATE_PROJECT, COMMAND_CREATE_PROJECT_ADVANCED, CreateProjectCommand } from "./CreateProjectCommand";
 import { HideStoppedDaemonsCommand, HIDE_STOPPED_DAEMONS } from "./HideStoppedDaemonsCommand";
+import { COMMAND_SHOW_PROJECTS_VIEW, ShowGradleProjectsViewCommand } from "./ShowGradleProjectsViewCommand";
 import { ShowStoppedDaemonsCommand, SHOW_STOPPED_DAEMONS } from "./ShowStoppedDaemonsCommand";
 
 export class Commands {
@@ -184,5 +185,6 @@ export class Commands {
         this.registerCommand(HIDE_STOPPED_DAEMONS, new HideStoppedDaemonsCommand(this.gradleDaemonsTreeDataProvider));
         this.registerCommand(COMMAND_CREATE_PROJECT, new CreateProjectCommand(this.client), [false]);
         this.registerCommand(COMMAND_CREATE_PROJECT_ADVANCED, new CreateProjectCommand(this.client), [true]);
+        this.registerCommand(COMMAND_SHOW_PROJECTS_VIEW, new ShowGradleProjectsViewCommand());
     }
 }

extension/src/commands/OpenBuildFileCommand.ts

@@ -1,15 +1,28 @@
 import * as vscode from "vscode";
+import * as path from "path";
+import * as fse from "fs-extra";
 import { GradleTaskTreeItem } from "../views";
 import { Command } from "./Command";
 
 export const COMMAND_OPEN_BUILD_FILE = "gradle.openBuildFile";
 
-async function run(taskItem: GradleTaskTreeItem): Promise<void> {
-    await vscode.commands.executeCommand("vscode.open", vscode.Uri.file(taskItem.task.definition.buildFile));
+async function run(path: string): Promise<void> {
+    await vscode.commands.executeCommand("vscode.open", vscode.Uri.file(path));
 }
 
 export class OpenBuildFileCommand extends Command {
-    async run(taskItem: GradleTaskTreeItem): Promise<void> {
-        return run(taskItem);
+    async run(item: GradleTaskTreeItem | { uri: string }): Promise<void> {
+        if (item instanceof GradleTaskTreeItem) {
+            return run(item.task.definition.buildFile);
+        } else if (item.uri) {
+            const buildFilePath: string = path.join(vscode.Uri.parse(item.uri).fsPath, "build.gradle");
+            if (await fse.pathExists(buildFilePath)) {
+                return run(buildFilePath);
+            }
+            const settingsFilePath: string = path.join(vscode.Uri.parse(item.uri).fsPath, "settings.gradle");
+            if (await fse.pathExists(settingsFilePath)) {
+                return run(settingsFilePath);
+            }
+        }
     }
 }

extension/src/commands/ShowGradleProjectsViewCommand.ts

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+import * as vscode from "vscode";
+import { Command } from "./Command";
+export const COMMAND_SHOW_PROJECTS_VIEW = "gradle.showGradleProjectsView";
+
+/**
+ * Mock VS Code build-in command gradleTasksView.focus
+ */
+export class ShowGradleProjectsViewCommand extends Command {
+    constructor() {
+        super();
+    }
+    async run(): Promise<void> {
+        await vscode.commands.executeCommand("gradleTasksView.focus");
+    }
+}