Fix populating metadata from legacy binlogs

KirillOsenkov · Aug 24, 2021 · 67b0b22 · 67b0b22
1 parent 071bb14
commit 67b0b22
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/StructuredLogger/Construction/Construction.cs b/src/StructuredLogger/Construction/Construction.cs
@@ -826,9 +826,10 @@ public void UpdateProject(Project project, ProjectStartedEventArgs args)
             }
         }
 
-        public static void AddMetadata(ITaskItem item, Item itemNode)
+        public void AddMetadata(ITaskItem item, Item itemNode)
         {
-            if (item.CloneCustomMetadata() is ArrayDictionary<string, string> metadata)
+            var cloned = item.CloneCustomMetadata();
+            if (cloned is ArrayDictionary<string, string> metadata)
             {
                 int count = metadata.Count;
                 if (count == 0)
@@ -858,6 +859,25 @@ public static void AddMetadata(ITaskItem item, Item itemNode)
                     metadataNode.Parent = itemNode;
                 }
             }
+            else
+            {
+                if (cloned is ICollection collection)
+                {
+                    itemNode.EnsureChildrenCapacity(collection.Count);
+                }
+
+                foreach (DictionaryEntry metadataName in cloned)
+                {
+                    var metadataNode = new Metadata
+                    {
+                        Name = SoftIntern(Convert.ToString(metadataName.Key)),
+                        Value = SoftIntern(Convert.ToString(metadataName.Value))
+                    };
+
+                    itemNode.Children.Add(metadataNode);
+                    metadataNode.Parent = itemNode;
+                }
+            }
         }
 
         private void AddItems(TreeNode parent, IEnumerable itemList)

diff --git a/src/StructuredLogger/Construction/MessageProcessor.cs b/src/StructuredLogger/Construction/MessageProcessor.cs
@@ -268,7 +268,7 @@ private void AddItems(IEnumerable items, TreeNode parent)
             foreach (ITaskItem item in items)
             {
                 var itemNode = new Item { Text = item.ItemSpec };
-                Construction.AddMetadata(item, itemNode);
+                this.construction.AddMetadata(item, itemNode);
                 parent.AddChild(itemNode);
             }
         }