Merge pull request #14107 from microsoft/main

sean-mcmanus · web-flow · commit fcaadd8ef5de · 2025-12-12T16:50:30.000-08:00
Merge for 1.30.0 (pre-release)
diff --git a/.github/actions/package-lock.json b/.github/actions/package-lock.json
diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
diff --git a/Extension/i18n/chs/src/nativeStrings.i18n.json b/Extension/i18n/chs/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "正在终止根位置的标记分析",
 	"unable_to_retrieve_to_reset_timestamps": "无法检索数据库记录以重置时间戳: 错误 = {0}",
 	"failed_to_reset_timestamps_for": "未能为 {0} 重置时间戳: 错误 = {1}",
-	"no_suitable_complier": "未找到合适的编译器。请在 c_cpp_properties.json 中设置 \"compilerPath\"。",
+	"no_suitable_compiler": "未找到合适的编译器。请在 c_cpp_properties.json 中设置 \"compilerPath\"。",
 	"compiler_include_not_found": "未找到编译器包含路径: {0}",
 	"intellisense_not_responding": "IntelliSense 引擎未响应。改为使用标记分析器。",
 	"tag_parser_will_be_used": "标记分析器将用于以下项中的 IntelliSense 操作: {0}",
diff --git a/Extension/i18n/cht/src/nativeStrings.i18n.json b/Extension/i18n/cht/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "正在中止根目錄處的標籤剖析",
 	"unable_to_retrieve_to_reset_timestamps": "無法取得 DB 記錄以重設時間戳記: 錯誤 = {0}",
 	"failed_to_reset_timestamps_for": "無法重設 {0} 的時間戳記: 錯誤 = {1}",
-	"no_suitable_complier": "找不到任何適合的編譯器。請設定 c_cpp_properties.json 中的 \"compilerPath\"。",
+	"no_suitable_compiler": "找不到任何適合的編譯器。請設定 c_cpp_properties.json 中的 \"compilerPath\"。",
 	"compiler_include_not_found": "找不到編譯器包含路徑: {0}",
 	"intellisense_not_responding": "IntelliSense 引擎未回應。改為使用標籤剖析器。",
 	"tag_parser_will_be_used": "標籤剖析器將用於 {0} 中的 IntelliSense 作業",
diff --git a/Extension/i18n/csy/src/nativeStrings.i18n.json b/Extension/i18n/csy/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "Parsování značek v kořenu se přerušuje.",
 	"unable_to_retrieve_to_reset_timestamps": "Nepovedlo se načíst záznamy databáze pro resetování časových razítek: chyba = {0}",
 	"failed_to_reset_timestamps_for": "Nepovedlo se resetovat časové razítko pro {0}: chyba = {1}",
-	"no_suitable_complier": "Nenašel se žádný vhodný kompilátor. Nastavte prosím compilerPath v souboru c_cpp_properties.json.",
+	"no_suitable_compiler": "Nenašel se žádný vhodný kompilátor. Nastavte prosím compilerPath v souboru c_cpp_properties.json.",
 	"compiler_include_not_found": "Nenašla se cesta kompilátoru pro vložené soubory: {0}",
 	"intellisense_not_responding": "Modul IntelliSense neodpovídá. Používá se místo něj analyzátor značek.",
 	"tag_parser_will_be_used": "Analyzátor značek se bude používat pro operace IntelliSense v: {0}",
diff --git a/Extension/i18n/deu/src/nativeStrings.i18n.json b/Extension/i18n/deu/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "Die Taganalyse wird am Stamm abgebrochen.",
 	"unable_to_retrieve_to_reset_timestamps": "Datenbankdatensätze können nicht abgerufen werden, um Zeitstempel zurückzusetzen: Fehler = {0}",
 	"failed_to_reset_timestamps_for": "Fehler beim Zurücksetzen des Zeitstempels für \"{0}\": Fehler = {1}",
