wip

Author: radurentea

src/extension.ts

@@ -511,6 +511,138 @@ export async function activate(context: vscode.ExtensionContext) {
   });
   context.subscriptions.push(sdkDeleteWatchDisposable);
 
+  const projConfFilePath = vscode.Uri.joinPath(workspaceRoot, "esp_idf_project_configuration.json").fsPath;
+  let previousConfigVersions = [];
+
+  const multiConfigWatcher = vscode.workspace.createFileSystemWatcher(
+    projConfFilePath,
+    false,
+    false,
+    false
+  );
+
+
+  const previousProjConf = ESP.ProjectConfiguration.store.get<string>(ESP.ProjectConfiguration.SELECTED_CONFIG);
+
+  // Initial read of the file
+  try {
+    const configData = JSON.parse(utils.readFileSync(projConfFilePath));
+    previousConfigVersions = Object.keys(configData);
+    vscode.window.showInformationMessage(`Loaded ${previousConfigVersions.length} versions: ${previousConfigVersions.join(', ')}`);
+  } catch (error) {
+    vscode.window.showErrorMessage(`Error parsing config file: ${error.message}`);
+  }
+  
+  const multiConfigWatchDisposable = multiConfigWatcher.onDidChange(
+    async () => {
+      try {
+        const configData = JSON.parse(utils.readFileSync(projConfFilePath));
+        const currentVersions = Object.keys(configData);
+  
+        // Find added versions
+        const addedVersions = currentVersions.filter(v => !previousConfigVersions.includes(v));
+        // Find removed versions
+        const removedVersions = previousConfigVersions.filter(v => !currentVersions.includes(v));
+        
+        if (addedVersions.length > 0) {
+          vscode.window.showInformationMessage(`New versions added: ${addedVersions.join(', ')}`);
+        }
+        if (removedVersions.length > 0) {
+          vscode.window.showInformationMessage(`Versions removed: ${removedVersions.join(', ')}`);
+        }
+        
+        // Update previous versions for next comparison
+        previousConfigVersions = currentVersions;
+  
+        // Get the current selected configuration
+        const currentSelectedConfig = ESP.ProjectConfiguration.store.get<string>(ESP.ProjectConfiguration.SELECTED_CONFIG);
+        
+        // Important: Update the configuration object in the store if the selected config still exists
+        if (currentSelectedConfig && currentVersions.includes(currentSelectedConfig)) {
+          // Update the configuration data in the store
+          ESP.ProjectConfiguration.store.set(
+            currentSelectedConfig,
+            configData[currentSelectedConfig]
+          );
+          
+          // Refresh UI and related settings
+          if (statusBarItems["projectConf"]) {
+            statusBarItems["projectConf"].dispose();
+          }
+          statusBarItems["projectConf"] = createStatusBarItem(
+            `$(${
+              commandDictionary[CommandKeys.SelectProjectConfiguration].iconId
+            }) ${currentSelectedConfig}`,
+            commandDictionary[CommandKeys.SelectProjectConfiguration].tooltip,
+            CommandKeys.SelectProjectConfiguration,
+            99,
+            commandDictionary[CommandKeys.SelectProjectConfiguration].checkboxState
+          );
+          await getIdfTargetFromSdkconfig(workspaceRoot, statusBarItems["target"]);
+          await utils.setCCppPropertiesJsonCompileCommands(workspaceRoot);
+          ConfserverProcess.dispose();
+        } else if (!currentVersions.includes(currentSelectedConfig)) {
+          // Handle the case where the selected config no longer exists
+          let statusBarItemName = "Invalid Configuration";
+          let statusBarItemTooltip =
+            "Invalid configuration path. Click to modify project configuration";
+          statusBarItems["projectConf"] = createStatusBarItem(
+            `$(${
+              commandDictionary[CommandKeys.SelectProjectConfiguration].iconId
+            }) ${statusBarItemName}`,
+            statusBarItemTooltip,
+            "espIdf.projectConfigurationEditor",
+            99,
+            commandDictionary[CommandKeys.SelectProjectConfiguration].checkboxState
+          );
+        }
+      } catch (error) {
+        vscode.window.showErrorMessage(`Error parsing config file: ${error.message}`);
+      }
+    }
+  );
+  const multiConfigDeleteWatchDisposable = multiConfigWatcher.onDidDelete(
+    () => {
+      ESP.ProjectConfiguration.store.set(
+        ESP.ProjectConfiguration.SELECTED_CONFIG,
+        previousProjConf
+      );
+      if (statusBarItems["projectConf"]) {
+        statusBarItems["projectConf"].dispose();
+      }
+      statusBarItems["projectConf"] = createStatusBarItem(
+        `$(${
+          commandDictionary[CommandKeys.SelectProjectConfiguration].iconId
+        }) ${previousProjConf}`,
+        commandDictionary[CommandKeys.SelectProjectConfiguration].tooltip,
+        CommandKeys.SelectProjectConfiguration,
+        99,
+        commandDictionary[CommandKeys.SelectProjectConfiguration].checkboxState
+      );
+     }
+  )
+  const multiConfigCreateWatchDisposable = multiConfigWatcher.onDidCreate(
+    () => {
+      ESP.ProjectConfiguration.store.set(
+        ESP.ProjectConfiguration.SELECTED_CONFIG,
+        previousProjConf
+      );
+      if (statusBarItems["projectConf"]) {
+        statusBarItems["projectConf"].dispose();
+      }
+      statusBarItems["projectConf"] = createStatusBarItem(
+        `$(${
+          commandDictionary[CommandKeys.SelectProjectConfiguration].iconId
+        }) ${previousProjConf}`,
+        commandDictionary[CommandKeys.SelectProjectConfiguration].tooltip,
+        CommandKeys.SelectProjectConfiguration,
+        99,
+        commandDictionary[CommandKeys.SelectProjectConfiguration].checkboxState
+      );
+     }
+  )
+  context.subscriptions.push(multiConfigWatchDisposable, multiConfigDeleteWatchDisposable, multiConfigCreateWatchDisposable);
+ 
   vscode.window.onDidCloseTerminal(async (terminal: vscode.Terminal) => {});
 
   registerIDFCommand("espIdf.createFiles", async () => {

src/project-conf/index.ts

@@ -80,11 +80,11 @@ export async function getProjectConfigurationElements(workspaceFolder: Uri) {
           compileArgs: buildConfig?.compileArgs,
           ninjaArgs: buildConfig?.ninjaArgs,
           buildDirectoryPath: buildDirPath,
-          sdkconfigDefaults: (await resolveConfigPaths(
+          sdkconfigDefaults: (resolveConfigPaths(
             workspaceFolder,
             buildConfig?.sdkconfigDefaults
           )) as string[],
-          sdkconfigFilePath: (await resolveConfigPaths(
+          sdkconfigFilePath: (resolveConfigPaths(
             workspaceFolder,
             buildConfig?.sdkconfigFilePath
           )) as string,