From 9ddf73baa65e197f3e5c05c33eb3e1fe82121791 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 29 Jul 2022 17:18:21 +0300
Subject: [PATCH] Fixed an issue when escaping macros/defines for IDE
 integration // Resolve #4360

---
 HISTORY.rst                                | 1 +
 platformio/builder/tools/piointegration.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index be4ff36a14..1ac233e5de 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -17,6 +17,7 @@ PlatformIO Core 6
 ~~~~~~~~~~~~~~~~~~
 
 * Improved project dependency resolving when using the `pio project init --ide <https://docs.platformio.org/en/latest/core/userguide/project/cmd_init.html>`__ command
+* Fixed an issue when escaping macros/defines for IDE integration (`issue #4360 <https://github.com/platformio/platformio-core/issues/4360>`_)
 
 6.1.3 (2022-07-18)
 ~~~~~~~~~~~~~~~~~~
diff --git a/platformio/builder/tools/piointegration.py b/platformio/builder/tools/piointegration.py
index 900738c660..99b76f0bec 100644
--- a/platformio/builder/tools/piointegration.py
+++ b/platformio/builder/tools/piointegration.py
@@ -94,7 +94,7 @@ def dump_defines(env):
     for item in SCons.Defaults.processDefines(env.get("CPPDEFINES", [])):
         item = item.strip()
         if item:
-            defines.append(env.subst(item).replace("\\", ""))
+            defines.append(env.subst(item).replace('\\"', '"'))
 
     # special symbol for Atmel AVR MCU
     if env["PIOPLATFORM"] == "atmelavr":