-	"no_suitable_complier": "Es wurde kein geeigneter Compiler gefunden. Legen Sie \"compilerPath\" in \"c_cpp_properties.json\" fest.",
+	"no_suitable_compiler": "Es wurde kein geeigneter Compiler gefunden. Legen Sie \"compilerPath\" in \"c_cpp_properties.json\" fest.",
 	"compiler_include_not_found": "Compilerincludepfad nicht gefunden: {0}",
 	"intellisense_not_responding": "Die IntelliSense-Engine reagiert nicht. Stattdessen wird der Tagparser verwendet.",
 	"tag_parser_will_be_used": "Der Tagparser wird für IntelliSense-Vorgänge in \"{0}\" verwendet.",
diff --git a/Extension/i18n/esn/src/nativeStrings.i18n.json b/Extension/i18n/esn/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "Anulando el análisis de etiquetas en el directorio raíz",
 	"unable_to_retrieve_to_reset_timestamps": "No se pueden recuperar los registros de la base de datos para restablecer las marcas de tiempo. Error = {0}",
 	"failed_to_reset_timestamps_for": "No se pudo restablecer la marca de tiempo de {0}. Error = {1}",
-	"no_suitable_complier": "No se encontró ningún compilador adecuado. Establezca \"compilerPath\" en c_cpp_properties.json.",
+	"no_suitable_compiler": "No se encontró ningún compilador adecuado. Establezca \"compilerPath\" en c_cpp_properties.json.",
 	"compiler_include_not_found": "No se encontró la ruta de acceso de inclusión del compilador: {0}",
 	"intellisense_not_responding": "El motor de IntelliSense no responde. Se usará el analizador de etiquetas en su lugar.",
 	"tag_parser_will_be_used": "Se usará el analizador de etiquetas para las operaciones de IntelliSense en {0}",
diff --git a/Extension/i18n/fra/src/nativeStrings.i18n.json b/Extension/i18n/fra/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "Annulation de l'analyse des balises à la racine",
 	"unable_to_retrieve_to_reset_timestamps": "Impossible de récupérer les enregistrements de base de données pour réinitialiser les horodatages : erreur = {0}",
 	"failed_to_reset_timestamps_for": "La réinitialisation de l'horodatage a échoué pour {0} : erreur = {1}",
-	"no_suitable_complier": "Aucun compilateur approprié. Définissez \"compilerPath\" dans c_cpp_properties.json.",
+	"no_suitable_compiler": "Aucun compilateur approprié. Définissez \"compilerPath\" dans c_cpp_properties.json.",
 	"compiler_include_not_found": "Le chemin d'inclusion du compilateur est introuvable : {0}",
 	"intellisense_not_responding": "Le moteur IntelliSense ne répond pas. Utilisation de l'analyseur de balises à la place.",
 	"tag_parser_will_be_used": "L'analyseur de balises est utilisé pour les opérations IntelliSense dans {0}",
diff --git a/Extension/i18n/ita/src/nativeStrings.i18n.json b/Extension/i18n/ita/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "Interruzione dell'analisi dei tag in corrispondenza della radice",
 	"unable_to_retrieve_to_reset_timestamps": "Non è possibile recuperare i record del database per reimpostare i timestamp. Errore = {0}",
 	"failed_to_reset_timestamps_for": "Non è stato possibile reimpostare il timestamp per {0}. Errore = {1}",
-	"no_suitable_complier": "Non sono stati trovati compilatore appropriati. Impostare \"compilerPath\" in c_cpp_properties.json.",
+	"no_suitable_compiler": "Non sono stati trovati compilatore appropriati. Impostare \"compilerPath\" in c_cpp_properties.json.",
 	"compiler_include_not_found": "Il percorso di inclusione del compilatore non è stato trovato: {0}",
 	"intellisense_not_responding": "Il motore IntelliSense non risponde. Verrà usato il parser di tag.",
 	"tag_parser_will_be_used": "Il parser di tag verrà usato per le operazioni IntelliSense in: {0}",
