Merge pull request #399 from IBM/fix/360-runAction-buildCurrent-wrong…

…Path Fix/360 run action build current wrong path
IBM · Mar 19, 2024 · bb748d5 · bb748d5
2 parents 2ea96cf + e63e4d0
commit bb748d5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/testing/suites/iProject.ts b/src/testing/suites/iProject.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 /*
  * (c) Copyright IBM Corp. 2023
  */

diff --git a/src/views/projectExplorer/index.ts b/src/views/projectExplorer/index.ts
@@ -996,17 +996,25 @@ export default class ProjectExplorer implements TreeDataProvider<ProjectExplorer
       }),
       commands.registerCommand(`vscode-ibmi-projectexplorer.runAction`, async (element: Project | ObjectFile | MemberFile) => {
         if (element) {
+          let chosenUri = element.resourceUri;
+
+          // if project, get the uri of the active editor file if appropriate
           if (element instanceof Project) {
             await ProjectManager.setActiveProject(element.workspaceFolder);
 
-            await commands.executeCommand(`code-for-ibmi.runAction`, {
-              resourceUri: element.workspaceFolder.uri
-            });
+            const activeProject = ProjectManager.getActiveProject();
+            chosenUri = activeProject?.workspaceFolder.uri;
+            let activeEditor = window.activeTextEditor;
+
+            if (activeEditor) {
+              const editorProject = ProjectManager.getProjectFromUri(activeEditor.document.uri);
+              if (activeProject?.workspaceFolder.uri === editorProject?.workspaceFolder.uri) {
+                chosenUri = activeEditor.document.uri;
+              }
+            }
           }
 
-          await commands.executeCommand(`code-for-ibmi.runAction`, {
-            resourceUri: element.resourceUri
-          });
+          await commands.executeCommand(`code-for-ibmi.runAction`, chosenUri);
 
           this.refresh();
         }