QualifiedName Fix

- Fixes several instances of QualifiedNames instead of using ParseTypeName

Author: curin

generator.json

@@ -66,7 +66,9 @@
         ],
         "InjectedRemappedNames": {
           "BOOL": "MaybeBool<int>",
-          "HANDLE": "Handle"
+          "HANDLE": "Handle",
+          "HSTRING": "HString",
+          "HRESULT": "HResult"
         },
         "InjectedGeneratorOptions": [
           "--config",

sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs

@@ -316,7 +316,8 @@ z.MethodKind is MethodKind.Constructor or MethodKind.Destructor
                     );
             }),
             logger,
-            ct
+            ct,
+            includeCandidateLocations: true
         );
 
         logger.LogDebug(

sources/SilkTouch/SilkTouch/Mods/RemapTypes.cs

@@ -66,14 +66,13 @@ await proj.GetCompilationAsync(ct)
 
         List<Location> retrievedLocations = [];
 
-        foreach (var diagnostic in diagnostics)
-        {
+        Parallel.ForEach(diagnostics, diagnostic => {
             if (diagnostic.Id == "CS0246" && !retrievedLocations.Contains(diagnostic.Location))
             {
                 retrievedLocations.Add(diagnostic.Location);
             }
-            progressService.SetProgress(index++ / total);
-        }
+            progressService.SetProgress(Interlocked.Increment(ref index) / total);
+        });
 
         progressService.SetTask("Remapping Errored Types");
         await NameUtils.RemapAllAsync(ctx, cfg.Mappings!, retrievedLocations, logger);

sources/SilkTouch/SilkTouch/Mods/TransformCOM.cs

@@ -20,7 +20,6 @@
 using Silk.NET.SilkTouch.Logging;
 using Silk.NET.SilkTouch.Utility;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using static Silk.NET.SilkTouch.Utility.KeyedStringTree;
 
 namespace Silk.NET.SilkTouch.Mods
 {
@@ -149,7 +148,12 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
                     ? compilation.GetSemanticModel(syntaxTree!)
                     : await doc.GetSemanticModelAsync();
 
-                doc = doc.WithSyntaxRoot(updater.Visit(root).NormalizeWhitespace());
+                doc = doc.WithSyntaxRoot(root = (updater.Visit(root).NormalizeWhitespace()));
+
+                if (doc.FilePath?.ToLower().Contains("idxgifactory.gen.cs") ?? false)
+                {
+                    File.WriteAllText($"IDXGIFactory.TransformInterface.UsageUpdater.cs", root.ToFullString());
+                }
 
                 proj = doc.Project;
 
@@ -176,7 +180,12 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
                     continue;
                 }
 
-                doc = doc.WithSyntaxRoot(rewriter.Visit(root).NormalizeWhitespace());
+                doc = doc.WithSyntaxRoot(root = rewriter.Visit(root).NormalizeWhitespace());
+
+                if (doc.FilePath?.ToLower().Contains("idxgifactory.gen.cs") ?? false)
+                {
+                    File.WriteAllText($"IDXGIFactory.TransformInterface.Rewriter.cs", root.ToFullString());
+                }
 
                 proj = doc.Project;
 
@@ -437,7 +446,7 @@ typeInfoL.Type is null
                         return BinaryExpression(
                             node.Kind(),
                             node.Left,
-                            IdentifierName($"{node.Right.ToString()}.lpVtbl")
+                            MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, node.Right, IdentifierName("lpVtbl"))
                         );
                     }
                 }
@@ -448,7 +457,7 @@ typeInfoL.Type is null
                     {
                         return BinaryExpression(
                             node.Kind(),
-                            IdentifierName($"{node.Left.ToString()}.lpVtbl"),
+                            MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, node.Left, IdentifierName("lpVtbl")),
                             node.Right
                         );
                     }
@@ -476,7 +485,7 @@ var.Initializer is not null
 
                 if (pointerDepth == 0)
                 {
-                    return node.WithType(ParseTypeName($"{variableType}.Native"));
+                    return node.WithType(QualifiedName(IdentifierName($"{variableType}"), IdentifierName("Native")));
                 }
 
                 var name = GetTypeName(innerType.ToString() ?? string.Empty);
