Skip to content

Commit

Permalink
Merge branch 'main' into seanmcm/signVsix
Browse files Browse the repository at this point in the history
  • Loading branch information
sean-mcmanus authored Sep 27, 2024
2 parents f90374a + c65b11b commit 408cd77
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Extension/src/LanguageServer/configurations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ export class CppProperties {
configuration.intelliSenseMode === "${default}") {
return "";
}
const resolvedCompilerPath: string = this.resolvePath(configuration.compilerPath);
const resolvedCompilerPath: string = this.resolvePath(configuration.compilerPath, false, false);
const settings: CppSettings = new CppSettings(this.rootUri);
const compilerPathAndArgs: util.CompilerPathAndArgs = util.extractCompilerPathAndArgs(!!settings.legacyCompilerArgsBehavior, resolvedCompilerPath);

Expand Down Expand Up @@ -1877,8 +1877,7 @@ export class CppProperties {
// Check for path-related squiggles.
const paths: string[] = [];
let compilerPath: string | undefined;
for (const pathArray of [currentConfiguration.browse ? currentConfiguration.browse.path : undefined,
currentConfiguration.includePath, currentConfiguration.macFrameworkPath]) {
for (const pathArray of [currentConfiguration.browse ? currentConfiguration.browse.path : undefined, currentConfiguration.includePath, currentConfiguration.macFrameworkPath]) {
if (pathArray) {
for (const curPath of pathArray) {
paths.push(`${curPath}`);
Expand Down

0 comments on commit 408cd77

Please sign in to comment.