Merge branch 'release/v2.3.0'

Author: ivankravets

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Release Notes
 
+## 2.3.0 (2021-??-??)
+
+**Requires PlatformIO Core 5.1 or above**
+
+* Project management:
+  - Show active project in the status bar (issue [#2276](https://github.com/platformio/platformio-vscode-ide/issues/2276))
+  - Automatically switch to the latest project on restart (issue [#2365](https://github.com/platformio/platformio-vscode-ide/issues/2365))
+  - Automatically restore the latest project environment (issue [#2344](https://github.com/platformio/platformio-vscode-ide/issues/2344))
+* Allowed passing custom base URL of the Python Package Index using new `customPyPiIndexUrl` setting
+* Open ["platformio.ini" configuration file](https://docs.platformio.org/page/projectconf/index.html) from newly added project (if there are no other active editors) (issue [#2263](https://github.com/platformio/platformio-vscode-ide/issues/2263))
+* Updated PlatformIO Core installer to v1.0.0 ([release notes](https://github.com/platformio/platformio-core-installer/releases/tag/v1.0.0))
+* Added protection for infinite IntelliSense index rebuilding (issue [#2363](https://github.com/platformio/platformio-vscode-ide/issues/2363))
+* Added "OpenAPI (Swagger) Editor" extension to the conflicted list (issue [#2324](https://github.com/platformio/platformio-vscode-ide/issues/2324))
+* Fixed issues when the "Upload and Monitor" command didn't terminate the running task and didn't reopen a monitor with delay (issue [#2266](https://github.com/platformio/platformio-vscode-ide/issues/2266), issue [#2319](https://github.com/platformio/platformio-vscode-ide/issues/2319))
+* Fixed an issue with broken IntelliSense index rebuilding or tasks loading for big projects (issue [#2321](https://github.com/platformio/platformio-vscode-ide/issues/2321))
+* Fixed an issue when a debug breakpoint was not allowed for Assembly files
+
 ## 2.2.1 (2020-11-12)
 
 - Fixed a regression bug when a debug breakpoint was not allowed for Assembly files

package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformio-ide",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "publisher": "platformio",
   "engines": {
     "vscode": "^1.44.0"
@@ -90,6 +90,12 @@
       }
     ],
     "commands": [
+      {
+        "command": "platformio-ide.privateRunTask",
+        "title": "Custom task runner (private)",
+        "category": "PlatformIO",
+        "enablement": "false"
+      },
       {
         "command": "platformio-ide.showHome",
         "title": "Home",
@@ -117,11 +123,6 @@
         "title": "Upload",
         "category": "PlatformIO"
       },
-      {
-        "command": "platformio-ide.remote",
-        "title": "Remote",
-        "category": "PlatformIO"
-      },
       {
         "command": "platformio-ide.clean",
         "title": "Clean",
@@ -132,6 +133,11 @@
         "title": "Test",
         "category": "PlatformIO"
       },
+      {
+        "command": "platformio-ide.remoteUpload",
+        "title": "Remote Upload",
+        "category": "PlatformIO"
+      },
       {
         "command": "platformio-ide.serialMonitor",
         "title": "Serial Monitor",
@@ -246,16 +252,22 @@
         "title": "Set Force Disassembly"
       }
     ],
+    "breakpoints": [
+      {
+        "language": "c"
+      },
+      {
+        "language": "cpp"
+      },
+      {
+        "language": "platformio-debug.asm"
+      },
+      {
+        "language": "platformio-debug.disassembly"
+      }
+    ],
     "debuggers": [
       {
-        "enableBreakpointsFor": {
-          "languageIds": [
-            "c",
-            "cpp",
-            "platformio-debug.asm",
-            "platformio-debug.disassembly"
-          ]
-        },
         "configurationAttributes": {
           "launch": {
             "properties": {
@@ -575,6 +587,14 @@
         "platformio-ide.pioHomeServerHttpPort": {
           "type": "integer",
           "description": "PIO Home server HTTP port (the default value 0 automatically assigns a free port in the range [8010..8100])"
+        },
+        "platformio-ide.customPyPiIndexUrl": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": null,
+          "description": "Custom base URL of the Python Package Index (default `https://pypi.org/simple`)"
         }
       }
     }
@@ -586,24 +606,24 @@
     "vscode:package": "webpack --mode production && vsce package"
   },
   "devDependencies": {
-    "@babel/core": "~7.12.3",
+    "@babel/core": "~7.13.8",
     "@types/node": "~12",
     "@types/vscode": "~1.44.0",
     "babel-eslint": "~10.1.0",
-    "babel-loader": "~8.2.1",
+    "babel-loader": "~8.2.2",
     "babel-plugin-transform-class-properties": "~6.24.1",
     "babel-preset-env": "~1.7.0",
-    "eslint": "~7.13.0",
+    "eslint": "~7.21.0",
     "eslint-import-resolver-webpack": "~0.13.0",
     "eslint-plugin-import": "~2.22.1",
-    "prettier": "~2.1.2",
-    "vsce": "~1.81.1",
-    "webpack": "~5.4.0",
-    "webpack-cli": "~4.2.0"
+    "prettier": "~2.2.1",
+    "vsce": "~1.85.1",
+    "webpack": "~5.24.2",
+    "webpack-cli": "~4.5.0"
   },
   "dependencies": {
     "fs-plus": "~3.1.1",
-    "platformio-node-helpers": "~8.1.1",
+    "platformio-node-helpers": "~9.1.1",
     "platformio-vscode-debug": "~1.3.0"
   },
   "extensionDependencies": [

src/constants.js

@@ -9,9 +9,10 @@
 export const IS_WINDOWS = process.platform.startsWith('win');
 export const IS_OSX = process.platform == 'darwin';
 export const IS_LINUX = !IS_WINDOWS && !IS_OSX;
-export const PIO_CORE_VERSION_SPEC = '>=5';
+export const PIO_CORE_VERSION_SPEC = '>=5.1';
 export const STATUS_BAR_PRIORITY_START = 10;
 export const CONFLICTED_EXTENSION_IDS = [
   'llvm-vs-code-extensions.vscode-clangd',
   'vsciot-vscode.vscode-arduino',
+  'vscode-openapi',
 ];

src/home.js

@@ -93,7 +93,7 @@ export default class PIOHome {
 
   async getWebviewContent(startUrl) {
     this._lastStartUrl = startUrl;
-    const params = await pioNodeHelpers.home.ensureServerStarted({
+    await pioNodeHelpers.home.ensureServerStarted({
       port: extension.getSetting('pioHomeServerHttpPort'),
       onIDECommand: async (command, params) => {
         if (command === 'open_project') {
@@ -147,7 +147,7 @@ export default class PIOHome {
       <body style="margin: 0; padding: 0; height: 100%; overflow: hidden; background-color: ${
         theme === 'light' ? '#FFF' : '#1E1E1E'
       }">
-        <iframe src="${pioNodeHelpers.home.getFrontendUri(params.host, params.port, {
+        <iframe src="${pioNodeHelpers.home.getFrontendUrl({
           start: startUrl,
           theme,
           workspace: extension.getEnterpriseSetting('defaultPIOHomeWorkspace'),

src/main.js

@@ -14,11 +14,10 @@ import * as utils from './utils';
 import InstallationManager from './installer/manager';
 import PIOHome from './home';
 import PIOTerminal from './terminal';
-import ProjectManager from './project';
+import ProjectObservable from './project/observable';
 import QuickAccessTreeProvider from './views/quick-access-tree';
 import { STATUS_BAR_PRIORITY_START } from './constants';
 import StateStorage from './state-storage';
-import TaskManager from './tasks/manager';
 import fs from 'fs-plus';
 import vscode from 'vscode';
 
@@ -35,13 +34,12 @@ class PlatformIOVSCodeExtension {
   async activate(context) {
     this.context = context;
     this.stateStorage = new StateStorage(context.globalState);
-    this.projectManager = new ProjectManager();
     this.pioHome = new PIOHome();
     this.pioTerm = new PIOTerminal();
 
-    this.subscriptions.push(this.projectManager, this.pioHome, this.pioTerm);
+    this.subscriptions.push(this.pioHome, this.pioTerm);
 
-    const hasPIOProject = !!this.projectManager.getActivePIOProjectDir();
+    const hasPIOProject = ProjectObservable.getPIOProjectDirs().length > 0;
     if (!hasPIOProject && this.getSetting('activateOnlyOnPlatformIOProject')) {
       return;
     }
@@ -82,14 +80,11 @@ class PlatformIOVSCodeExtension {
 
     vscode.commands.executeCommand('setContext', 'pioProjectReady', true);
 
-    this.subscriptions.push(new TaskManager());
     this.initDebug();
     this.initToolbar({
       ignoreCommands: this.getEnterpriseSetting('ignoreToolbarCommands'),
     });
-    this.projectManager.initIndexer({
-      autoRebuild: this.getSetting('autoRebuildAutocompleteIndex'),
-    });
+    this.subscriptions.push(new ProjectObservable());
 
     this.startPIOHome();
 
@@ -142,6 +137,9 @@ class PlatformIOVSCodeExtension {
     if (http_proxy && !process.env.HTTPS_PROXY && !process.env.https_proxy) {
       extraVars['HTTPS_PROXY'] = http_proxy;
     }
+    if (this.getSetting('customPyPiIndexUrl')) {
+      extraVars['PIP_INDEX_URL'] = this.getSetting('customPyPiIndexUrl');
+    }
     pioNodeHelpers.proc.patchOSEnviron({
       caller: 'vscode',
       extraPath: this.getSetting('customPATH'),