From 7746f7eeee9e01dd353377698d61533c93049c0d Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 29 Mar 2019 21:26:45 +0200
Subject: [PATCH] Project Generator: fixed a VSCode C/C++'s "Cannot find"
 warning when CPPPATH folder does not exist

---
 HISTORY.rst                                                 | 5 +++++
 .../ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl       | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index f244ded7..a6543f30 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,11 @@ Release Notes
 PlatformIO 3.0
 --------------
 
+3.6.7 (2019-??-??)
+~~~~~~~~~~~~~~~~~~
+
+* Project Generator: fixed a VSCode C/C++'s "Cannot find" warning when CPPPATH folder does not exist
+
 3.6.6 (2019-03-29)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
index 75d77ffd..c91ab548 100644
--- a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
+++ b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
@@ -5,7 +5,7 @@
         },
         {
 % import platform
-% from os.path import commonprefix, dirname
+% from os.path import commonprefix, dirname, isdir
 %
 % systype = platform.system().lower()
 %
@@ -15,7 +15,7 @@
 %
 % cleaned_includes = []
 % for include in includes:
-%   if "toolchain-" not in dirname(commonprefix([include, cc_path])):
+%   if "toolchain-" not in dirname(commonprefix([include, cc_path])) and isdir(include):
 %     cleaned_includes.append(include)
 %   end
 % end
@@ -65,7 +65,7 @@
 % if cxx_stds:
             "cppStandard": "c++{{ cxx_stds[-1] }}",
 % end
-            "compilerPath": "{{! _escape(cc_path) }} {{! _escape(cc_m_flags) }}"
+            "compilerPath": "\"{{! _escape(cc_path) }}\" {{! _escape(cc_m_flags) }}"
         }
     ]
 }
\ No newline at end of file