Merge branch 'dev/spebl/otfdocs' of https://github.com/Microsoft/vscode-cpptools into dev/spebl/otfdocs

spebl · spebl · commit f8fc5006a8ab · 2024-10-24T14:58:17.000-07:00
diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -2419,7 +2419,9 @@ export class DefaultClient implements Client {
         }
 
         this.updateInactiveRegions(intelliSenseResult.uri, intelliSenseResult.inactiveRegions, intelliSenseResult.clearExistingInactiveRegions, intelliSenseResult.isCompletePass);
-        this.updateSquiggles(intelliSenseResult.uri, intelliSenseResult.diagnostics, intelliSenseResult.clearExistingDiagnostics);
+        if (intelliSenseResult.clearExistingDiagnostics || intelliSenseResult.diagnostics.length > 0) {
+            this.updateSquiggles(intelliSenseResult.uri, intelliSenseResult.diagnostics, intelliSenseResult.clearExistingDiagnostics);
+        }
     }
 
     private updateSquiggles(uriString: string, diagnostics: IntelliSenseDiagnostic[], startNewSet: boolean): void {

Original file line number	Diff line number	Diff line change
`@@ -2419,7 +2419,9 @@ export class DefaultClient implements Client {`
`2419`	`2419`	`}`
`2420`	`2420`
`2421`	`2421`	`this.updateInactiveRegions(intelliSenseResult.uri, intelliSenseResult.inactiveRegions, intelliSenseResult.clearExistingInactiveRegions, intelliSenseResult.isCompletePass);`
`2422`		`- this.updateSquiggles(intelliSenseResult.uri, intelliSenseResult.diagnostics, intelliSenseResult.clearExistingDiagnostics);`
	`2422`	`+ if (intelliSenseResult.clearExistingDiagnostics \|\| intelliSenseResult.diagnostics.length > 0) {`
	`2423`	`+ this.updateSquiggles(intelliSenseResult.uri, intelliSenseResult.diagnostics, intelliSenseResult.clearExistingDiagnostics);`
	`2424`	`+ }`
`2423`	`2425`	`}`
`2424`	`2426`
`2425`	`2427`	`private updateSquiggles(uriString: string, diagnostics: IntelliSenseDiagnostic[], startNewSet: boolean): void {`