diff --git a/Extension/i18n/jpn/src/nativeStrings.i18n.json b/Extension/i18n/jpn/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "ルートでのタグ解析を中止しています",
 	"unable_to_retrieve_to_reset_timestamps": "タイムスタンプをリセットするための DB レコードを取得できません。エラー = {0}",
 	"failed_to_reset_timestamps_for": "{0} のタイムスタンプをリセットできませんでした: エラー = {1}",
-	"no_suitable_complier": "適切なコンパイラが見つかりませんでした。c_cpp_properties.json の \"compilerPath\" を設定してください。",
+	"no_suitable_compiler": "適切なコンパイラが見つかりませんでした。c_cpp_properties.json の \"compilerPath\" を設定してください。",
 	"compiler_include_not_found": "コンパイラのインクルード パスが見つかりませんでした: {0}",
 	"intellisense_not_responding": "IntelliSense エンジンが応答していません。代わりにタグ パーサーを使用します。",
 	"tag_parser_will_be_used": "タグ パーサーは {0} で IntelliSense 操作に使用されます",
diff --git a/Extension/i18n/kor/src/nativeStrings.i18n.json b/Extension/i18n/kor/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "루트에서 태그 구문 분석을 중단합니다.",
 	"unable_to_retrieve_to_reset_timestamps": "타임스탬프를 다시 설정할 DB 레코드를 검색할 수 없습니다. 오류 = {0}",
 	"failed_to_reset_timestamps_for": "{0} 에 대한 타임스탬프를 다시 설정하지 못했습니다. 오류 = {1}",
-	"no_suitable_complier": "적합한 컴파일러를 찾을 수 없습니다. c_cpp_properties.json에서 \"compilerPath\"를 설정하세요.",
+	"no_suitable_compiler": "적합한 컴파일러를 찾을 수 없습니다. c_cpp_properties.json에서 \"compilerPath\"를 설정하세요.",
 	"compiler_include_not_found": "컴파일러 포함 경로를 찾을 수 없음: {0}",
 	"intellisense_not_responding": "IntelliSense 엔진이 응답하지 않습니다. 태그 파서를 대신 사용합니다.",
 	"tag_parser_will_be_used": "태그 파서가 다음의 IntelliSense 작업에서 사용됨: {0}",
diff --git a/Extension/i18n/plk/src/nativeStrings.i18n.json b/Extension/i18n/plk/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "Przerywanie analizowania tagów w elemencie głównym",
 	"unable_to_retrieve_to_reset_timestamps": "Nie można pobrać rekordów bazy danych w celu zresetowania znaczników czasu: błąd = {0}",
 	"failed_to_reset_timestamps_for": "Nie można zresetować znacznika czasu dla elementu {0}: błąd = {1}",
-	"no_suitable_complier": "Nie znaleziono odpowiedniego kompilatora. Ustaw element „compilerPath” w pliku c_cpp_properties.json.",
+	"no_suitable_compiler": "Nie znaleziono odpowiedniego kompilatora. Ustaw element „compilerPath” w pliku c_cpp_properties.json.",
 	"compiler_include_not_found": "Nie znaleziono ścieżki dołączania kompilatora: {0}",
 	"intellisense_not_responding": "Aparat funkcji IntelliSense nie odpowiada. W zamian użyj analizatora tagów.",
 	"tag_parser_will_be_used": "Analizator tagów będzie używany na potrzeby operacji funkcji IntelliSense w: {0}",
diff --git a/Extension/i18n/ptb/src/nativeStrings.i18n.json b/Extension/i18n/ptb/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "Anulando análise de marca na raiz",
 	"unable_to_retrieve_to_reset_timestamps": "Não é possível recuperar os registros do BD para redefinir os carimbos de data/hora: erro = {0}",
 	"failed_to_reset_timestamps_for": "Falha ao redefinir o carimbo de data/hora para {0}: erro = {1}",