@@ -531,7 +540,7 @@ variableExpression is not null
                     {
                         pointerDepth = GetPointerDepth(orig.ReturnType, out innerType);
                         var returnType = shouldEditReturnType
-                            ? IdentifierName($"{innerType}.Native")
+                            ? QualifiedName(IdentifierName($"{innerType}"), IdentifierName("Native"))
                             : orig.ReturnType;
                         if (shouldEditReturnType)
                         {
@@ -793,7 +802,7 @@ anc is MethodDeclarationSyntax mds
                 return
                     InterfaceTypes.ContainsKey(name)
                     && node.Ancestors().OfType<TypeSyntax>().Count() > 0
-                    ? IdentifierName($"{name}.Native")
+                    ? QualifiedName(IdentifierName(name), IdentifierName("Native"))
                     : base.VisitIdentifierName(node);
             }
 
@@ -868,7 +877,7 @@ visitedParameter is null
                         node.RemoveNodes(interfaceNodes ?? [], SyntaxRemoveOptions.KeepNoTrivia)
                         ?? node;
 
-                    var nativeName = $"{name}.Native";
+                    var nativeName = QualifiedName(IdentifierName(name), IdentifierName("Native"));
 
                     var parentNode = StructDeclaration(
                             node.AttributeLists,
@@ -1059,7 +1068,7 @@ mem is MethodDeclarationSyntax
                                         SyntaxKind.SimpleAssignmentExpression,
                                         IdentifierName("lpVtbl"),
                                         CastExpression(
-                                            PointerType(ParseTypeName(nativeName)),
+                                            PointerType(nativeName),
                                             IdentifierName("vtbl")
                                         )
                                     )
@@ -1193,7 +1202,7 @@ mem is MethodDeclarationSyntax
                                 ParameterList(
                                     SingletonSeparatedList(
                                         Parameter(Identifier("vtbl"))
-                                            .WithType(ParseTypeName($"Ptr<{nativeName}>"))
+                                            .WithType(GenericName(Identifier("Ptr"), TypeArgumentList(SingletonSeparatedList<TypeSyntax>(nativeName))))
                                     )
                                 )
                             )
@@ -1333,8 +1342,8 @@ mem is MethodDeclarationSyntax
                     parentNode = generateCasts(
                         parentNode,
                         name,
-                        PointerType(ParseTypeName(nativeName)),
-                        nativeName,
+                        PointerType(nativeName),
+                        nativeName.ToString(),
                         CastExpression(ParseTypeName("Ptr<Native>"), IdentifierName("value")),
                         false,
                         true

sources/SilkTouch/SilkTouch/Mods/TransformInterfaces.cs

@@ -497,7 +497,7 @@ public static async Task RemapAllAsync(
         var testProjId = ctx.TestProject?.Id;
         foreach (
             var (syntaxTree, renameLocations) in candidateLocations
-                .GroupBy(x => x.SourceTree)
+                .GroupBy(x => x?.SourceTree ?? default)
                 .Select(x => (x.Key, x.OrderByDescending(y => y.SourceSpan)))
         )
         {

sources/SilkTouch/SilkTouch/Naming/NameUtils.cs

@@ -8,16 +8,16 @@ namespace Silk.NET.SilkTouch.Utility
     /// <summary>
     /// Easily combinable and searchable tree structure
     /// </summary>
-    public class KeyedStringTree
+    public class KeyedStringTree<TValue>
     {
         ReaderWriterLockSlim _concurrencyLock = new();
 
         /// <summary>
-        /// ctor for <see cref="KeyedStringTree"/>
+        /// ctor for <see cref="KeyedStringTree{TValue}"/>
         /// </summary>
         /// <param name="rootKey"></param>
         /// <param name="rootValue"></param>
-        public KeyedStringTree(string rootKey, string rootValue)
+        public KeyedStringTree(string rootKey, TValue rootValue)
         {
             RootNode = new(rootKey, rootValue);
         }
@@ -78,7 +78,7 @@ private bool _FindNode(string key, [NotNullWhen(true)] out Node? node)
         /// </summary>
         /// <param name="other"></param>
         /// <returns>Whether combination was successful</returns>
-        public bool TryConsume(KeyedStringTree other)
+        public bool TryConsume(KeyedStringTree<TValue> other)
         {
             _concurrencyLock.EnterWriteLock();
             if (!_FindNode(other.RootNode.Key, out Node? node))
@@ -99,7 +99,7 @@ public bool TryConsume(KeyedStringTree other)
         /// <param name="newNodeKey">key of the new child node</param>
         /// <param name="newNodeValue">value of the new child node</param>
         /// <returns>if the parent node was found in the tree</returns>
-        public bool TryAddNode(string parentKey, string newNodeKey, string newNodeValue)
+        public bool TryAddNode(string parentKey, string newNodeKey, TValue newNodeValue)
         {
             _concurrencyLock.EnterWriteLock();
             if (!_FindNode(parentKey, out Node? node))
@@ -132,11 +132,11 @@ private void CombineNodes(Node baseNode, Node additiveNode)
         }
 
         /// <summary>
-        /// Node from a <see cref="KeyedStringTree" />
+        /// Node from a <see cref="KeyedStringTree{TValue}" />
         /// </summary>
         public class Node
         {
-            internal Node(string key, string value, Node? parent = null)
+            internal Node(string key, TValue value, Node? parent = null)
             {
                 Key = key;
                 Value = value;
@@ -151,7 +151,7 @@ internal Node(string key, string value, Node? parent = null)
             /// <summary>
             /// Value at this node
             /// </summary>
-            public string Value;
+            public TValue Value;
 
             /// <summary>
             /// All children for this node