Merge branch 'develop' of https://github.com/platformio/platformio-core into develop

# Conflicts: #	HISTORY.rst

Author: ivankravets

HISTORY.rst

@@ -16,6 +16,7 @@ PlatformIO Core 5
 - Fixed an issue with "ImportError: cannot import name '_get_backend' from 'cryptography.hazmat.backends'" when using `Remote Development <https://docs.platformio.org/page/plus/pio-remote.html>`__ on RaspberryPi device (`issue #3652 <https://github.com/platformio/platformio-core/issues/3652>`_)
 - Fixed an issue when `pio package unpublish <https://docs.platformio.org/page/core/userguide/package/cmd_unpublish.html>`__ command crashes (`issue #3660 <https://github.com/platformio/platformio-core/issues/3660>`_)
 - Fixed an issue when the package manager tries to install a built-in library from the registry (`issue #3662 <https://github.com/platformio/platformio-core/issues/3662>`_)
+- Fixed an issue with incorrect value for C++ language standard in IDE projects when an in-progress language standard is used (`issue #3653 <https://github.com/platformio/platformio-core/issues/3653>`_)
 
 5.0.0 (2020-09-03)
 ~~~~~~~~~~~~~~~~~~

platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl

@@ -63,7 +63,7 @@ SET(CMAKE_CXX_COMPILER "{{ _normalize_path(cxx_path) }}")
 SET(CMAKE_CXX_FLAGS "{{ _normalize_path(to_unix_path(cxx_flags)) }}")
 SET(CMAKE_C_FLAGS "{{ _normalize_path(to_unix_path(cc_flags)) }}")
 
-% STD_RE = re.compile(r"\-std=[a-z\+]+(\d+)")
+% STD_RE = re.compile(r"\-std=[a-z\+]+(\w+)")
 % cc_stds = STD_RE.findall(cc_flags)
 % cxx_stds = STD_RE.findall(cxx_flags)
 % if cc_stds:

platformio/ide/tpls/eclipse/.settings/language.settings.xml.tpl

@@ -1,5 +1,5 @@
 % import re
-% STD_RE = re.compile(r"(\-std=[a-z\+]+\d+)")
+% STD_RE = re.compile(r"(\-std=[a-z\+]+\w+)")
 % cxx_stds = STD_RE.findall(cxx_flags)
 % cxx_std = cxx_stds[-1] if cxx_stds else ""
 %

platformio/ide/tpls/emacs/.ccls.tpl

@@ -1,5 +1,5 @@
 % import re
-% STD_RE = re.compile(r"\-std=[a-z\+]+(\d+)")
+% STD_RE = re.compile(r"\-std=[a-z\+]+(\w+)")
 % cc_stds = STD_RE.findall(cc_flags)
 % cxx_stds = STD_RE.findall(cxx_flags)
 %

platformio/ide/tpls/vim/.ccls.tpl

@@ -1,5 +1,5 @@
 % import re
-% STD_RE = re.compile(r"\-std=[a-z\+]+(\d+)")
+% STD_RE = re.compile(r"\-std=[a-z\+]+(\w+)")
 % cc_stds = STD_RE.findall(cc_flags)
 % cxx_stds = STD_RE.findall(cxx_flags)
 %

platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl

@@ -6,6 +6,14 @@
 %
 % systype = platform.system().lower()
 %
+% cpp_standards_remap = {
+% "0x": "11",
+% "1y": "14",
+% "1z": "17",
+% "2a": "20",
+% "2b": "23"
+% }
+%
 % def _escape(text):
 % return to_unix_path(text).replace('"', '\\"')
 % end
@@ -68,7 +76,7 @@
 %
 % cleaned_includes = filter_includes(includes, ["toolchain"])
 %
-% STD_RE = re.compile(r"\-std=[a-z\+]+(\d+)")
+% STD_RE = re.compile(r"\-std=[a-z\+]+(\w+)")
 % cc_stds = STD_RE.findall(cc_flags)
 % cxx_stds = STD_RE.findall(cxx_flags)
 % cc_m_flags = split_args(cc_flags)
@@ -115,7 +123,7 @@
  "cStandard": "c{{ cc_stds[-1] }}",
 % end
 % if cxx_stds:
- "cppStandard": "c++{{ cxx_stds[-1] }}",
+ "cppStandard": "c++{{ cpp_standards_remap.get(cxx_stds[-1], cxx_stds[-1]) }}",
 % end
 % if forced_includes:
  "forcedInclude": [