-	"no_suitable_complier": "Nenhum compilador adequado encontrado. Defina \"compilerPath\" em c_cpp_properties.json.",
+	"no_suitable_compiler": "Nenhum compilador adequado encontrado. Defina \"compilerPath\" em c_cpp_properties.json.",
 	"compiler_include_not_found": "O compilador inclui o caminho não encontrado: {0}",
 	"intellisense_not_responding": "O mecanismo IntelliSense não está respondendo. Usando o Analisador de Marca em seu lugar.",
 	"tag_parser_will_be_used": "O Analisador de Marca será usado para operações do IntelliSense em: {0}",
diff --git a/Extension/i18n/rus/src/nativeStrings.i18n.json b/Extension/i18n/rus/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "Прерывание анализа тегов в корне",
 	"unable_to_retrieve_to_reset_timestamps": "Не удалось получить записи базы данных для сброса меток времени: ошибка — {0}",
 	"failed_to_reset_timestamps_for": "Не удалось сбросить метку времени для {0}: ошибка — {1}",
-	"no_suitable_complier": "Подходящий компилятор не найден. Укажите \"compilerPath\" в c_cpp_properties.json.",
+	"no_suitable_compiler": "Подходящий компилятор не найден. Укажите \"compilerPath\" в c_cpp_properties.json.",
 	"compiler_include_not_found": "Путь включения компилятора не найден: {0}",
 	"intellisense_not_responding": "Подсистема IntelliSense не отвечает. Используйте вместо этого анализатор тегов.",
 	"tag_parser_will_be_used": "Анализатор тегов будет использоваться для операций IntelliSense в: {0}",
diff --git a/Extension/i18n/trk/src/nativeStrings.i18n.json b/Extension/i18n/trk/src/nativeStrings.i18n.json
@@ -46,7 +46,7 @@
 	"aborting_tag_parse_at_root": "Kökte etiket ayrıştırma durduruluyor",
 	"unable_to_retrieve_to_reset_timestamps": "Zaman damgalarını sıfırlamak için veritabanı kayıtları alınamıyor: hata = {0}",
 	"failed_to_reset_timestamps_for": "{0} için zaman damgası sıfırlanamadı: hata = {1}",
-	"no_suitable_complier": "Uygun derleyici bulunamadı. Lütfen c_cpp_properties.json dosyasında \"compilerPath\" öğesini ayarlayın.",
+	"no_suitable_compiler": "Uygun derleyici bulunamadı. Lütfen c_cpp_properties.json dosyasında \"compilerPath\" öğesini ayarlayın.",
 	"compiler_include_not_found": "Derleyici ekleme yolu bulunamadı: {0}",
 	"intellisense_not_responding": "IntelliSense altyapısı yanıt vermiyor. Bunun yerine Etiket Ayrıştırıcısı kullanılıyor.",
 	"tag_parser_will_be_used": "Etiket Ayrıştırıcısı, şurada IntelliSense işlemleri için kullanılacak: {0}",
diff --git a/Extension/package.json b/Extension/package.json
@@ -2,7 +2,7 @@
     "name": "cpptools",
     "displayName": "C/C++",
     "description": "C/C++ IntelliSense, debugging, and code browsing.",
-    "version": "1.29.1-main",
+    "version": "1.30.0-main",
     "publisher": "ms-vscode",
     "icon": "LanguageCCPP_color_128x.png",
     "readme": "README.md",
diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -1003,7 +1003,8 @@ export class DefaultClient implements Client {
             workspaceFolderBasename: this.Name,
             workspaceStorage: this.workspaceStoragePath,
             execPath: process.execPath,
-            pathSeparator: (os.platform() === 'win32') ? "\\" : "/"
+            pathSeparator: (os.platform() === 'win32') ? "\\" : "/",
+            userHome: os.homedir()
         };
     }
 
