Skip to content

Don't warn about recursive includes merged from c_cpp_properties.json #14620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
owevertonguedes wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −3
Open

Don't warn about recursive includes merged from c_cpp_properties.json #14620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Extension/src/LanguageServer/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2329,6 +2329,19 @@ export class DefaultClient implements Client {
const fileConfiguration: configs.Configuration | undefined = this.configuration.CurrentConfiguration;
if (fileConfiguration?.mergeConfigurations) {
configs = deepCopy(configs);
}
// Only the include paths from the provider are checked for recursive includes, so
// this has to happen before the include paths from c_cpp_properties.json are
// appended below, where a trailing '**' is a supported way to recurse.
if (configs instanceof Array) {
configs.forEach(config => {
if (util.isArrayOfString(config?.configuration?.includePath) &&
config.configuration.includePath.some(path => path.endsWith('**'))) {
console.warn("custom include paths should not use recursive includes ('**')");
}
});
}
if (fileConfiguration?.mergeConfigurations) {
configs.forEach(config => {
if (fileConfiguration.includePath) {
fileConfiguration.includePath.forEach(p => {
Expand Down Expand Up @@ -3457,9 +3470,6 @@ export class DefaultClient implements Client {
this.configurationLogging.set(uri, JSON.stringify(item.configuration, null, 4));
out.appendLineAtLevel(6, ` uri: ${uri}`);
out.appendLineAtLevel(6, ` config: ${JSON.stringify(item.configuration, null, 2)}`);
if (item.configuration.includePath.some(path => path.endsWith('**'))) {
console.warn("custom include paths should not use recursive includes ('**')");
}
// Separate compiler path and args before sending to language client
const itemConfig: util.Mutable<InternalSourceFileConfiguration> = deepCopy(item.configuration);
if (util.isString(itemConfig.compilerPath)) {
Expand Down
Loading