Merge pull request #487 from tannergooding/main

tannergooding · web-flow · commit 12968b9e3809 · 2023-11-10T08:37:08.000-08:00
Ensure --include works for whole records and so on
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs
@@ -4699,16 +4699,21 @@ bool IsExcludedByName(Cursor cursor, ref uint isExcludedValue)
             }
 
             if (_config.IncludedNames.Count != 0 && !_config.IncludedNames.Contains(qualifiedName)
-                                            && !_config.IncludedNames.Contains(dottedQualifiedName)
-                                            && !_config.IncludedNames.Contains(qualifiedNameWithoutParameters)
-                                            && !_config.IncludedNames.Contains(dottedQualifiedNameWithoutParameters)
-                                            && !_config.IncludedNames.Contains(name))
+                                                 && !_config.IncludedNames.Contains(dottedQualifiedName)
+                                                 && !_config.IncludedNames.Contains(qualifiedNameWithoutParameters)
+                                                 && !_config.IncludedNames.Contains(dottedQualifiedNameWithoutParameters)
+                                                 && !_config.IncludedNames.Contains(name))
             {
-                if (_config.LogExclusions)
+                var semanticParentCursor = cursor.SemanticParentCursor;
+
+                if ((semanticParentCursor is null) || IsExcluded(semanticParentCursor) || IsAlwaysIncluded(semanticParentCursor))
                 {
-                    AddDiagnostic(DiagnosticLevel.Info, $"Excluded {kind} '{qualifiedName}' as it was not in the include list");
+                    if (_config.LogExclusions)
+                    {
+                        AddDiagnostic(DiagnosticLevel.Info, $"Excluded {kind} '{qualifiedName}' as it was not in the include list");
+                    }
+                    return true;
                 }
-                return true;
             }
 
             if ((isExcludedValue & 0b10) != 0)

Original file line number	Diff line number	Diff line change
`@@ -4699,16 +4699,21 @@ bool IsExcludedByName(Cursor cursor, ref uint isExcludedValue)`
`4699`	`4699`	`}`
`4700`	`4700`
`4701`	`4701`	`if (_config.IncludedNames.Count != 0 && !_config.IncludedNames.Contains(qualifiedName)`
`4702`		`- && !_config.IncludedNames.Contains(dottedQualifiedName)`
`4703`		`- && !_config.IncludedNames.Contains(qualifiedNameWithoutParameters)`
`4704`		`- && !_config.IncludedNames.Contains(dottedQualifiedNameWithoutParameters)`
`4705`		`- && !_config.IncludedNames.Contains(name))`
	`4702`	`+ && !_config.IncludedNames.Contains(dottedQualifiedName)`
	`4703`	`+ && !_config.IncludedNames.Contains(qualifiedNameWithoutParameters)`
	`4704`	`+ && !_config.IncludedNames.Contains(dottedQualifiedNameWithoutParameters)`
	`4705`	`+ && !_config.IncludedNames.Contains(name))`
`4706`	`4706`	`{`
`4707`		`- if (_config.LogExclusions)`
	`4707`	`+ var semanticParentCursor = cursor.SemanticParentCursor;`
	`4708`	`+`
	`4709`	`+ if ((semanticParentCursor is null) \|\| IsExcluded(semanticParentCursor) \|\| IsAlwaysIncluded(semanticParentCursor))`
`4708`	`4710`	`{`
`4709`		`- AddDiagnostic(DiagnosticLevel.Info, $"Excluded {kind} '{qualifiedName}' as it was not in the include list");`
	`4711`	`+ if (_config.LogExclusions)`
	`4712`	`+ {`
	`4713`	`+ AddDiagnostic(DiagnosticLevel.Info, $"Excluded {kind} '{qualifiedName}' as it was not in the include list");`
	`4714`	`+ }`
	`4715`	`+ return true;`
`4710`	`4716`	`}`
`4711`		`- return true;`
`4712`	`4717`	`}`
`4713`	`4718`
`4714`	`4719`	`if ((isExcludedValue & 0b10) != 0)`