Cleanup standard args handling (#4482)

* Update for c++26 args.

* Fix some checks.

* Fix == to ===

* Update to 7.0.2.

* Update to 7.0.3.

* Fix lint.

* Fix lint (2nd try).

* Remove changes.

* Revert unnecessary changes.

* Fix version numbers.

* Fix.

* Update vscode-cpptools version.

* Remove c2y and switch 2023 to 2024.

* Remove c++23preview references.

Author: sean-mcmanus

package.json

@@ -3869,7 +3869,7 @@
     "rimraf": "^3.0.2",
     "string.prototype.matchall": "^4.0.10",
     "tmp": "^0.2.1",
-    "vscode-cpptools": "^6.1.0",
+    "vscode-cpptools": "^7.1.1",
     "@vscode/extension-telemetry": "^0.9.6",
     "vscode-nls": "^5.0.0",
     "vscode-tas-client": "^0.1.45",

src/cpptools.ts

@@ -22,7 +22,7 @@ const localize: nls.LocalizeFunc = nls.loadMessageBundle();
 const log = createLogger('cpptools');
 
 type Architecture = 'x86' | 'x64' | 'arm' | 'arm64' | undefined;
-type StandardVersion = "c89" | "c99" | "c11" | "c17" | "c++98" | "c++03" | "c++11" | "c++14" | "c++17" | "c++20" | "c++23" | "gnu89" | "gnu99" | "gnu11" | "gnu17" | "gnu++98" | "gnu++03" | "gnu++11" | "gnu++14" | "gnu++17" | "gnu++20" | "gnu++23" | undefined;
+type StandardVersion = "c89" | "c99" | "c11" | "c17" | "c++98" | "c++03" | "c++11" | "c++14" | "c++17" | "c++20" | "gnu89" | "gnu99" | "gnu11" | "gnu17" | "gnu++98" | "gnu++03" | "gnu++11" | "gnu++14" | "gnu++17" | "gnu++20" | undefined;
 type IntelliSenseMode = "linux-clang-x86" | "linux-clang-x64" | "linux-clang-arm" | "linux-clang-arm64" | "linux-gcc-x86" | "linux-gcc-x64" | "linux-gcc-arm" | "linux-gcc-arm64" | "macos-clang-x86" | "macos-clang-x64" | "macos-clang-arm" | "macos-clang-arm64" | "macos-gcc-x86" | "macos-gcc-x64" | "macos-gcc-arm" | "macos-gcc-arm64" | "windows-clang-x86" | "windows-clang-x64" | "windows-clang-arm" | "windows-clang-arm64" | "windows-gcc-x86" | "windows-gcc-x64" | "windows-gcc-arm" | "windows-gcc-arm64" | "windows-msvc-x86" | "windows-msvc-x64" | "windows-msvc-arm" | "windows-msvc-arm64" | "msvc-x86" | "msvc-x64" | "msvc-arm" | "msvc-arm64" | "gcc-x86" | "gcc-x64" | "gcc-arm" | "gcc-arm64" | "clang-x86" | "clang-x64" | "clang-arm" | "clang-arm64" | undefined;
 
 export interface DiagnosticsCpptools {
@@ -64,15 +64,11 @@ interface TargetDefaults {
     defines?: string[];
 }
 
-function parseCppStandard(std: string, canUseGnu: boolean, canUseCxx23: boolean): StandardVersion {
+function parseCppStandard(std: string, canUseGnu: boolean): StandardVersion {
     const isGnu = canUseGnu && std.startsWith('gnu');
-    if (std.endsWith('++23') || std.endsWith('++2b') || std.endsWith('++latest')) {
-        if (canUseCxx23) {
-            return isGnu ? 'gnu++23' : 'c++23';
-        } else {
-            return isGnu ? 'gnu++20' : 'c++20';
-        }
-    } else if (std.endsWith('++20') || std.endsWith('++2a')) {
+    if (std === 'c++latest' || std.endsWith('++26') || std.endsWith('++2c') ||
+        std.endsWith('++23') || std.endsWith('++2b') ||
+        std.endsWith('++20') || std.endsWith('++2a')) {
         return isGnu ? 'gnu++20' : 'c++20';
     } else if (std.endsWith('++17') || std.endsWith('++1z')) {
         return isGnu ? 'gnu++17' : 'c++17';
@@ -98,7 +94,7 @@ function parseCStandard(std: string, canUseGnu: boolean): StandardVersion {
         return isGnu ? 'gnu99' : 'c99';
     } else if (/(c|gnu)(11|1x|iso9899:2011)/.test(std)) {
         return isGnu ? 'gnu11' : 'c11';
-    } else if (/(c|gnu)(17|18|2x|iso9899:(2017|2018))/.test(std)) {
+    } else if (/(c|gnu)(17|18|23|2x|iso9899:(2017|2018|2024))/.test(std)) {
         if (canUseGnu) {
             // cpptools supports 'c17' in same version it supports GNU std.
             return isGnu ? 'gnu17' : 'c17';
@@ -155,7 +151,6 @@ function parseTargetArch(target: string): Architecture {
 export function parseCompileFlags(cptVersion: cpptools.Version, args: string[], lang?: string): CompileFlagInformation {
     const requireStandardTarget = (cptVersion < cpptools.Version.v5);
     const canUseGnuStd = (cptVersion >= cpptools.Version.v4);
-    const canUseCxx23 = (cptVersion >= cpptools.Version.v6);
     // No need to parse language standard for CppTools API v6 and above
     const extractStdFlag = (cptVersion < cpptools.Version.v6);
     const iter = args[Symbol.iterator]();
@@ -206,7 +201,7 @@ export function parseCompileFlags(cptVersion: cpptools.Version, args: string[],
         } else if (extractStdFlag && (value.startsWith('-std=') || lower.startsWith('-std:') || lower.startsWith('/std:'))) {
             const std = value.substring(5);
             if (lang === 'CXX' || lang === 'OBJCXX' || lang === 'CUDA') {
-                const s = parseCppStandard(std, canUseGnuStd, canUseCxx23);
+                const s = parseCppStandard(std, canUseGnuStd);
                 if (!s) {
                     log.warning(localize('unknown.control.gflag.cpp', 'Unknown C++ standard control flag: {0}', value));
                 } else {
@@ -220,7 +215,7 @@ export function parseCompileFlags(cptVersion: cpptools.Version, args: string[],
                     standard = s;
                 }
             } else if (lang === undefined) {
-                let s = parseCppStandard(std, canUseGnuStd, canUseCxx23);
+                let s = parseCppStandard(std, canUseGnuStd);
                 if (!s) {
                     s = parseCStandard(std, canUseGnuStd);
                 }

test/unit-tests/cpptools.test.ts

@@ -35,6 +35,8 @@ suite('CppTools tests', () => {
         expect(info.standard).to.eql('gnu++14');
         info = parseCompileFlags(cpptoolsVersion5, []);
         expect(info.standard).to.eql(undefined);
+        info = parseCompileFlags(cpptoolsVersion5, ['/std:c++latest']);
+        expect(info.standard).to.eql('c++20');
 
         // Verify CppTools API version 4
         info = parseCompileFlags(cpptoolsVersion4, ['-DFOO=BAR']);

yarn.lock

@@ -7582,10 +7582,10 @@ vscode-cmake-tools@^1.2.0:
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/vscode-cmake-tools/-/vscode-cmake-tools-1.2.0.tgz"
   integrity sha512-79K8i0l+AfPV28XPoCFCL1BgTVRTPrKZ7YY2KCPOJyy18G/CiriXVa1Gic7A2a16xOoIcsbZRRXoNO0BZTGp9w==
 
-vscode-cpptools@^6.1.0:
-  version "6.1.0"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/vscode-cpptools/-/vscode-cpptools-6.1.0.tgz"
-  integrity sha512-+40xMmzSlvaMwWEDIjhHl9+W1RH9xaEbiFAAgLWgyL1FXxQWBguWRHgS91qBJbuFAB9H4UBuK94iFMs+7BFclA==
+vscode-cpptools@^7.1.1:
+  version "7.1.1"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/vscode-cpptools/-/vscode-cpptools-7.1.1.tgz#adde3b6d627ddae5397224daa3e41952b219126b"
+  integrity sha1-rd47bWJ92uU5ciTao+QZUrIZEms=
 
 vscode-nls-dev@^3.3.2:
   version "3.3.2"