Added resx file

- New context function to add parent types

Author: ATrefzer

CSharpCodeAnalyst/CSharpCodeAnalyst.csproj

@@ -119,4 +119,19 @@
 	    <HintPath>..\ReferencedAssemblies\Microsoft.Msagl.WpfGraphControl.dll</HintPath>
 	  </Reference>
 	</ItemGroup>
+
+   <ItemGroup>
+     <Compile Update="Resources\Strings.Designer.cs">
+       <DesignTime>True</DesignTime>
+       <AutoGen>True</AutoGen>
+       <DependentUpon>Strings.resx</DependentUpon>
+     </Compile>
+   </ItemGroup>
+
+   <ItemGroup>
+     <EmbeddedResource Update="Resources\Strings.resx">
+       <Generator>PublicResXFileCodeGenerator</Generator>
+       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+     </EmbeddedResource>
+   </ItemGroup>
 </Project>

CSharpCodeAnalyst/Exploration/CodeGraphExplorer.cs

@@ -1,4 +1,5 @@
-using Contracts.Graph;
+using CodeParser.Analysis.Cycles;
+using Contracts.Graph;
 
 namespace CSharpCodeAnalyst.Exploration;
 
@@ -37,6 +38,38 @@ public List<CodeElement> GetElements(List<string> ids)
         return elements;
     }
 
