Ensure that log-potential-typedef-remappings doesn't include typedefs from untraversed files

Author: tannergooding

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs

@@ -2976,6 +2976,10 @@ void ForUnderlyingType(TypedefDecl typedefDecl, Type underlyingType, bool onlyHa
                 {
                     // Nothing to do for builtin types
                 }
+                else if (underlyingType is DecltypeType decltypeType)
+                {
+                    ForUnderlyingType(typedefDecl, decltypeType.UnderlyingType, onlyHandleRemappings);
+                }
                 else if (underlyingType is DependentNameType dependentNameType)
                 {
                     // Nothing to do for dependent name types
@@ -3003,13 +3007,23 @@ void ForUnderlyingType(TypedefDecl typedefDecl, Type underlyingType, bool onlyHa
 
                     if (underlyingName != typedefName)
                     {
-                        if (!_validNameRemappings.TryGetValue(underlyingName, out var remappings))
+                        if (!_allValidNameRemappings.TryGetValue(underlyingName, out var allRemappings))
                         {
-                            remappings = new HashSet<string>();
-                            _validNameRemappings[underlyingName] = remappings;
+                            allRemappings = new HashSet<string>();
+                            _allValidNameRemappings[underlyingName] = allRemappings;
                         }
+                        _ = allRemappings.Add(typedefName);
 
-                        _ = remappings.Add(typedefName);
+
+                        if (!onlyHandleRemappings)
+                        {
+                            if (!_traversedValidNameRemappings.TryGetValue(underlyingName, out var traversedRemappings))
+                            {
+                                traversedRemappings = new HashSet<string>();
+                                _traversedValidNameRemappings[underlyingName] = traversedRemappings;
+                            }
+                            _ = traversedRemappings.Add(typedefName);
+                        }
                     }
                 }
                 else if (underlyingType is TemplateSpecializationType templateSpecializationType)

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs

@@ -37,7 +37,8 @@ public sealed partial class PInvokeGenerator : IDisposable
         private readonly Dictionary<NamedDecl, string> _cursorNames;
         private readonly Dictionary<(NamedDecl namedDecl, bool truncateForFunctionParameters), string> _cursorQualifiedNames;
         private readonly Dictionary<(Cursor cursor, Cursor context, Type type), (string typeName, string nativeTypeName)> _typeNames;
-        private readonly Dictionary<string, HashSet<string>> _validNameRemappings;
+        private readonly Dictionary<string, HashSet<string>> _allValidNameRemappings;
+        private readonly Dictionary<string, HashSet<string>> _traversedValidNameRemappings;
         private readonly Dictionary<CXXMethodDecl, uint> _overloadIndices;
         private readonly Dictionary<Cursor, uint> _isExcluded;
         private readonly Dictionary<string, bool> _isTopLevelClassUnsafe;
@@ -100,13 +101,14 @@ public PInvokeGenerator(PInvokeGeneratorConfiguration config, Func<string, Strea
             _cursorNames = new Dictionary<NamedDecl, string>();
             _cursorQualifiedNames = new Dictionary<(NamedDecl, bool), string>();
             _typeNames = new Dictionary<(Cursor, Cursor, Type), (string, string)>();
-            _validNameRemappings = new Dictionary<string, HashSet<string>>() {
+            _allValidNameRemappings = new Dictionary<string, HashSet<string>>() {
                 ["intptr_t"] = new HashSet<string>() { "IntPtr", "nint" },
                 ["ptrdiff_t"] = new HashSet<string>() { "IntPtr", "nint" },
                 ["size_t"] = new HashSet<string>() { "UIntPtr", "nuint" },
                 ["uintptr_t"] = new HashSet<string>() { "UIntPtr", "nuint" },
                 ["_GUID"] = new HashSet<string>() { "Guid" },
             };
+            _traversedValidNameRemappings = new Dictionary<string, HashSet<string>>();
             _overloadIndices = new Dictionary<CXXMethodDecl, uint>();
             _isExcluded = new Dictionary<Cursor, uint>();
             _isTopLevelClassUnsafe = new Dictionary<string, bool>();
@@ -1239,7 +1241,7 @@ public void GenerateBindings(TranslationUnit translationUnit, string filePath, s
 
                 if (_config.LogPotentialTypedefRemappings)
                 {
-                    foreach (var kvp in _validNameRemappings)
+                    foreach (var kvp in _traversedValidNameRemappings)
                     {
                         var name = kvp.Key;
                         var remappings = kvp.Value;
@@ -1248,7 +1250,14 @@ public void GenerateBindings(TranslationUnit translationUnit, string filePath, s
                         {
                             AddDiagnostic(DiagnosticLevel.Info, $"Potential missing remapping '{name}'. {GetFoundRemappingString(name, remappings)}");
                         }
-                        else if (!remappings.Contains(remappedName) && (name != remappedName) && !_config.ForceRemappedNames.Contains(name))
+                    }
+
+                    foreach (var kvp in _allValidNameRemappings)
+                    {
+                        var name = kvp.Key;
+                        var remappings = kvp.Value;
+
+                        if (_config.RemappedNames.TryGetValue(name, out var remappedName) && !remappings.Contains(remappedName) && (name != remappedName) && !_config.ForceRemappedNames.Contains(name))
                         {
                             AddDiagnostic(DiagnosticLevel.Info, $"Potential invalid remapping '{name}={remappedName}'. {GetFoundRemappingString(name, remappings)}");
                         }
@@ -1258,7 +1267,7 @@ public void GenerateBindings(TranslationUnit translationUnit, string filePath, s
                     {
                         var remappedName = _config.RemappedNames[name];
 
-                        if (!_validNameRemappings.ContainsKey(name) && (name != remappedName) && !_config.ForceRemappedNames.Contains(name))
+                        if (!_allValidNameRemappings.ContainsKey(name) && (name != remappedName) && !_config.ForceRemappedNames.Contains(name))
                         {
                             AddDiagnostic(DiagnosticLevel.Info, $"Potential invalid remapping '{name}={remappedName}'. No remappings were found.");
                         }