From dfc594fc3927fc3d71d8b86ba477632a38a59191 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 23 Jul 2016 23:11:50 +0300
Subject: [PATCH] Improve Project Generator for PlatformIO IDE (fixes incorrect
 linter errors)

---
 HISTORY.rst                         |  1 +
 platformio/__init__.py              |  2 +-
 platformio/builder/tools/piomisc.py | 18 ++++++++----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index bce24a3a..cb5f44b4 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -12,6 +12,7 @@ PlatformIO 2.0
 * Added support for `Teensy USB Features <http://docs.platformio.org/en/latest/platforms/teensy.html#usb-features>`__
   (HID, SERIAL_HID, DISK, DISK_SDFLASH, MIDI, etc.)
   (`issue #722 <https://github.com/platformio/platformio/issues/722>`_)
+* Improved Project Generator for PlatformIO IDE (fixes incorrect linter errors)
 * Fixed broken LD Script for Element14 chipKIT Pi board
   (`issue #725 <https://github.com/platformio/platformio/issues/725>`_)
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index b906213e..57eaa2bd 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 11, "2.dev0")
+VERSION = (2, 11, "2.dev1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index 29ab41a2..0ca830f3 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -147,17 +147,15 @@ def DumpIDEData(env):
 
     def get_includes(env_):
         includes = []
-        # includes from used framework and libs
-        for item in env_.get("VARIANT_DIRS", []):
-            if "$BUILDSRC_DIR" in item[0]:
-                continue
-            includes.append(env_.subst(item[1]))
-
-        # custom includes
         for item in env_.get("CPPPATH", []):
-            if item.startswith("$BUILD_DIR"):
-                continue
-            includes.append(env_.subst(item))
+            invardir = False
+            for vardiritem in env_.get("VARIANT_DIRS", []):
+                if item == vardiritem[0]:
+                    includes.append(vardiritem[1])
+                    invardir = True
+                    break
+            if not invardir:
+                includes.append(env_.subst(item))
 
         # installed libs
         for d in env_.get("LIBSOURCE_DIRS", []):