Merge pull request #9924 from microsoft/main

sean-mcmanus · web-flow · commit 2855600b5b8b · 2022-09-27T10:43:44.000-07:00
Fix vcFormat. (#9923)
diff --git a/Extension/src/LanguageServer/settings.ts b/Extension/src/LanguageServer/settings.ts
@@ -735,7 +735,7 @@ export class CppSettings extends Settings {
     // This is intentionally not async to avoid races due to multiple entrancy.
     public useVcFormat(document: vscode.TextDocument): boolean {
         if (this.formattingEngine !== "default") {
-            return this.formattingEngine === "vcFormat";
+            return this.formattingEngine === "vcformat";
         }
         if (this.clangFormatStyle !== "file") {
             // If a clang-format style other than file is specified, don't try to switch to vcFormat.

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,7 @@ export class CppSettings extends Settings {`
`735`	`735`	`// This is intentionally not async to avoid races due to multiple entrancy.`
`736`	`736`	`public useVcFormat(document: vscode.TextDocument): boolean {`
`737`	`737`	`if (this.formattingEngine !== "default") {`
`738`		`- return this.formattingEngine === "vcFormat";`
	`738`	`+ return this.formattingEngine === "vcformat";`
`739`	`739`	`}`
`740`	`740`	`if (this.clangFormatStyle !== "file") {`
`741`	`741`	`// If a clang-format style other than file is specified, don't try to switch to vcFormat.`