Skip to content

Commit 286a5c5

Browse files
authored
Resolve prompt regression + fix e2e tests (#11964)
* resolve e2e test * Resolve prompt regression and tests * Fix lint issue
1 parent ce202f3 commit 286a5c5

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

Extension/src/LanguageServer/client.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,14 @@ export class DefaultClient implements Client {
961961
return selection ? selection.index : -1;
962962
}
963963

964+
public async showPrompt(sender?: any): Promise<void> {
965+
const buttonMessage: string = localize("selectIntelliSenseConfiguration.string", "Select IntelliSense Configuration...");
966+
const value: string | undefined = await vscode.window.showInformationMessage(localize("setCompiler.message", "You do not have IntelliSense configured. Unless you set your own configurations, IntelliSense may not be functional."), buttonMessage);
967+
if (value === buttonMessage) {
968+
return this.handleIntelliSenseConfigurationQuickPick(sender);
969+
}
970+
}
971+
964972
public async handleIntelliSenseConfigurationQuickPick(sender?: any, showCompilersOnly?: boolean): Promise<void> {
965973
const settings: CppSettings = new CppSettings(showCompilersOnly ? undefined : this.RootUri);
966974
const paths: string[] = [];
@@ -1025,6 +1033,7 @@ export class DefaultClient implements Client {
10251033
settings.defaultCompilerPath = "";
10261034
await this.configuration.updateCompilerPathIfSet(settings.defaultCompilerPath);
10271035
configurationSelected = true;
1036+
await this.showPrompt(sender);
10281037
return ui.ShowConfigureIntelliSenseButton(false, this, ConfigurationType.CompilerPath, "disablePrompt");
10291038
}
10301039
if (installShown && index === paths.length - 2) {

Extension/test/scenarios/SingleRootProject/tests/common.test.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,16 @@ suite("resolveVariables", () => {
237237
"-DTEST6=TEST6\\ TEST6 Test6", // "-DTEST6=TEST6 TEST6 Test6"
238238
]
239239
*/
240-
testQuoteArgumentScenario("-DTEST1=TEST1 TEST1", "\"-DTEST1=TEST1 TEST1\"");
241-
testQuoteArgumentScenario("-DTEST2=\"TEST2 TEST2\"", "\"-DTEST2=\\\"TEST2 TEST2\\\"\"");
242-
testQuoteArgumentScenario("-DTEST3=\\\"TEST3 TEST3\\\"", "\"-DTEST3=\\\"TEST3 TEST3\\\"\"");
243-
testQuoteArgumentScenario("-DTEST4=TEST4\\ TEST4", "\"-DTEST4=TEST4 TEST4\"");
244-
testQuoteArgumentScenario("-DTEST5=\'TEST5 TEST5\'", "-DTEST5=\'TEST5 TEST5\'");
245-
testQuoteArgumentScenario("-DTEST4=TEST4\\ TEST4", "-DTEST4=TEST4\\ TEST4");
246-
testQuoteArgumentScenario("-DTEST5='TEST5 TEST5'", "-DTEST5='TEST5 TEST5'");
240+
testQuoteArgumentScenario(`-DTEST1=TEST1 TEST1`, `"-DTEST1=TEST1 TEST1"`);
241+
testQuoteArgumentScenario(`-DTEST2="TEST2 TEST2"`, `"-DTEST2=\"TEST2 TEST2\""`);
242+
testQuoteArgumentScenario(`-DTEST3=\\"TEST3 TEST3\\"`, `"-DTEST3=\\\\\\"TEST3 TEST3\\\\\\""`);
243+
if (process.platform.includes("win")) {
244+
testQuoteArgumentScenario("-DTEST4=TEST4\\ TEST4", "\"-DTEST4=TEST4 TEST4\"");
245+
testQuoteArgumentScenario("-DTEST5=\'TEST5 TEST5\'", "-DTEST5=\'TEST5 TEST5\'");
246+
} else {
247+
testQuoteArgumentScenario("-DTEST4=TEST4\\ TEST4", "-DTEST4=TEST4\\ TEST4");
248+
testQuoteArgumentScenario("-DTEST5='TEST5 TEST5'", "-DTEST5='TEST5 TEST5'");
249+
}
247250
testQuoteArgumentScenario("-DTEST6=TEST6\\ TEST6 Test6", "\"-DTEST6=TEST6 TEST6 Test6\"");
248251
});
249252

0 commit comments

Comments
 (0)