register 'execute commands' onto Project Manager

package.json

@@ -38,6 +38,7 @@
     "onCommand:maven.goal.deploy",
     "onCommand:maven.goal.custom",
     "onCommand:maven.goal.execute",
+    "onCommand:maven.goal.execute.fromProjectManager",
     "onCommand:maven.project.effectivePom",
     "onCommand:maven.project.openPom",
     "onCommand:maven.archetype.generate",
@@ -142,6 +143,11 @@
         "title": "%contributes.commands.maven.goal.execute%",
         "category": "Maven"
       },
+      {
+        "command": "maven.goal.execute.fromProjectManager",
+        "title": "Run Maven Commands...",
+        "category": "Maven"
+      },
       {
         "command": "maven.plugin.execute",
         "title": "%contributes.commands.maven.plugin.execute%",
@@ -255,6 +261,10 @@
         {
           "command": "maven.project.showDependencies",
           "when": "never"
+        },
+        {
+          "command": "maven.goal.execute.fromProjectManager",
+          "when": "never"
         }
       ],
       "explorer/context": [
@@ -400,6 +410,11 @@
           "command": "maven.project.addDependency",
           "when": "view == javaProjectExplorer && viewItem =~ /java:container(?=.*?\\b\\+maven\\b)/",
           "group": "inline"
+        },
+        {
+          "command": "maven.goal.execute.fromProjectManager",
+          "when": "view == javaProjectExplorer && viewItem =~ /java:project(?=.*?\\b\\+maven\\b)(?=.*?\\b\\+uri\\b)/",
+          "group": "maven"
         }
       ]
     },

package.nls.json

@@ -8,7 +8,7 @@
     "contributes.commands.maven.archetype.update": "Update Maven Archetype Catalog",
     "contributes.commands.maven.favorites": "Favorites...",
     "contributes.commands.maven.history": "History...",
-    "contributes.commands.maven.goal.execute": "Execute commands",
+    "contributes.commands.maven.goal.execute": "Execute Commands...",
     "contributes.commands.maven.plugin.execute": "Run",
     "contributes.commands.maven.plugin.debug": "Debug",
     "contributes.commands.maven.view.hierarchical": "Switch to hierarchical view",

package.nls.zh.json

@@ -8,7 +8,7 @@
     "contributes.commands.maven.archetype.update": "更新 Maven 原型目录",
     "contributes.commands.maven.favorites": "收藏夹…",
     "contributes.commands.maven.history": "历史…",
-    "contributes.commands.maven.goal.execute": "执行命令",
+    "contributes.commands.maven.goal.execute": "执行命令...",
     "contributes.commands.maven.plugin.execute": "执行",
     "contributes.commands.maven.plugin.debug": "调试",
     "contributes.commands.maven.view.hierarchical": "切换到分层视图",

src/extension.ts

@@ -77,7 +77,8 @@ async function doActivate(_operationId: string, context: vscode.ExtensionContext
     registerCommand(context, "maven.archetype.update", updateArchetypeCatalogHandler);
     registerCommand(context, "maven.history", mavenHistoryHandler);
     registerCommand(context, "maven.favorites", runFavoriteCommandsHandler);
-    registerCommand(context, "maven.goal.execute", async () => await Utils.executeMavenCommand());
+    registerCommand(context, "maven.goal.execute", Utils.executeMavenCommand);
+    registerCommand(context, "maven.goal.execute.fromProjectManager", Utils.executeMavenCommand);
     registerCommand(context, "maven.plugin.execute", async (pluginGoal: PluginGoal) => await executeInTerminal({ command: pluginGoal.name, pomfile: pluginGoal.plugin.project.pomPath }));
     registerCommand(context, "maven.view.flat", () => Settings.changeToFlatView());
     registerCommand(context, "maven.view.hierarchical", () => Settings.changeToHierarchicalView());

src/utils/Utils.ts

@@ -5,6 +5,7 @@ import * as fse from "fs-extra";
 import * as http from "http";
 import * as https from "https";
 import * as md5 from "md5";
+import * as path from "path";
 import * as url from "url";
 import { commands, Progress, ProgressLocation, RelativePattern, TextDocument, Uri, ViewColumn, window, workspace, WorkspaceFolder } from "vscode";
 import { createUuid, setUserError } from "vscode-extension-telemetry-wrapper";
@@ -232,9 +233,18 @@ export namespace Utils {
         }
     }
 
-    export async function executeMavenCommand(): Promise<void> {
+    export async function executeMavenCommand(node?: any): Promise<void> {
+        // for nodes from Project Manager
+        let selectedProject: MavenProject | undefined;
+        if (node && node.uri) {
+            const pomPath: string = path.join(Uri.parse(node.uri).fsPath, "pom.xml");
+            selectedProject = mavenExplorerProvider.mavenProjectNodes.find(project => project.pomPath.toLowerCase() === pomPath.toLowerCase());
+        }
         // select a project(pomfile)
-        const selectedProject: MavenProject | undefined = await selectProjectIfNecessary();
+        if (!selectedProject) {
+            selectedProject = await selectProjectIfNecessary();
+        }
+
         if (!selectedProject) {
             return;
         }