Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitf7cab67

Browse files
committed
Merge branch 'main' into seanmcm/1_2_0_insiders_updates
2 parents4258608 +3e2488a commitf7cab67

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

‎Extension/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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/configurations.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,8 +1375,9 @@ export class CppProperties {
13751375

13761376
privateisConfigNameUnique(configName:string):string|undefined{
13771377
leterrorMsg:string|undefined;
1378+
// TODO: make configName non-case sensitive.
13781379
constoccurrences:number|undefined=this.ConfigurationNames?.filter(function(name):boolean{returnname===configName;}).length;
1379-
if(occurrences){
1380+
if(occurrences&&occurrences>1){
13801381
errorMsg=localize('duplicate.name',"{0} is a duplicate. The configuration name should be unique.",configName);
13811382
}
13821383
returnerrorMsg;

‎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
constisCpp:boolean=(activeEditor.document.uri.scheme==="file"&&(activeEditor.document.languageId==="cpp"||activeEditor.document.languageId==="c"));
166166

167167
letisCppPropertiesJson: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)

[8]ページ先頭

©2009-2025 Movatter.jp