Skip to content

Commit 148a709

Browse files
authored
Fix recursive includes regression. (#10337)
1 parent 4916b2f commit 148a709

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Extension/src/LanguageServer/configurations.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ export class CppProperties {
987987
}
988988

989989
if (configuration.includePath) {
990-
configuration.includePath = configuration.includePath.map((path: string) => this.resolvePath(path, this.isWin32));
990+
configuration.includePath = configuration.includePath.map((path: string) => this.resolvePath(path, this.isWin32, false));
991991
}
992992
}
993993

@@ -1377,7 +1377,7 @@ export class CppProperties {
13771377
return success;
13781378
}
13791379

1380-
public resolvePath(input_path: string | undefined, isWindows: boolean): string {
1380+
public resolvePath(input_path: string | undefined, isWindows: boolean, replaceAsterisks: boolean = true): string {
13811381
if (!input_path || input_path === "${default}") {
13821382
return "";
13831383
}
@@ -1397,7 +1397,7 @@ export class CppProperties {
13971397
if (result.includes("${vcpkgRoot}") && util.getVcpkgRoot()) {
13981398
result = result.replace("${vcpkgRoot}", util.getVcpkgRoot());
13991399
}
1400-
if (result.includes("*")) {
1400+
if (replaceAsterisks && result.includes("*")) {
14011401
result = result.replace(/\*/g, "");
14021402
}
14031403

0 commit comments

Comments
 (0)