Merge branch 'main' into reqs_uutstub_flag

Author: Den1552

CHANGELOG.md

@@ -2,12 +2,18 @@
 
 All notable changes to the "vectorcastTestExplorer" extension will be documented in this file.
 
-## [1.0.27] - 2025-12-17
+## [1.0.28] - 2026-01-27
+
+### Added
+- Added possibility to open up multiple workdpace folders
+- Added Button to open up a Source File under Test from the Testing Pane
+
+## [1.0.27] - 2025-12-15
 
 ### Bug fixes
 - The LLM compatibility mode is now correctly applied to pre-run model usability checks too
 
-## [1.0.26] - 2025-12-15
+## [1.0.26] - 2025-12-17
 
 ### Added
 - Improved Reqs2x progress tracking to be more precise

package.json

@@ -2,7 +2,7 @@
   "name": "vectorcasttestexplorer",
   "displayName": "VectorCAST Test Explorer",
   "description": "VectorCAST Test Explorer for VS Code",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -224,6 +224,11 @@
         "category": "VectorCAST Test Explorer",
         "title": "Remove Coded Tests"
       },
+      {
+        "command": "vectorcastTestExplorer.openSourceFileFromTestpaneCommand",
+        "category": "VectorCAST Test Explorer",
+        "title": "Open Source File under Test"
+      },
       {
         "command": "vectorcastTestExplorer.insertBasisPathTests",
         "category": "VectorCAST Test Explorer",
@@ -769,6 +774,10 @@
           "command": "vectorcastTestExplorer.removeCodedTests",
           "when": "never"
         },
+        {
+          "command": "vectorcastTestExplorer.openSourceFileFromTestpaneCommand",
+          "when": "never"
+        },
         {
           "command": "vectorcastTestExplorer.insertBasisPathTests",
           "when": "never"
@@ -1072,6 +1081,11 @@
         "group": "vcast.testScript",
         "when": "testId =~ /^vcast:.*$/ && testId =~ /.*coded_tests_driver$/ && testId in vectorcastTestExplorer.vcastHasCodedTestsList"
       },
