Skip to content

Commit 2a94a2b

Browse files
authored
Fix configuration status bar issue. Update changelog. (#6782)
* Fix configuration status bar issue. Update changelog.
1 parent 51557b5 commit 2a94a2b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Extension/CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# C/C++ for Visual Studio Code Change Log
22

3-
## Version 1.2.0-insiders: January 14, 2021
3+
## Version 1.2.0-insiders: January 14, 2021
44
### New Features
55
* Add support for cross-compilation configurations for IntelliSense. For example, `intelliSenseMode` value "linux-gcc-x64" could be used on a Mac host machine. [#1083](https://github.com/microsoft/vscode-cpptools/issues/1083)
66
* Add `C_Cpp.addNodeAddonIncludePaths` setting to add include paths from `nan` and `node-addon-api` when they're dependencies. [#4854](https://github.com/microsoft/vscode-cpptools/issues/4854)
@@ -10,6 +10,7 @@
1010
* Show configuration squiggles when configurations with the same name exist. [#3412](https://github.com/microsoft/vscode-cpptools/issues/3412)
1111
* Add command `Generate EditorConfig contents from VC Format settings`. [#6018](https://github.com/microsoft/vscode-cpptools/issues/6018)
1212
* Update to clang-format 11.1. [#6326](https://github.com/microsoft/vscode-cpptools/issues/6326)
13+
* Add clang-format built for Windows ARM64. [#6494](https://github.com/microsoft/vscode-cpptools/issues/6494)
1314
* Add support for the `/await` flag with msvc IntelliSense. [#6596](https://github.com/microsoft/vscode-cpptools/issues/6596)
1415
* Increase document/workspace symbol limit from 1000 to 10000. [#6766](https://github.com/microsoft/vscode-cpptools/issues/6766)
1516

@@ -62,6 +63,7 @@
6263
* Fix `.` to `->` completion with multiple cursors. [#6720](https://github.com/microsoft/vscode-cpptools/issues/6720)
6364
* Fix bug with configured cl.exe path not being used to choose appropriate system include paths, or cl.exe not being used at all if it's not also installed via the VS Installer. [#6746](https://github.com/microsoft/vscode-cpptools/issues/6746)
6465
* Fix bugs with parsing of quotes and escape sequences in compiler args. [#6761](https://github.com/microsoft/vscode-cpptools/issues/6761)
66+
* Fix the configuration not showing in the status bar when `c_cpp_properties.json` is active. [#6765](https://github.com/microsoft/vscode-cpptools/issues/6765)
6567
* Fix "D" command line warnings not appearing with cl.exe cppbuild build tasks.
6668
* Fix cl.exe cppbuild tasks when `/nologo` is used (and make /nologo a default arg).
6769
* Fix a cpptools crash and multiple deadlocks.

Extension/src/LanguageServer/ui.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export class UI {
165165
const isCpp: boolean = (activeEditor.document.uri.scheme === "file" && (activeEditor.document.languageId === "cpp" || activeEditor.document.languageId === "c"));
166166

167167
let isCppPropertiesJson: boolean = false;
168-
if (activeEditor.document.languageId === "json") {
168+
if (activeEditor.document.languageId === "json" || activeEditor.document.languageId === "jsonc") {
169169
isCppPropertiesJson = activeEditor.document.fileName.endsWith("c_cpp_properties.json");
170170
if (isCppPropertiesJson) {
171171
vscode.languages.setTextDocumentLanguage(activeEditor.document, "jsonc");

0 commit comments

Comments
 (0)