Skip to content

Commit 646d9cf

Browse files
authored
Fix bugs with the "You do not have IntelliSense configured" prompt. (#10660)
* Fix bugs with the "You do not have IntelliSense configured" prompt. * Update changelog.
1 parent d1e7326 commit 646d9cf

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Extension/CHANGELOG.md

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

3-
## Version 1.15.0: March 13, 2023
3+
## Version 1.15.0: March 14, 2023
44
### Enhancements
55
* Support multiple natvis files in `visualizerFile`. [#925](https://github.com/microsoft/vscode-cpptools/issues/925)
66
* Enable error squiggles for single file mode if includes resolve. [#10062](https://github.com/microsoft/vscode-cpptools/issues/10062)
@@ -19,6 +19,7 @@
1919
* Fix code analysis with c23/gnu23. [#10615](https://github.com/microsoft/vscode-cpptools/issues/10615)
2020
* Fix 'Reset IntelliSense Database' being delayed until parsing is finished. [#10616](https://github.com/microsoft/vscode-cpptools/issues/10616)
2121
* Fix uncaught exception with some configuration providers. [PR #10629](https://github.com/microsoft/vscode-cpptools/pull/10629)
22+
* Fix bugs with the "You do not have IntelliSense configured" prompt. [#10658](https://github.com/microsoft/vscode-cpptools/issues/10658), [#10659](https://github.com/microsoft/vscode-cpptools/issues/10659)
2223
* Fix `__GXX_RTTI` incorrectly being defined by IntelliSense with clang and `-fms-compatibility`.
2324
* Reduce the likelihood of an `onWillSaveWaitUntil` timeout.
2425
* Fix an IntelliSense crash with C++20 concepts.

Extension/src/LanguageServer/client.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ export class DefaultClient implements Client {
975975
try {
976976
if (index === -1) {
977977
action = "escaped";
978-
if (showSecondPrompt) {
978+
if (showSecondPrompt && !compilerDefaults.trustedCompilerFound) {
979979
this.showPrompt(selectCompiler, true);
980980
}
981981
return;
@@ -1005,6 +1005,9 @@ export class DefaultClient implements Client {
10051005
if (index === paths.length - 3) {
10061006
const result: vscode.Uri[] | undefined = await vscode.window.showOpenDialog();
10071007
if (result === undefined || result.length === 0) {
1008+
if (showSecondPrompt && !compilerDefaults.trustedCompilerFound) {
1009+
this.showPrompt(selectCompiler, true);
1010+
}
10081011
action = "browse dismissed";
10091012
return;
10101013
}

0 commit comments

Comments
 (0)