Merge branch 'release/v2.2.1'

Author: ivankravets

.gitignore

@@ -2,5 +2,6 @@
 /dist
 *.vsix
 yarn.lock
+package-lock.json
 *.dict
 .vscode/settings.json

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 2.2.1 (2020-11-12)
+
+- Fixed a regression bug when a debug breakpoint was not allowed for Assembly files
+
 ## 2.2.0 (2020-11-03)
 
 - Refactored "Project Tasks" view

package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformio-ide",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "publisher": "platformio",
   "engines": {
     "vscode": "^1.44.0"
@@ -248,6 +248,14 @@
     ],
     "debuggers": [
       {
+        "enableBreakpointsFor": {
+          "languageIds": [
+            "c",
+            "cpp",
+            "platformio-debug.asm",
+            "platformio-debug.disassembly"
+          ]
+        },
         "configurationAttributes": {
           "launch": {
             "properties": {
@@ -582,16 +590,16 @@
     "@types/node": "~12",
     "@types/vscode": "~1.44.0",
     "babel-eslint": "~10.1.0",
-    "babel-loader": "~8.1.0",
+    "babel-loader": "~8.2.1",
     "babel-plugin-transform-class-properties": "~6.24.1",
     "babel-preset-env": "~1.7.0",
-    "eslint": "~7.12.1",
+    "eslint": "~7.13.0",
     "eslint-import-resolver-webpack": "~0.13.0",
     "eslint-plugin-import": "~2.22.1",
     "prettier": "~2.1.2",
     "vsce": "~1.81.1",
-    "webpack": "~5.3.2",
-    "webpack-cli": "~4.1.0"
+    "webpack": "~5.4.0",
+    "webpack-cli": "~4.2.0"
   },
   "dependencies": {
     "fs-plus": "~3.1.1",

src/main.js

@@ -256,16 +256,16 @@ class PlatformIOVSCodeExtension {
         vscode.commands.executeCommand('workbench.action.debug.start');
       }),
       vscode.commands.registerCommand('platformio-ide.updateGlobalLibs', () =>
-        this.pioTerm.sendText('platformio lib --global update')
+        this.pioTerm.sendText('pio lib --global update')
       ),
       vscode.commands.registerCommand('platformio-ide.updatePlatforms', () =>
-        this.pioTerm.sendText('platformio platform update')
+        this.pioTerm.sendText('pio platform update')
       ),
       vscode.commands.registerCommand('platformio-ide.updateCore', () =>
-        this.pioTerm.sendText('platformio update')
+        this.pioTerm.sendText('pio update')
       ),
       vscode.commands.registerCommand('platformio-ide.upgradeCore', () =>
-        this.pioTerm.sendText('platformio upgrade')
+        this.pioTerm.sendText('pio upgrade')
       )
     );
   }

src/tasks/project.js

@@ -163,14 +163,10 @@ export default class ProjectTaskManager {
       vscode.workspace.getWorkspaceFolder(vscode.Uri.file(this.projectDir)),
       projectTask.title,
       ProjectTaskManager.type,
-      new vscode.ProcessExecution(
-        IS_WINDOWS ? 'platformio.exe' : 'platformio',
-        projectTask.args,
-        {
-          cwd: this.projectDir,
-          env: envClone,
-        }
-      ),
+      new vscode.ProcessExecution(IS_WINDOWS ? 'pio.exe' : 'pio', projectTask.args, {
+        cwd: this.projectDir,
+        env: envClone,
+      }),
       '$platformio'
     );
     vscodeTask.presentationOptions = {