+      {
+        "command": "vectorcastTestExplorer.openSourceFileFromTestpaneCommand",
+        "group": "vcast.enviroManagement",
+        "when": "testId =~ /^vcast:.*$/ && !(testId =~ /^.*<<COMPOUND>>.*$/) && !(testId =~ /^.*<<INIT>>.*$/) && !(testId =~ /.*coded_tests_driver.*/) && testId not in vectorcastTestExplorer.vcastUnbuiltEnviroList && testId not in vectorcastTestExplorer.vcastEnviroList"
+      },
       {
         "command": "vectorcastTestExplorer.insertBasisPathTests",
         "group": "vcast.testGeneration",

python/vTestInterface.py

@@ -804,8 +804,6 @@ def processCommandLogic(mode, clicast, pathToUse, testString="", options=""):
             except Exception as err:
                 errors.append(f"{vce_path}: {str(err)}")
 
-        topLevel["testData"] = enviro_list[0]["testData"] if enviro_list else []
-        topLevel["unitData"] = enviro_list[0]["unitData"] if enviro_list else []
         topLevel["enviro"] = enviro_list
         if errors:
             topLevel["errors"] = errors

src/extension.ts

@@ -155,6 +155,7 @@ import {
   addIncludePath,
   envIsEmbeddedInProject,
   getEnviroNameFromFile,
+  getEnvironmentData,
   getLevelFromNodeId,
   getVcmRoot,
   openProjectFromEnviroPath,
@@ -1235,6 +1236,78 @@ function configureExtension(context: vscode.ExtensionContext) {
   );
   context.subscriptions.push(getMCDCReportCommand);
 
+  // Command: vectorcastTestExplorer.openSourceFileFromTestpaneCommand
+  let openSourceFileFromTestpaneCommand = vscode.commands.registerCommand(
+    "vectorcastTestExplorer.openSourceFileFromTestpaneCommand",
+    async (args: any) => {
+      if (args) {
+        const testNode: testNodeType = getTestNode(args.id);
+        if (testNode) {
+          const enviroPath = testNode.enviroPath;
+          const unitName = testNode.unitName;
+          const functionName = testNode.functionName;
+          const envData = await getEnvironmentData(enviroPath);
+
+          if (envData.unitData) {
+            for (const unitInfo of envData.unitData) {
+              // Extract unit name from path to match against unitName
+              const pathBasename = path.basename(
+                unitInfo.path,
+                path.extname(unitInfo.path)
+              );
+
+              if (pathBasename === unitName) {
+                const sourcePath = unitInfo.path;
+                const uri = vscode.Uri.file(sourcePath);
+
+                // Determine the line number to open at (0 = top default)
+                let lineNumber = 0;
+
+                // If functionName is defined, try to find it in the function list
+                if (functionName && unitInfo.functionList) {
+                  for (const func of unitInfo.functionList) {
+                    if (
+                      func.name === functionName &&
+                      func.startLine !== undefined
+                    ) {
+                      lineNumber = func.startLine;
+                      break;
+                    }
+                  }
+                }
+
+                // Open the document at the specified line
+                const document = await vscode.workspace.openTextDocument(uri);
+                const position = new vscode.Position(
+                  Math.max(0, lineNumber - 1),
+                  0
+                );
+                const selection = new vscode.Range(position, position);
+
+                await vscode.window.showTextDocument(document, {
+                  preview: false, // open as a real tab
+                  preserveFocus: false,
+                  selection: selection,
+                });
+
+                break;
+              }
+            }
+          } else {
+            vscode.window.showErrorMessage(
+              `Could not find environment data for: ${enviroPath}`
+            );
+          }
+        } else {
+          vscode.window.showErrorMessage(
+            `Unable to open Source File for Node: ${args.id}`
+          );
+        }
+      }
+    }
+  );
+  context.subscriptions.push(openSourceFileFromTestpaneCommand);
+
   let showRequirementsCommand = vscode.commands.registerCommand(
     "vectorcastTestExplorer.showRequirements",
     async (args: any) => {

src/testPane.ts

@@ -47,16 +47,17 @@ import {
   addLaunchConfiguration,
   cleanTestResultsPaneMessage,
   forceLowerCaseDriveLetter,
-  getWorkspaceRootPath,
+  getWorkspaceRootPaths,
   loadLaunchFile,
+  mergeWorkspaceEnvResponses,
   normalizePath,
   openFileWithLineSelected,
 } from "./utilities";
 
 import {
   deleteSingleTest,
   getCBTNamesFromFile,
-  getDataForEnvironment,
+  getDataForEnvironmentFromAPI,
   getDataForProject,
   getWorkspaceEnvDataVPython,
   loadTestScriptIntoEnvironment,
@@ -133,16 +134,14 @@ type UnitData = {
   functionList: FunctionUnitData[];
 };
 
-type EnviroData = {
+export type EnviroData = {
   vcePath: string;
   testData: FileTestData[];
   unitData: UnitData[];
   mockingSupport: boolean;
 };
 
-type CachedWorkspaceData = {
-  testData: FileTestData[];
-  unitData: UnitData[];
+export type CachedWorkspaceData = {
   enviro: EnviroData[];
   errors?: string[];
 };
@@ -704,7 +703,7 @@ let vcastHasCodedTestsList: string[] = [];
 
 // Global cache for workspace-wide env data
 // Used to avoid redundant API calls during refresh
-let cachedWorkspaceEnvData: CachedWorkspaceData | null = null;
+export let cachedWorkspaceEnvData: CachedWorkspaceData | null = null;
 
 export function clearCachedWorkspaceEnvData(): void {
   cachedWorkspaceEnvData = null;
@@ -754,11 +753,11 @@ async function loadEnviroData(
       }
     } else {
       // Fallback in case the cache is not build, but it should be
-      return await getDataForEnvironment(buildPathDir);
+      return await getDataForEnvironmentFromAPI(buildPathDir);
     }
   } else {
     // Individual environment fetch (e.g. adding new test scripts, coded tests, ...)
-    return await getDataForEnvironment(buildPathDir);
+    return await getDataForEnvironmentFromAPI(buildPathDir);
   }
   // We have a valid build directory, but we couldn't find a matching VCE file in the workspace data.
   vectorMessage(
@@ -768,13 +767,19 @@ async function loadEnviroData(
 }
 
 async function buildEnvDataCacheForCurrentDir() {
-  const workspaceDir = getWorkspaceRootPath();
-  if (workspaceDir) {
-    cachedWorkspaceEnvData = await getWorkspaceEnvDataVPython(workspaceDir);
-  } else {
-    // This should not be possible as we have env data, but just in case
+  const folderPaths = getWorkspaceRootPaths();
+  if (!folderPaths.length) {
     vectorMessage("No workspace root found, cannot refresh environment data.");
+    return;
   }
+
+  // Query each root in parallel
+  const responses = await Promise.all(
+    folderPaths.map((p) => getWorkspaceEnvDataVPython(p))
+  );
+
+  // Merge them
+  cachedWorkspaceEnvData = await mergeWorkspaceEnvResponses(responses);
 }
 
 /**
@@ -945,6 +950,7 @@ async function loadAllVCTests(
   vcastUnbuiltEnviroList = [];
   clearEnviroDataCache();
   clearTestNodeCache();
+  clearCachedWorkspaceEnvData();
 
   // Resets the "used" and empty/unused compilers / testsuites
   clearGlobalCompilersAndTestsuites();
@@ -1010,7 +1016,6 @@ async function loadAllVCTests(
   // end if workspace folders
 
   checkWorkspaceEnvDataForErrors();
-  clearCachedWorkspaceEnvData();
 
   // In case we have empty testsuites or compilers in the project,
   // we won't find them in the Env data so we have to add them manually here

src/utilities.ts

@@ -9,6 +9,7 @@ import { errorLevel, vectorMessage } from "./messagePane";
 import { getGlobalCoverageData } from "./vcastTestInterface";
 import { rebuildEnvironment } from "./vcastAdapter";
 import { rebuildEnvironmentCallback } from "./callbacks";
+import { CachedWorkspaceData, EnviroData } from "./testPane";
 import { executeWithRealTimeEchoWithProgress } from "./vcastCommandRunner";
 import { getVectorCastInstallationLocation } from "./vcastInstallation";
 
@@ -413,12 +414,34 @@ export async function updateCoverageAndRebuildEnv() {
 /**
  * Returns the root of the opened workspace.
  */
-export function getWorkspaceRootPath(): string | undefined {
+export function getWorkspaceRootPaths(): string[] {
   const folders = vscode.workspace.workspaceFolders;
-  if (folders && folders.length > 0) {
-    return folders[0].uri.fsPath;
+  if (!folders || folders.length === 0) return [];
+  return folders.map((f) => f.uri.fsPath);
+}
+
+/**
+ * Merges multiple workspace responses into a single CachedWorkspaceData object.
+ */
+export async function mergeWorkspaceEnvResponses(
+  responses: CachedWorkspaceData[]
+): Promise<CachedWorkspaceData> {
+  const allErrors: string[] = [];
+  const allEnvs: EnviroData[] = [];
+
+  for (const resp of responses) {
+    if (resp.errors) {
+      allErrors.push(...resp.errors);
+    }
+    if (resp.enviro) {
+      allEnvs.push(...resp.enviro);
+    }
   }
-  return undefined;
+
+  return {
+    enviro: allEnvs,
+    errors: allErrors.length ? allErrors : undefined,
+  };
 }
 
 export async function getFullEnvReport(

src/vcastAdapter.ts

@@ -636,7 +636,9 @@ function getProjectDataFromPython(projectDirectoryPath: string): any {
 
 // Get Environment Data ---------------------------------------------------------------
 // Server logic is in a separate function below
-export async function getDataForEnvironment(enviroPath: string): Promise<any> {
+export async function getDataForEnvironmentFromAPI(
+  enviroPath: string
+): Promise<any> {
   // what we get back is a JSON formatted string (if the command works)
   // that has two sub-fields: testData, and unitData
   vectorMessage("Processing environment data for: " + enviroPath);
@@ -708,7 +710,7 @@ export async function getWorkspaceEnvDataVPython(
   );
   let jsonData = getJsonDataFromTestInterface(commandToRun, workspaceDir);
 
-  vectorMessage("Building environments data for workspace...");
+  vectorMessage(`Building environments data for workspace: ${workspaceDir}`);
 
   return jsonData;
 }

src/vcastUtilities.ts

@@ -24,6 +24,7 @@ import {
 
 import {
   dumpTestScriptFile,
+  getDataForEnvironmentFromAPI,
   openProjectInVcast,
   runATGCommands,
   runBasisPathCommands,
@@ -43,6 +44,7 @@ import {
 
 import { clientRequestType, vcastCommandType } from "../src-common/vcastServer";
 import {
+  cachedWorkspaceEnvData,
   globalController,
   globalProjectDataCache,
   globalProjectMap,
@@ -838,3 +840,29 @@ export function getLevelFromNodeId(path: string) {
 
   return { projectName, level };
 }
+
+/**
+ * Retrieves Environment Data from the Cache or by asking the API if the cache
+ * is empty
+ * @param enviroPath Path of Environment
+ */
+export async function getEnvironmentData(enviroPath: string) {
+  // Add .vce extension to enviroPath for cache key
+  const cacheKey = enviroPath.endsWith(".vce")
+    ? enviroPath
+    : `${enviroPath}.vce`;
+
+  // Try to get data from cache first
+  let envData = null;
+  if (cachedWorkspaceEnvData) {
+    envData =
+      cachedWorkspaceEnvData[cacheKey as keyof typeof cachedWorkspaceEnvData];
+  }
+
+  // If not in cache, fetch it
+  if (!envData) {
+    envData = await getDataForEnvironmentFromAPI(enviroPath);
+  }
+
+  return envData;
+}