fix #910: run plugin goals with prefix in full command (#911)

microsoft · Nov 30, 2022 · d62011e · d62011e
1 parent 55faed6
commit d62011e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/explorer/model/PluginGoal.ts b/src/explorer/model/PluginGoal.ts
@@ -20,4 +20,13 @@ export class PluginGoal implements ITreeItem {
     public getTreeItem(): vscode.TreeItem {
         return new vscode.TreeItem(this.name, vscode.TreeItemCollapsibleState.None);
     }
+
+    public get command() : string {
+        if (this.name.includes(":")) {
+            // workaround for compatibility in case the name already contains prefix
+            return this.name;
+        }
+        return `${this.plugin.prefix}:${this.name}`;
+    }
+
 }
diff --git a/src/explorer/pluginInfoProvider.ts b/src/explorer/pluginInfoProvider.ts
@@ -132,7 +132,8 @@ class PluginInfoProvider {
             const goalRegExp: RegExp = new RegExp(`^${prefix}:(.*)`, "gm");
             const goalsMatch: string[] | null = textOutput.match(goalRegExp);
             if (goalsMatch !== null) {
-                goals.push(...goalsMatch);
+                // prefix:goal matched, remove "prefix:" part
+                goals.push(...goalsMatch.map(fullGoal => fullGoal.slice(prefix!.length + 1)));
             }
         }
 

diff --git a/src/extension.ts b/src/extension.ts
@@ -99,7 +99,7 @@ async function doActivate(_operationId: string, context: vscode.ExtensionContext
     registerCommandRequiringTrust(context, "maven.goal.execute.fromProjectManager", Utils.executeMavenCommand);
     registerCommandRequiringTrust(context, "maven.goal.execute.fromLifecycleMenu", Utils.executeMavenCommand);
     registerCommandRequiringTrust(context, "maven.goal.execute.fromFavoritesMenu", Utils.executeMavenCommand);
-    registerCommandRequiringTrust(context, "maven.plugin.execute", async (pluginGoal: PluginGoal) => await executeInTerminal({ command: pluginGoal.name, pomfile: pluginGoal.plugin.project.pomPath }));
+    registerCommandRequiringTrust(context, "maven.plugin.execute", async (pluginGoal: PluginGoal) => await executeInTerminal({ command: pluginGoal.command, pomfile: pluginGoal.plugin.project.pomPath }));
     registerCommand(context, "maven.view.flat", () => Settings.changeToFlatView());
     registerCommand(context, "maven.view.hierarchical", () => Settings.changeToHierarchicalView());