Skip to content

Commit 49aa6d7

Browse files
authored
Merge pull request #13856 from microsoft/main
Merge for 1.27.1
2 parents 51615a3 + d9af43b commit 49aa6d7

File tree

10 files changed

+23
-13
lines changed

10 files changed

+23
-13
lines changed

Extension/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# C/C++ for Visual Studio Code Changelog
22

3+
## Version 1.27.1: August 19, 2025
4+
### Bug Fixes
5+
* Fix the `__FILE_NAME__` macro being undefined with IntelliSense when using GCC/Clang. [#11164](https://github.com/microsoft/vscode-cpptools/issues/11164)
6+
* Fix Doxygen generation overwriting a function signature. [#13839](https://github.com/microsoft/vscode-cpptools/issues/13839)
7+
* Fix a crash on Windows 7, 8, and 10 (Server 2008, 2012, and 2016). [#13851](https://github.com/microsoft/vscode-cpptools/issues/13851)
8+
* Fix "CMake Tools" translations. [PR #13854](https://github.com/microsoft/vscode-cpptools/pull/13854)
9+
310
## Version 1.27.0: August 7, 2025
411
### Bug Fixes
512
* Fix an IntelliSense crash in `add_cached_tokens_to_string`. [#11900](https://github.com/microsoft/vscode-cpptools/issues/11900)

Extension/i18n/cht/ui/settings.html.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"cpp.standard.description": "用於 IntelliSense 的 C++ 語言標準版本。注意: GNU 標準僅會用於查詢設定編譯器以取得 GNU 定義,而 IntelliSense 將會模擬相同的 C++ 標準版本。",
4545
"advanced.settings": "進階設定",
4646
"configuration.provider": "組態提供者",
47-
"configuration.provider.description": "可為來源檔案提供 IntelliSense 設定資訊 VS Code 延伸模組的識別碼。例如,使用 VS Code 延伸模組識別碼 {0} 從 CMake 工具延伸模組提供組態資訊",
47+
"configuration.provider.description": "可為來源檔案提供 IntelliSense 設定資訊 VS Code 延伸模組的識別碼。例如,使用 VS Code 延伸模組識別碼 {0} 從 CMake Tools 延伸模組提供組態資訊",
4848
"windows.sdk.version": "Windows SDK 版本",
4949
"windows.sdk.version.description": "要在 Windows 上使用的 Windows SDK 包含路徑版本,例如 {0}。",
5050
"mac.framework.path": "Mac 架構路徑",

Extension/i18n/deu/ui/settings.html.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"cpp.standard.description": "Die Version des C++-Sprachstandards, die für IntelliSense verwendet werden soll. Hinweis: GNU-Standards werden nur zum Abfragen des festgelegten Compilers zum Abrufen von GNU-Definitionen verwendet, und IntelliSense emuliert die äquivalente Version des C++-Standards.",
4545
"advanced.settings": "Erweiterte Einstellungen",
4646
"configuration.provider": "Konfigurationsanbieter",
47-
"configuration.provider.description": "Die ID einer VS Code-Erweiterung, die IntelliSense-Konfigurationsinformationen für Quelldateien bereitstellen kann. Verwenden Sie zum Beispiel die VS Code-Erweiterungs-ID \"{0}\", um Konfigurationsinformationen aus der CMake Tools-Erweiterung bereitzustellen.",
47+
"configuration.provider.description": "Die ID einer VS Code-Erweiterung, die IntelliSense-Konfigurationsinformationen für Quelldateien bereitstellen kann. Verwenden Sie zum Beispiel die VS Code-Erweiterungs-ID \"{0}\", um Konfigurationsinformationen aus der Erweiterung CMake Tools bereitzustellen.",
4848
"windows.sdk.version": "Windows SDK-Version",
4949
"windows.sdk.version.description": "Die Version des Windows SDK-Includepfads zur Verwendung unter Windows, z. B. \"{0}\".",
5050
"mac.framework.path": "Pfad für Mac-Framework",

Extension/i18n/esn/ui/settings.html.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"cpp.standard.description": "Versión del estándar del lenguaje C++ que se va a usar para IntelliSense. Nota: Los estándares GNU solo se usan para consultar el compilador de conjuntos a fin de obtener definiciones GNU e IntelliSense emulará la versión del estándar C++ equivalente.",
4545
"advanced.settings": "Configuración avanzada",
4646
"configuration.provider": "Proveedor de configuración",
47-
"configuration.provider.description": "Id. de una extensión de VS Code que puede proporcionar información de configuración de IntelliSense para los archivos de código fuente. Por ejemplo, use el id. de extensión de VS Code {0} para proporcionar información de configuración de la extensión Herramientas de CMake.",
47+
"configuration.provider.description": "Id. de una extensión de VS Code que puede proporcionar información de configuración de IntelliSense para los archivos de código fuente. Por ejemplo, use el id. de extensión de VS Code {0} para proporcionar información de configuración de la extensión CMake Tools.",
4848
"windows.sdk.version": "Versión del SDK de Windows",
4949
"windows.sdk.version.description": "Versión de la ruta de acceso de inclusión del SDK de Windows SDK que debe usarse en Windows; por ejemplo, {0}.",
5050
"mac.framework.path": "Ruta de acceso de la plataforma Mac",

Extension/i18n/kor/ui/settings.html.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"cpp.standard.description": "IntelliSense에 사용할 C++ 언어 표준의 버전입니다. 참고: GNU 표준은 GNU 정의를 가져오기 위해 설정된 컴파일러를 쿼리하는 데만 사용되며, IntelliSense는 해당 C++ 표준 버전을 에뮬레이트합니다.",
4545
"advanced.settings": "고급 설정",
4646
"configuration.provider": "구성 공급자",
47-
"configuration.provider.description": "소스 파일에 대한 IntelliSense 구성 정보를 제공할 수 있는 VS Code 확장의 ID입니다. 예를 들어 VS Code 확장 ID {0} 을(를) 사용하여 CMake 도구 확장의 구성 정보를 제공합니다.",
47+
"configuration.provider.description": "소스 파일에 대한 IntelliSense 구성 정보를 제공할 수 있는 VS Code 확장의 ID입니다. 예를 들어 VS Code 확장 ID {0}을(를) 사용하여 CMake Tools 확장의 구성 정보를 제공합니다.",
4848
"windows.sdk.version": "Windows SDK 버전",
4949
"windows.sdk.version.description": "Windows에서 사용할 Windows SDK 포함 경로의 버전입니다(예: {0}).",
5050
"mac.framework.path": "Mac 프레임워크 경로",

Extension/i18n/ptb/ui/settings.html.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"cpp.standard.description": "A versão do padrão de linguagem C++ a ser usada para o IntelliSense. Observação: os padrões GNU são usados apenas para consultar o compilador de conjunto para obter definições de GNU e o IntelliSense emulará a versão do C++ padrão equivalente.",
4545
"advanced.settings": "Configurações Avançadas",
4646
"configuration.provider": "Provedor de configuração",
47-
"configuration.provider.description": "A ID de uma extensão do VS Code que pode fornecer informações de configuração de IntelliSense para arquivos de origem. Por exemplo, use a ID de extensão do VS Code {0} para fornecer informações de configuração da extensão de Ferramentas CMake.",
47+
"configuration.provider.description": "A ID de uma extensão do VS Code que pode fornecer informações de configuração de IntelliSense para arquivos de origem. Por exemplo, use a ID de extensão do VS Code {0} para fornecer informações de configuração da extensão de CMake Tools.",
4848
"windows.sdk.version": "Versão do SDK do Windows",
4949
"windows.sdk.version.description": "A versão do caminho de inclusão SDK do Windows a ser usada no Windows, por exemplo, {0}.",
5050
"mac.framework.path": "Caminho da estrutura do Mac",

Extension/i18n/rus/ui/settings.html.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"cpp.standard.description": "Версия стандарта языка C++, используемая для IntelliSense. Примечание: стандарты GNU используются только для запроса определений GNU у установленного компилятора, а IntelliSense будет эмулировать эквивалентную версию стандарта C++.",
4545
"advanced.settings": "Дополнительные параметры",
4646
"configuration.provider": "Поставщик конфигурации",
47-
"configuration.provider.description": "Идентификатор расширения VS Code, которое может предоставлять сведения о конфигурации IntelliSense для исходных файлов. Например, используйте идентификатор расширения VS Code {0}, чтобы предоставить сведения о конфигурации из расширения \"Средства CMake\".",
47+
"configuration.provider.description": "Идентификатор расширения VS Code, которое может предоставлять сведения о конфигурации IntelliSense для исходных файлов. Например, используйте идентификатор расширения VS Code {0}, чтобы предоставить сведения о конфигурации из расширения CMake Tools.",
4848
"windows.sdk.version": "Версия Windows SDK",
4949
"windows.sdk.version.description": "Версия пути включения Windows SDK для использования в Windows, например {0}.",
5050
"mac.framework.path": "Путь к платформе Mac",

Extension/i18n/trk/ui/settings.html.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"cpp.standard.description": "IntelliSense için kullanılacak C++ dil standardı sürümü. Not: GNU standartları yalnızca GNU tanımlarını almak için ayarlanan derleyiciyi sorgulamak amacıyla kullanılır ve IntelliSense, eşdeğer C++ standart sürümüne öykünür.",
4545
"advanced.settings": "Gelişmiş Ayarlar",
4646
"configuration.provider": "Yapılandırma sağlayıcısı",
47-
"configuration.provider.description": "Kaynak dosyalar için IntelliSense yapılandırma bilgilerini sağlayabilecek VS Code uzantısının kimliği. Örneğin, CMake Araçları uzantısındaki yapılandırma bilgilerini sağlamak için VS Code {0} uzantı kimliğini kullanın.",
47+
"configuration.provider.description": "Kaynak dosyalar için IntelliSense yapılandırma bilgilerini sağlayabilecek VS Code uzantısının kimliği. Örneğin, Cmake Tools uzantısındaki yapılandırma bilgilerini sağlamak için VS Code {0} uzantı kimliğini kullanın.",
4848
"windows.sdk.version": "Windows SDK sürümü",
4949
"windows.sdk.version.description": "Windows üzerinde kullanılacak Windows SDK ekleme yolu sürümü, örneğin {0}.",
5050
"mac.framework.path": "Mac çerçevesi yolu",

Extension/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cpptools",
33
"displayName": "C/C++",
44
"description": "C/C++ IntelliSense, debugging, and code browsing.",
5-
"version": "1.27.0-main",
5+
"version": "1.27.1-main",
66
"publisher": "ms-vscode",
77
"icon": "LanguageCCPP_color_128x.png",
88
"readme": "README.md",
@@ -6625,4 +6625,4 @@
66256625
"postcss": "^8.4.31",
66266626
"gulp-typescript/**/glob-parent": "^5.1.2"
66276627
}
6628-
}
6628+
}

Extension/src/LanguageServer/extension.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ export function watchForCrashes(crashDirectory: string): void {
10121012
// vscode.workspace.createFileSystemWatcher only works in workspace folders.
10131013
try {
10141014
fs.watch(crashDirectory, (event, filename) => {
1015-
if (event !== "rename") {
1015+
if (event !== "change") {
10161016
return;
10171017
}
10181018
if (!filename || filename === prevCppCrashFile) {
@@ -1177,7 +1177,7 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
11771177
}
11781178

11791179
const lines: string[] = data.split("\n");
1180-
let addressData: string = ".\n";
1180+
let addressData: string;
11811181
const isCppToolsSrv: boolean = crashFile.startsWith("cpptools-srv");
11821182
const telemetryHeader: string = (isCppToolsSrv ? "cpptools-srv.txt" : crashFile) + "\n";
11831183
const filtPath: string | null = which.sync("c++filt", { nothrow: true });
@@ -1207,17 +1207,20 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
12071207
crashStackStartLine = ++crashLogLine;
12081208
}
12091209
if (lines[crashStackStartLine].startsWith("SIG")) {
1210-
signalType = lines[crashStackStartLine] + "\n";
1210+
signalType = `${lines[crashStackStartLine]}\n`;
1211+
addressData = `${lines[crashStackStartLine + 1]}:${lines[crashStackStartLine + 2]}\n`; // signalCode:signalAddr
1212+
crashStackStartLine += 3;
12111213
} else {
12121214
// The signal type may fail to be written.
12131215
// Intentionally different from SIGUNKNOWN from cpptools,
12141216
// and not SIG-? to avoid matching the regex in containsFilteredTelemetryData.
12151217
signalType = "SIGMISSING\n";
1218+
addressData = ".\n";
12161219
}
12171220
data = telemetryHeader + signalType;
12181221
let crashCallStack: string = "";
12191222
let validFrameFound: boolean = false;
1220-
for (let lineNum: number = crashStackStartLine + 1; lineNum < lines.length - 3; ++lineNum) { // skip last lines
1223+
for (let lineNum: number = crashStackStartLine; lineNum < lines.length - 3; ++lineNum) { // skip last lines
12211224
const line: string = lines[lineNum];
12221225
const startPos: number = line.indexOf(startStr);
12231226
let pendingCallStack: string = "";

0 commit comments

Comments
 (0)