+    public SearchResult CompleteToContainingTypes(HashSet<string> ids)
+    {
+        if (_codeGraph is null)
+        {
+            return new SearchResult([], []);
+        }
+
+        var parents = new List<CodeElement>();
+
+        foreach (var id in ids)
+        {
+            if (_codeGraph.Nodes.TryGetValue(id, out var element))
+            {
+                var current = element;
+                while (current.Parent is not null &&
+                       CodeElementClassifier.GetContainerLevel(current.ElementType) == 0)
+                {
+                    // We need a parent
+                    var parent = current.Parent;
+                    if (ids.Contains(parent.Id) is false)
+                    {
+                        parents.Add(parent);
+                    }
+
+                    current = current.Parent;
+                }
+            }
+        }
+
+        return new SearchResult(parents, []);
+    }
+
     public SearchResult FindParents(List<string> ids)
     {
         if (_codeGraph is null)
@@ -211,16 +244,19 @@ public SearchResult FindFullInheritanceTree(string id)
         var types = new HashSet<CodeElement>();
         var relationships = new HashSet<Dependency>();
         var processingQueue = new Queue<CodeElement>();
-        processingQueue.Enqueue(type);
+
         var processed = new HashSet<string>();
 
         var inheritsAndImplements = FindInheritsAndImplementsRelationships();
+
+        // Find base classes recursive
+        processingQueue.Enqueue(type);
+        processed.Clear();
         while (processingQueue.Any())
         {
             var typeToAnalyze = processingQueue.Dequeue();
             if (!processed.Add(typeToAnalyze.Id))
             {
-                // Since we evaluate both direction in one iteration, an already processed node is added again.
                 continue;
             }
 
@@ -234,6 +270,19 @@ public SearchResult FindFullInheritanceTree(string id)
                 relationships.Add(abstraction);
                 processingQueue.Enqueue(baseType);
             }
+        }
+
+        // Find sub-classes recursive
+        processingQueue.Enqueue(type);
+        processed.Clear();
+        while (processingQueue.Any())
+        {
+            var typeToAnalyze = processingQueue.Dequeue();
+            if (!processed.Add(typeToAnalyze.Id))
+            {
+                // Since we evaluate both direction in one iteration, an already processed node is added again.
+                continue;
+            }
 
             // Case typeToAnalyze is base class: typeToAnalyze is implemented by X or Y inherits from it.
             var specializationsOfAnalyzedType
@@ -379,7 +428,7 @@ private HashSet<Dependency> FindInheritsAndImplementsRelationships()
 
         void Collect(CodeElement c)
         {
-            if (c.ElementType is not (CodeElementType.Class or CodeElementType.Interface))
+            if (c.ElementType is not (CodeElementType.Class or CodeElementType.Interface or CodeElementType.Struct))
             {
                 return;
             }

CSharpCodeAnalyst/Exploration/ICodeGraphExplorer.cs

@@ -8,12 +8,12 @@ public interface ICodeGraphExplorer
     Invocation FindOutgoingCalls(string id);
 
     /// <summary>
-    /// Follows all incoming calls recursively.
+    ///     Follows all incoming calls recursively.
     /// </summary>
     Invocation FindIncomingCallsRecursive(string id);
 
     /// <summary>
-    /// Traces back callers of the given method. Includes also abstractions and their callers
+    ///     Traces back callers of the given method. Includes also abstractions and their callers
     /// </summary>
     SearchResult FollowIncomingCallsRecursive(string id);
 
@@ -39,4 +39,10 @@ public interface ICodeGraphExplorer
     void LoadCodeGraph(CodeGraph graph);
     List<CodeElement> GetElements(List<string> ids);
     SearchResult FindParents(List<string> ids);
+
+    /// <summary>
+    ///     Completes the list of Ids such that at least the containing type is present.
+    ///     If we already have a type the search stops.
+    /// </summary>
+    SearchResult CompleteToContainingTypes(HashSet<string> ids);
 }

CSharpCodeAnalyst/Filter/FilterDialog.xaml.cs

@@ -1,5 +1,6 @@
 using System.Windows;
 using CodeParser.Parser.Config;
+using CSharpCodeAnalyst.Resources;
 
 namespace CSharpCodeAnalyst.Filter;
 
@@ -24,7 +25,7 @@ private void OkButton_Click(object sender, RoutedEventArgs e)
 
         if (expressions.Any(f => f.Contains(";")))
         {
-            MessageBox.Show("Filters cannot contain semicolons (;).", "Invalid Filter", MessageBoxButton.OK,
+            MessageBox.Show(Strings.InvalidFilter_Message, Strings.InvalidFilter_Title, MessageBoxButton.OK,
                 MessageBoxImage.Error);
             return;
         }

CSharpCodeAnalyst/GraphArea/DependencyGraphViewer.cs

@@ -3,7 +3,6 @@
 using System.Runtime.CompilerServices;
 using System.Windows.Controls;
 using System.Windows.Input;
-using CodeParser.Extensions;
 using Contracts.Graph;
 using CSharpCodeAnalyst.Common;
 using CSharpCodeAnalyst.GraphArea.Highlighting;
@@ -20,7 +19,6 @@ namespace CSharpCodeAnalyst.GraphArea;
 ///     Between nodes we can have multiple dependencies if the dependency type is different.
 ///     Dependencies of the same type (i.e a method Calls another multiple times) are handled
 ///     in the parser. In this case the dependency holds all source references.
-///     
 ///     If ever the MSAGL is replaced this is the adapter to re-write.
 /// </summary>
 internal class DependencyGraphViewer : IDependencyGraphViewer, IDependencyGraphBinding, INotifyPropertyChanged
@@ -238,6 +236,32 @@ public bool IsCollapsed(string id)
         return _presentationState.IsCollapsed(id);
     }
 
+    public void LoadSession(List<CodeElement> codeElements, List<Dependency> dependencies, PresentationState state)
+    {
+        if (_msaglViewer is null)
+        {
+            return;
+        }
+
+        Clear();
+        AddToGraphInternal(codeElements, dependencies);
+        _presentationState = state;
+
+        RefreshGraph();
+    }
+
+    public void LoadSession(CodeGraph newGraph, PresentationState? presentationState)
+    {
+        if (presentationState is null)
+        {
+            presentationState = new PresentationState();
+        }
+
+        _presentationState = presentationState;
+        _clonedCodeGraph = newGraph;
+        RefreshGraph();
+    }
+
     public event PropertyChangedEventHandler? PropertyChanged;
 
     private bool IsBoundToPanel()
@@ -421,30 +445,4 @@ private void AddToContextMenuEntries(Node node, ContextMenu contextMenu)
             }
         }
     }
-
-    public void LoadSession(List<CodeElement> codeElements, List<Dependency> dependencies, PresentationState state)
-    {
-        if (_msaglViewer is null)
-        {
-            return;
-        }
-
-        Clear();
-        AddToGraphInternal(codeElements, dependencies);
-        _presentationState = state;
-
-        RefreshGraph();
-    }
-
-    public void LoadSession(CodeGraph newGraph, PresentationState? presentationState)
-    {
-        if (presentationState is null)
-        {
-            presentationState = new PresentationState();
-        }
-
-        _presentationState = presentationState;
-        _clonedCodeGraph = newGraph;
-        RefreshGraph(); 
-    }
 }