Switch to the native PIO Core project config parser

Author: ivankravets

package.json

@@ -891,7 +891,7 @@
   },
   "dependencies": {
     "fs-plus": "~3.1.1",
-    "platformio-node-helpers": "~9.9.3",
+    "platformio-node-helpers": "~10.0.0",
     "platformio-vscode-debug": "~1.4.1"
   },
   "devDependencies": {

src/home.js

@@ -184,7 +184,7 @@ export default class PIOHome {
 
   onOpenProjectCommand(params) {
     if (extension.ProjectManager) {
-      updateProjectItemState(vscode.Uri.file(params).fsPath, 'activeEnv', undefined);
+      updateProjectItemState(vscode.Uri.file(params).fsPath, 'selectedEnv', undefined);
       extension.ProjectManager.switchToProject(vscode.Uri.file(params).fsPath);
     }
     this.disposePanel();

src/project/manager.js

@@ -102,8 +102,9 @@ export default class ProjectManager {
       vscode.commands.registerCommand('platformio-ide._runProjectTask', (task) =>
         this._taskManager.runTask(task)
       ),
-      vscode.commands.registerCommand('platformio-ide.activeEnvironment', () =>
-        this._pool.getActiveObserver().getActiveEnvName()
+      vscode.commands.registerCommand(
+        'platformio-ide.activeEnvironment',
+        async () => await this._pool.getActiveObserver().revealActiveEnvironment()
       ),
     ];
     this.internalSubscriptions = [];
@@ -156,8 +157,8 @@ export default class ProjectManager {
     }
     projectHelpers.updateProjectItemState(
       observer.projectDir,
-      'activeEnv',
-      observer.getActiveEnvName()
+      'selectedEnv',
+      observer.getSelectedEnv()
     );
   }
 
@@ -169,28 +170,28 @@ export default class ProjectManager {
     this._sbEnvSwitcher.text = '$(root-folder) Loading...';
 
     let currentProjectDir = undefined;
-    let currentEnvName = undefined;
+    let currentEnv = undefined;
     if (this._pool.getActiveObserver()) {
       currentProjectDir = this._pool.getActiveObserver().projectDir;
-      currentEnvName = this._pool.getActiveObserver().getActiveEnvName();
+      currentEnv = this._pool.getActiveObserver().getSelectedEnv();
     }
     const observer = this._pool.getObserver(projectDir);
-    if ('envName' in options) {
-      await observer.switchProjectEnv(options.envName);
-    } else if (!observer.getActiveEnvName()) {
+    if ('env' in options) {
+      await observer.switchProjectEnv(options.env);
+    } else if (!observer.getSelectedEnv()) {
       await observer.switchProjectEnv(
-        projectHelpers.getProjectItemState(projectDir, 'activeEnv')
+        projectHelpers.getProjectItemState(projectDir, 'selectedEnv')
       );
     }
 
     // ignore active project and & env
     if (
       !currentProjectDir ||
       currentProjectDir !== projectDir ||
-      currentEnvName !== observer.getActiveEnvName()
+      currentEnv !== observer.getSelectedEnv()
     ) {
       disposeSubscriptions(this.internalSubscriptions);
-      this._pool.switch(projectDir);
+      await this._pool.switch(projectDir);
       this._taskManager = new ProjectTaskManager(projectDir, observer);
       this.internalSubscriptions.push(
         this._taskManager,
@@ -238,10 +239,10 @@ export default class ProjectManager {
     if (!observer) {
       return;
     }
-    const envName = observer.getActiveEnvName()
-      ? `env:${observer.getActiveEnvName()}`
+    const env = observer.getSelectedEnv()
+      ? `env:${observer.getSelectedEnv()}`
       : 'Default';
-    this._sbEnvSwitcher.text = `$(root-folder) ${envName} (${path.basename(
+    this._sbEnvSwitcher.text = `$(root-folder) ${env} (${path.basename(
       observer.projectDir
     )})`;
   }
@@ -250,7 +251,7 @@ export default class ProjectManager {
     const items = [];
     for (const projectDir of projectHelpers.getPIOProjectDirs()) {
       const observer = this._pool.getObserver(projectDir);
-      const envs = await observer.getProjectEnvs();
+      const envs = (await observer.getConfig()).envs();
       if (!envs || !envs.length) {
         continue;
       }
@@ -263,10 +264,10 @@ export default class ProjectManager {
         description: `$(folder) ${shortProjectDir} ("default_envs" from "platformio.ini")`,
       });
       items.push(
-        ...envs.map((item) => ({
+        ...envs.map((env) => ({
           projectDir,
-          envName: item.name,
-          label: `env:${item.name}`,
+          env,
+          label: `env:${env}`,
           description: `$(folder) ${shortProjectDir}`,
         }))
       );
@@ -277,6 +278,6 @@ export default class ProjectManager {
     if (!pickedItem) {
       return;
     }
-    this.switchToProject(pickedItem.projectDir, { envName: pickedItem.envName });
+    this.switchToProject(pickedItem.projectDir, { env: pickedItem.env });
   }
 }

src/project/task-tree.js

@@ -11,11 +11,11 @@ import * as vscode from 'vscode';
 export default class ProjectTasksTreeProvider {
   static DEFAULT_ENV_NAME = 'Default';
 
-  constructor(id, envs, tasks, activeEnvName) {
+  constructor(id, envs, tasks, selectedEnv = undefined) {
     this.id = id;
     this.envs = envs;
     this.tasks = tasks;
-    this.activeEnvName = activeEnvName;
+    this.selectedEnv = selectedEnv;
     this.multiEnvProject = this.envs.length > 1;
   }
 
@@ -49,15 +49,15 @@ export default class ProjectTasksTreeProvider {
 
   getRootChildren() {
     const result = [];
-    for (const envName of [undefined, ...this.envs.map((item) => item.name)]) {
+    for (const env of [undefined, ...this.envs]) {
       const treeItem = new vscode.TreeItem(
-        envName || ProjectTasksTreeProvider.DEFAULT_ENV_NAME,
-        envName && (envName === this.activeEnvName || !this.multiEnvProject)
+        env || ProjectTasksTreeProvider.DEFAULT_ENV_NAME,
+        env && (env === this.selectedEnv || !this.multiEnvProject)
           ? vscode.TreeItemCollapsibleState.Expanded
           : vscode.TreeItemCollapsibleState.Collapsed
       );
-      treeItem.id = `${this.id}-${envName}`;
-      treeItem.env = envName;
+      treeItem.id = `${this.id}-${env}`;
+      treeItem.env = env;
       treeItem.iconPath = new vscode.ThemeIcon('root-folder');
       result.push(treeItem);
     }

src/project/tasks.js

@@ -56,20 +56,18 @@ export default class ProjectTaskManager {
       this._sid = Math.random();
     }
 
-    const projectEnvs = await this.projectObserver.getProjectEnvs();
+    const projectEnvs = (await this.projectObserver.getConfig()).envs();
     const projectTasks = [...(await this.projectObserver.getDefaultTasks())];
-    for (const item of projectEnvs) {
-      projectTasks.push(
-        ...((await this.projectObserver.getLoadedEnvTasks(item.name)) || [])
-      );
+    for (const env of projectEnvs) {
+      projectTasks.push(...((await this.projectObserver.getLoadedEnvTasks(env)) || []));
     }
 
     const taskViewer = vscode.window.createTreeView(ProjectTaskManager.TASKS_VIEW_ID, {
       treeDataProvider: new ProjectTasksTreeProvider(
         this._sid,
         projectEnvs,
         projectTasks,
-        this.projectObserver.getActiveEnvName()
+        this.projectObserver.getSelectedEnv()
       ),
       showCollapseAll: true,
     });
@@ -239,7 +237,7 @@ export default class ProjectTaskManager {
     const _runTask = (name) => {
       const candidates = tasks.filter(
         (task) =>
-          task.name === name && task.coreEnv === this.projectObserver.getActiveEnvName()
+          task.name === name && task.coreEnv === this.projectObserver.getSelectedEnv()
       );
       this.runTask(candidates[0]);
     };