Merge branch 'main' into dev/garretts/implement-lldb-dap

Author: sean-mcmanus

Extension/c_cpp_properties.schema.json

@@ -59,13 +59,15 @@
                             "c++17",
                             "c++20",
                             "c++23",
+                            "c++26",
                             "gnu++98",
                             "gnu++03",
                             "gnu++11",
                             "gnu++14",
                             "gnu++17",
                             "gnu++20",
                             "gnu++23",
+                            "gnu++26",
                             "${default}"
                         ]
                     },

Extension/package.json

@@ -822,13 +822,15 @@
                             "c++17",
                             "c++20",
                             "c++23",
+                            "c++26",
                             "gnu++98",
                             "gnu++03",
                             "gnu++11",
                             "gnu++14",
                             "gnu++17",
                             "gnu++20",
-                            "gnu++23"
+                            "gnu++23",
+                            "gnu++26"
                         ],
                         "markdownDescription": "%c_cpp.configuration.default.cppStandard.markdownDescription%",
                         "scope": "resource"
@@ -8053,7 +8055,7 @@
         "shell-quote": "^1.8.1",
         "ssh-config": "^4.4.4",
         "tmp": "^0.2.3",
-        "vscode-cpptools": "^6.2.0",
+        "vscode-cpptools": "^6.3.0",
         "vscode-languageclient": "^8.1.0",
         "vscode-nls": "^5.2.0",
         "vscode-tas-client": "^0.1.84",
@@ -8063,4 +8065,4 @@
         "postcss": "^8.4.31",
         "gulp-typescript/**/glob-parent": "^5.1.2"
     }
-}
+}

Extension/src/LanguageServer/lmTool.ts

@@ -38,6 +38,7 @@ const knownValues: { [Property in keyof ChatContextResult]?: { [id: string]: str
         'c++17': 'C++17',
         'c++20': 'C++20',
         'c++23': 'C++23',
+        'c++26': 'C++26',
         'c89': "C89",
         'c99': "C99",
         'c11': "C11",

Extension/ui/settings.html

@@ -600,13 +600,15 @@
         <div class="section-text" data-loc-id="cpp.standard.description">The version of the C++ language standard to use for IntelliSense. Note: GNU standards are only used to query the set compiler to get GNU defines, and IntelliSense will emulate the equivalent C++ standard version.</div>
         <div>
             <select name="inputValue" id="cppStandard" class="select-default">
+                <option value="c++26">c++26</option>
                 <option value="c++23">c++23</option>
                 <option value="c++20">c++20</option>
                 <option value="c++17">c++17</option>
                 <option value="c++14">c++14</option>
                 <option value="c++11">c++11</option>
                 <option value="c++03">c++03</option>
                 <option value="c++98">c++98</option>
+                <option value="gnu++26">gnu++26</option>
                 <option value="gnu++23">gnu++23</option>
                 <option value="gnu++20">gnu++20</option>
                 <option value="gnu++17">gnu++17</option>

Extension/yarn.lock

@@ -5079,10 +5079,10 @@ vinyl@^3.0.0:
     replace-ext "^2.0.0"
     teex "^1.0.1"
 
-vscode-cpptools@^6.2.0:
-  version "6.2.0"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/vscode-cpptools/-/vscode-cpptools-6.2.0.tgz#f5ce714fea83b00a9d01e880110ec53fbdbe4664"
-  integrity sha1-9c5xT+qDsAqdAeiAEQ7FP72+RmQ=
+vscode-cpptools@^6.3.0:
+  version "6.3.0"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/vscode-cpptools/-/vscode-cpptools-6.3.0.tgz#671243ac977d9a6b4ffdcf0e4090075af60c6051"
+  integrity sha1-ZxJDrJd9mmtP/c8OQJAHWvYMYFE=
 
 [email protected]:
   version "8.1.0"