@@ -1796,7 +1797,7 @@ export class DefaultClient implements Client {
 
         if (Object.keys(changedSettings).length > 0) {
             if (this === defaultClient) {
-                if (changedSettings.commentContinuationPatterns !== undefined) {
+                if (changedSettings.commentContinuationPatterns2 !== undefined) {
                     updateLanguageConfigurations();
                 }
                 if (changedSettings.loggingLevel !== undefined) {
diff --git a/Extension/src/LanguageServer/languageConfig.ts b/Extension/src/LanguageServer/languageConfig.ts
@@ -55,7 +55,8 @@ function getMLSplitAfterPattern(): string {
 
 function getMLPreviousLinePattern(insert: string): string | undefined {
     if (insert.startsWith("/*")) {
-        return `(?=^(\\s*(\\/\\*\\*|\\*)).*)(?=(?!(\\s*\\*\\/)))`;
+        const match: string = escape(insert);
+        return `(?=^(\\s*(${match}|\\*)).*)(?=(?!(\\s*\\*\\/)))`;
     }
     return undefined;
 }
@@ -238,8 +239,9 @@ export function getLanguageConfig(languageId: string): vscode.LanguageConfigurat
 }
 
 export function getLanguageConfigFromPatterns(languageId: string, patterns?: (string | CommentPattern)[]): vscode.LanguageConfiguration {
-    const beginPatterns: string[] = []; // avoid duplicate rules
-    const continuePatterns: string[] = []; // avoid duplicate rules
+    const beginPatterns: string[] = []; // avoid duplicate begin rules
+    const continuePatterns: string[] = []; // avoid duplicate continue rules
+    const endPatterns: string[] = []; // avoid duplicate end rules
     let duplicates: boolean = false;
     let beginRules: vscode.OnEnterRule[] = [];
     let continueRules: vscode.OnEnterRule[] = [];
@@ -258,14 +260,17 @@ export function getLanguageConfigFromPatterns(languageId: string, patterns?: (st
         } else {
             duplicates = true;
         }
-        if (continuePatterns.indexOf(c.continue) < 0) {
+        if (continuePatterns.indexOf(`${c.begin}\0${c.continue}`) < 0) {
             if (r.continue && r.continue.length > 0) {
                 continueRules = continueRules.concat(r.continue);
             }
+            continuePatterns.push(`${c.begin}\0${c.continue}`);
+        }
+        if (endPatterns.indexOf(c.continue) < 0) {
             if (r.end && r.end.length > 0) {
                 endRules = endRules.concat(r.end);
             }
-            continuePatterns.push(c.continue);
+            endPatterns.push(c.continue);
         }
     });
     if (duplicates) {
diff --git a/Extension/src/LanguageServer/settings.ts b/Extension/src/LanguageServer/settings.ts
@@ -386,6 +386,13 @@ export class CppSettings extends Settings {
     public get commentContinuationPatterns(): (string | CommentPattern)[] {
         const value: any = super.Section.get<any>("commentContinuationPatterns");
         if (this.isArrayOfCommentContinuationPatterns(value)) {
+            // Needs to be sorted with longer patterns first so it takes precedence and
+            // doesn't apply the shorter pattern if it's a prefix (e.g. // matching ///).
+            value.sort((a: string | CommentPattern, b: string | CommentPattern) => {
+                const aStr: string = isString(a) ? a : a.begin;
+                const bStr: string = isString(b) ? b : b.begin;
+                return bStr.length - aStr.length;
+            });
             return value;
         }
         const setting = getRawSetting("C_Cpp.commentContinuationPatterns", true);
diff --git a/Extension/src/common.ts b/Extension/src/common.ts
@@ -1551,7 +1551,6 @@ export function hasMsvcEnvironment(): boolean {
         'INCLUDE',
         'LIB',
         'LIBPATH',
-        'NETFXSDKDir',
         'UCRTVersion',
         'UniversalCRTSdkDir',
         'VCIDEInstallDir',
diff --git a/Extension/src/nativeStrings.json b/Extension/src/nativeStrings.json
@@ -44,7 +44,7 @@
     "aborting_tag_parse_at_root": "Aborting tag parse at root",
     "unable_to_retrieve_to_reset_timestamps": "Unable to retrieve DB records to reset timestamps: error = {0}",
     "failed_to_reset_timestamps_for": "Failed to reset timestamp for {0}: error = {1}",
-    "no_suitable_complier": "No suitable compiler found. Please set the \"compilerPath\" in c_cpp_properties.json.",
+    "no_suitable_compiler": "No suitable compiler found. Please set the \"compilerPath\" in c_cpp_properties.json.",
     "compiler_include_not_found": "Compiler include path not found: {0}",
     "intellisense_not_responding": "IntelliSense engine is not responding. Using the Tag Parser instead.",
     "tag_parser_will_be_used": "Tag Parser will be used for IntelliSense operations in: {0}",
@@ -486,4 +486,4 @@
         "text": "The C/C++ extension may be used only with Microsoft Visual Studio, Visual Studio for Mac, Visual Studio Code, Azure DevOps, Team Foundation Server, and successor Microsoft products and services to develop and test your applications.",
         "hint": "{Locked=\"C/C++\"} {Locked=\"Visual Studio\"} {Locked=\"Mac\"} {Locked=\"Visual Studio Code\"} {Locked=\"Azure DevOps\"} {Locked=\"Team Foundation Server\"}"
     }
-}
+}
diff --git a/Extension/test/scenarios/SimpleCppProject/tests/languageServer.integration.test.ts b/Extension/test/scenarios/SimpleCppProject/tests/languageServer.integration.test.ts
@@ -45,6 +45,27 @@ suite("multiline comment setting tests", function(): void {
             action: { indentAction: vscode.IndentAction.None, removeText: 1 }
         }
     ];
+    const multipleMLRules: vscode.OnEnterRule[] = [
+        defaultMLRules[0], // e.g. /** | */
+        defaultMLRules[1], // e.g. /** ...|
+        { // e.g. /*! | */
+            beforeText: /^\s*\/\*\!(?!\/)([^\*]|\*(?!\/))*$/,
+            afterText: /^\s*\*\/$/,
+            action: { indentAction: vscode.IndentAction.IndentOutdent, appendText: ' * ' }
+        },
+        { // e.g. /*! ...|
+            beforeText: /^\s*\/\*\!(?!\/)([^\*]|\*(?!\/))*$/,
+            action: { indentAction: vscode.IndentAction.None, appendText: ' * ' }
+        },
+        defaultMLRules[2], // e.g.  * ...|
+        { // e.g.  * ...|
+            beforeText: /^(\t|[ ])*\ \*(\ ([^\*]|\*(?!\/))*)?$/,
+            previousLineText: /(?=^(\s*(\/\*\!|\*)).*)(?=(?!(\s*\*\/)))/,
+            action: { indentAction: vscode.IndentAction.None, appendText: '* ' }
+        },
+        defaultMLRules[3], // e.g.  */|
+        defaultMLRules[4] // e.g.  *-----*/|
+    ];
     const defaultSLRules: vscode.OnEnterRule[] = [
         {
             beforeText: /^\s*\/\/\/.+$/,
@@ -72,6 +93,11 @@ suite("multiline comment setting tests", function(): void {
         assert.deepStrictEqual(rules, defaultMLRules);
     });
 
+    test("Check the OnEnterRules for C++ with an additional option", () => {
+        const rules = getLanguageConfigFromPatterns('cpp', [ "/**", "/*!" ]).onEnterRules;
+        assert.deepStrictEqual(rules, multipleMLRules);
+    });
+
     test("Make sure duplicate rules are removed", () => {
         const rules = getLanguageConfigFromPatterns('cpp', [ "/**", { begin: "/**", continue: " * " }, "/**" ]).onEnterRules;
         assert.deepStrictEqual(rules, defaultMLRules);
diff --git a/Extension/yarn.lock b/Extension/yarn.lock
