This commit is contained in:
Garrett Campbell 2024-10-10 11:33:45 -04:00 коммит произвёл GitHub
Родитель 0786aa8259
Коммит caca06d89f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
2 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -8,6 +8,7 @@ Features:
Improvements:
- Fix "Unable to resolve configuration with compilerPath" issue for Swift. [#4097](https://github.com/microsoft/vscode-cmake-tools/issues/4097)
- Ensure that any uses of `proc.spawn` work, especially for .bat and .cmd files, due to VS Code updating to Node 20. [#4037](https://github.com/microsoft/vscode-cmake-tools/issues/4037)
Bug Fixes:

Просмотреть файл

@ -431,7 +431,7 @@ export class CppConfigurationProvider implements cpptools.CustomConfigurationPro
// For CppTools V6 and above, build the compilerFragments data, otherwise build compilerArgs data
const useFragments: boolean = this.cpptoolsVersion >= cpptools.Version.v6;
// If the file didn't have a language, default to C++
const lang = fileGroup.language === "RC" ? undefined : fileGroup.language;
const lang = fileGroup.language === "RC" || fileGroup.language === "Swift" ? undefined : fileGroup.language;
// First try to get toolchain values directly reported by CMake. Check the
// group's language compiler, then the C++ compiler, then the C compiler.
let compilerToolchains: CodeModelToolchain | undefined;