From 2e66c5f807c751a9178151fb1a53b3982f43c831 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 31 Oct 2020 19:07:04 +0200
Subject: [PATCH] Generate a working "projectEnvName" for PlatformIO IDE's
 debugger for VSCode

---
 HISTORY.rst                                        | 5 +++++
 platformio/ide/tpls/vscode/.vscode/launch.json.tpl | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 41b7ab20..b8bc20cd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -8,6 +8,11 @@ PlatformIO Core 5
 
 **A professional collaborative platform for embedded development**
 
+5.0.3 (2020-??-??)
+~~~~~~~~~~~~~~~~~~
+
+* Generate a working "projectEnvName" for PlatformIO IDE's debugger for VSCode
+
 5.0.2 (2020-10-30)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/ide/tpls/vscode/.vscode/launch.json.tpl b/platformio/ide/tpls/vscode/.vscode/launch.json.tpl
index 21e2bb41..75efb06c 100644
--- a/platformio/ide/tpls/vscode/.vscode/launch.json.tpl
+++ b/platformio/ide/tpls/vscode/.vscode/launch.json.tpl
@@ -19,13 +19,14 @@
             "request": "launch",
             "name": "PIO Debug",
             "executable": "{{ _escape_path(prog_path) }}",
+            "projectEnvName": "{{ env_name }}",
             "toolchainBinDir": "{{ _escape_path(dirname(gdb_path)) }}",
 % if svd_path:
             "svdPath": "{{ _escape_path(svd_path) }}",
 % end
             "preLaunchTask": {
                 "type": "PlatformIO",
-                "task": "Pre-Debug"
+                "task": "Pre-Debug ({{ env_name }})"
             },
             "internalConsoleOptions": "openOnSessionStart"
         },
@@ -34,6 +35,7 @@
             "request": "launch",
             "name": "PIO Debug (skip Pre-Debug)",
             "executable": "{{ _escape_path(prog_path) }}",
+            "projectEnvName": "{{ env_name }}",
             "toolchainBinDir": "{{ _escape_path(dirname(gdb_path)) }}",
 % if svd_path:
             "svdPath": "{{ _escape_path(svd_path) }}",