Rename ContainerEntryInstance back to Container

Revert SymbolKind.ContainerEntryInstance to SymbolKind.Container (shorter,
original name). Rename VisitContainerEntryInstance to VisitContainer and
IContainerEntryInstanceSymbol to IContainerSymbol to maintain 1:1 mapping.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: amis92

src/WarHub.ArmouryModel.Concrete.Extensions/SymbolIndex.cs

@@ -93,7 +93,7 @@ internal SymbolKeyResolution Resolve(SymbolKey key)
                 case SymbolKind.GamesystemNamespace:
                     return null;
                 case SymbolKind.ContainerEntry:
-                case SymbolKind.ContainerEntryInstance:
+                case SymbolKind.Container:
                     return parent.Id;
             }
         }

src/WarHub.ArmouryModel.Concrete.Extensions/Symbols/ContainerSymbol.cs

@@ -2,8 +2,8 @@
 
 namespace WarHub.ArmouryModel.Concrete;
 
-[GenerateSymbol(SymbolKind.ContainerEntryInstance)]
-internal abstract partial class ContainerSymbol : EntryInstanceSymbol, IContainerEntryInstanceSymbol
+[GenerateSymbol(SymbolKind.Container)]
+internal abstract partial class ContainerSymbol : EntryInstanceSymbol, IContainerSymbol
 {
     protected ContainerSymbol(
         ISymbol? containingSymbol,

src/WarHub.ArmouryModel.Extensions/Symbols/ICategorySymbol.cs

@@ -5,7 +5,7 @@ namespace WarHub.ArmouryModel;
 /// BS Category.
 /// WHAM <see cref="Source.CategoryNode"/>.
 /// </summary>
-public interface ICategorySymbol : IContainerEntryInstanceSymbol
+public interface ICategorySymbol : IContainerSymbol
 {
     bool IsPrimaryCategory { get; }
 

…Symbols/IContainerEntryInstanceSymbol.cs …l.Extensions/Symbols/IContainerSymbol.cssrc/WarHub.ArmouryModel.Extensions/Symbols/IContainerEntryInstanceSymbol.cs renamed to src/WarHub.ArmouryModel.Extensions/Symbols/IContainerSymbol.cs src/WarHub.ArmouryModel.Extensions/Symbols/IContainerEntryInstanceSymbol.cs renamed to src/WarHub.ArmouryModel.Extensions/Symbols/IContainerSymbol.cs

@@ -5,7 +5,7 @@ namespace WarHub.ArmouryModel;
 /// BS BaseSelectable.
 /// WHAM <see cref="Source.RosterElementBaseNode"/>.
 /// </summary>
-public interface IContainerEntryInstanceSymbol : IEntryInstanceSymbol
+public interface IContainerSymbol : IEntryInstanceSymbol
 {
     ContainerKind ContainerKind { get; }
 

src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionContainerSymbol.cs

@@ -6,7 +6,7 @@ namespace WarHub.ArmouryModel;
 /// WHAM <see cref="Source.ForceNode" />
 /// and <see cref="Source.SelectionNode" />.
 /// </summary>
-public interface ISelectionContainerSymbol : IContainerEntryInstanceSymbol
+public interface ISelectionContainerSymbol : IContainerSymbol
 {
     /// <summary>
     /// Child selections of this symbol.

src/WarHub.ArmouryModel.Extensions/Symbols/ISymbolExtensions.cs

@@ -10,7 +10,7 @@ public static class ISymbolExtensions
     public static bool IsContainerKind(this ISymbol symbol, ContainerKind kind) => symbol switch
     {
         { Kind: SymbolKind.ContainerEntry } and IContainerEntrySymbol { ContainerKind: var x } => x == kind,
-        { Kind: SymbolKind.ContainerEntryInstance } and IContainerEntryInstanceSymbol { ContainerKind: var x } => x == kind,
+        { Kind: SymbolKind.Container } and IContainerSymbol { ContainerKind: var x } => x == kind,
         _ => false,
     };
 

src/WarHub.ArmouryModel.Extensions/Symbols/SymbolKey.cs

@@ -72,7 +72,7 @@ public SymbolKeyResolution Resolve(Compilation compilation) =>
 
                 // Immediate parent is an entry or container — use its ID.
                 case SymbolKind.ContainerEntry:
-                case SymbolKind.ContainerEntryInstance:
+                case SymbolKind.Container:
                     return parent.Id;
             }
         }

src/WarHub.ArmouryModel.Extensions/Symbols/SymbolKind.cs

@@ -55,10 +55,10 @@ public enum SymbolKind
     ContainerEntry,
 
     /// <summary>
-    /// Container entry instance. Further discriminated by <see cref="ContainerKind"/>.
+    /// Container instance. Further discriminated by <see cref="ContainerKind"/>.
     /// Includes entry instances in roster: force, category, selection.
     /// </summary>
-    ContainerEntryInstance,
+    Container,
 
     /// <summary>
     /// Constraint that creates boundaries of allowed counts.

src/WarHub.ArmouryModel.Extensions/Symbols/SymbolVisitor.cs

@@ -36,7 +36,7 @@ public virtual void VisitResource(IResourceSymbol symbol) =>
     public virtual void VisitContainerEntry(IContainerEntrySymbol symbol) =>
         DefaultVisit(symbol);
 
-    public virtual void VisitContainerEntryInstance(IContainerEntryInstanceSymbol symbol) =>
+    public virtual void VisitContainer(IContainerSymbol symbol) =>
         DefaultVisit(symbol);
 
     public virtual void VisitCatalogueReference(ICatalogueReferenceSymbol symbol) =>
@@ -103,7 +103,7 @@ public virtual TResult VisitResource(IResourceSymbol symbol) =>
     public virtual TResult VisitContainerEntry(IContainerEntrySymbol symbol) =>
         DefaultVisit(symbol);
 
-    public virtual TResult VisitContainerEntryInstance(IContainerEntryInstanceSymbol symbol) =>
+    public virtual TResult VisitContainer(IContainerSymbol symbol) =>
         DefaultVisit(symbol);
 
     public virtual TResult VisitCatalogueReference(ICatalogueReferenceSymbol symbol) =>
@@ -171,7 +171,7 @@ public virtual TResult VisitResource(IResourceSymbol symbol, TArgument argument)
     public virtual TResult VisitContainerEntry(IContainerEntrySymbol symbol, TArgument argument) =>
         DefaultVisit(symbol, argument);
 
-    public virtual TResult VisitContainerEntryInstance(IContainerEntryInstanceSymbol symbol, TArgument argument) =>
+    public virtual TResult VisitContainer(IContainerSymbol symbol, TArgument argument) =>
         DefaultVisit(symbol, argument);
 
     public virtual TResult VisitCatalogueReference(ICatalogueReferenceSymbol symbol, TArgument argument) =>

tests/WarHub.ArmouryModel.Concrete.Extensions.Tests/SymbolKeyTests.cs

@@ -305,7 +305,7 @@ public void Create_captures_correct_fields_for_roster_selection()
 
         var key = SymbolKey.Create(selection);
 
-        key.Kind.Should().Be(SymbolKind.ContainerEntryInstance);
+        key.Kind.Should().Be(SymbolKind.Container);
         key.SymbolId.Should().Be(selection.Id);
         key.ContainingModuleId.Should().Be(roster.Id);
         key.ContainingEntryId.Should().Be(force.Id, "Selection's containing entry is the force");