Backwards Merging

README.md

@@ -2,8 +2,8 @@
 ![Example GIF](./Images/Ide/Gifs/9.5.1BetterGif.gif)
 Gif length is 1 minute 35 seconds
 
-![Example GIF](./Images/Ide/memory0_9_7_2_AfterGarbageCollection.png)
-Memory usage after parsing the entirety of Luthetus.Ide.sln with its own - from scratch - C# parser (v0.9.7.2)
+![Example GIF](./Images/Ide/memoryToday.png)
+Only 362 MB Memory usage after opening the source code in a published executable of itself and parsing the entire solution with its own - from scratch - C# parser (v0.9.7.4)
 
 ## Demo:
 https://luthetus.github.io/Luthetus.Ide/

Source/Lib/Common/Luthetus.Common.RazorLib.csproj

@@ -7,7 +7,7 @@
         <Product>Luthetus Common</Product>
         <Description>A repository containing Blazor Components I've made which I commonly use in other projects.</Description>
         <PackageId>Luthetus.Common</PackageId>
-        <Version>3.3.0</Version>
+        <Version>3.4.0</Version>
         <Authors>Hunter Freeman</Authors>
         <Company />
         <PackageTags>DotNet CSharp Blazor RazorComponents</PackageTags>

Source/Lib/Common/Reactives/Displays/ProgressBarDisplay.razor

@@ -23,7 +23,11 @@
     		fillWidthInPercentage -= cancelButtonWidthInPercentage;
     }
 
-    <div style="display: flex;">
+    <div class="luth_progress-bar-time-elapsed">
+		@($"{localProgressBarModel.GetTimeElapsed().TotalSeconds:N3}") seconds
+	</div>
+
+    <div class="luth_progress-bar" style="display: flex;">
     	<div class="luth_progress-bar-fill"
 	         style="position: relative; height: 2em; width: @(fillWidthInPercentage)%;">
 
@@ -65,7 +69,6 @@
 			</div>
 		}
     </div>
-
 
 	@if (!string.IsNullOrWhiteSpace(localProgressBarModel.Message))
 	{

Source/Lib/Common/Reactives/Models/ProgressBarModel.cs

@@ -20,13 +20,17 @@ public ProgressBarModel(double decimalPercentProgress, string? message)
 	{
 		DecimalPercentProgress = decimalPercentProgress;
 		Message = message;
+
+		DateTimeStart = DateTime.UtcNow;
 	}
 
 	private Task? _cancelTask;
 
 	public double DecimalPercentProgress { get; private set; }
 	public string? Message { get; private set; }
 	public string? SecondaryMessage { get; private set; }
+	public DateTime DateTimeStart { get; set; }
+	public DateTime? DateTimeEnd { get; set; }
 	public bool IsCancellable => OnCancelFunc is not null;
 	public bool IsCancelled { get; set; }
 	public bool IntentToCancel { get; private set; }
@@ -107,12 +111,18 @@ public void Cancel()
 			}
 		});
 	}
+
+	public TimeSpan GetTimeElapsed()
+	{
+		return (DateTimeEnd ?? DateTime.UtcNow) - DateTimeStart;
+	}
 
 	public void Dispose()
 	{
 		lock (_progressLock)
 		{
 			IsDisposed = true;
+			DateTimeEnd = DateTime.UtcNow;
 			ProgressChanged?.Invoke(true);
 		}
 	}

Source/Lib/CompilerServices/CSharp/BinderCase/CSharpBinder.Main.cs

@@ -46,45 +46,39 @@ public CSharpBinder()
         // _boundScopes.Add(_globalScope.ResourceUri, new List<IScope> { _globalScope });
     }
 
-    public ImmutableDictionary<string, NamespaceGroupNode> NamespaceGroupNodes => _namespaceGroupNodeMap.ToImmutableDictionary();
-    public ImmutableArray<ISymbol> Symbols => _symbolDefinitions.Values.SelectMany(x => x.SymbolReferences).Select(x => x.Symbol).ToImmutableArray();
+    public IReadOnlyDictionary<string, NamespaceGroupNode> NamespaceGroupNodes => _namespaceGroupNodeMap;
+    public ITextEditorSymbol[] Symbols => _symbolDefinitions.Values.SelectMany(x => x.SymbolReferences).Select(x => x.Symbol).ToArray();
     public Dictionary<string, SymbolDefinition> SymbolDefinitions => _symbolDefinitions;
-    public ImmutableDictionary<NamespaceAndTypeIdentifiers, TypeDefinitionNode> AllTypeDefinitions => _allTypeDefinitions.ToImmutableDictionary();
-    public ImmutableArray<TextEditorDiagnostic> DiagnosticsList => ImmutableArray<TextEditorDiagnostic>.Empty;
+    public IReadOnlyDictionary<NamespaceAndTypeIdentifiers, TypeDefinitionNode> AllTypeDefinitions => _allTypeDefinitions;
+    public TextEditorDiagnostic[] DiagnosticsList => Array.Empty<TextEditorDiagnostic>();
 
-    ImmutableArray<ITextEditorSymbol> IBinder.SymbolsList => Symbols
-        .Select(s => (ITextEditorSymbol)s)
-        .ToImmutableArray();
+    ITextEditorSymbol[] IBinder.SymbolsList => Symbols;
 
 	/// <summary><see cref="FinalizeBinderSession"/></summary>
     public IBinderSession StartBinderSession(ResourceUri resourceUri)
     {
     	foreach (var namespaceGroupNodeKvp in _namespaceGroupNodeMap)
         {
-            var keepStatements = namespaceGroupNodeKvp.Value.NamespaceStatementNodeList
-                .Where(x => x.IdentifierToken.TextSpan.ResourceUri != resourceUri)
-                .ToImmutableArray();
-
-            _namespaceGroupNodeMap[namespaceGroupNodeKvp.Key] =
-                new NamespaceGroupNode(
-                    namespaceGroupNodeKvp.Value.NamespaceString,
-                    keepStatements);
+        	for (int i = namespaceGroupNodeKvp.Value.NamespaceStatementNodeList.Count - 1; i >= 0; i--)
+        	{
+        		var x = namespaceGroupNodeKvp.Value.NamespaceStatementNodeList[i];
+
+        		if (x.IdentifierToken.TextSpan.ResourceUri == resourceUri)
+        			namespaceGroupNodeKvp.Value.NamespaceStatementNodeList.RemoveAt(i);
+        	}
         }
 
         foreach (var symbolDefinition in _symbolDefinitions)
         {
-            var keep = symbolDefinition.Value.SymbolReferences
-                .Where(x => x.Symbol.TextSpan.ResourceUri != resourceUri)
-                .ToList();
-
-            _symbolDefinitions[symbolDefinition.Key] =
-                symbolDefinition.Value with
-                {
-                    SymbolReferences = keep
-                };
+            for (int i = symbolDefinition.Value.SymbolReferences.Count - 1; i >= 0; i--)
+        	{
+        		var x = symbolDefinition.Value.SymbolReferences[i];
+
+        		if (x.Symbol.TextSpan.ResourceUri == resourceUri)
+        			symbolDefinition.Value.SymbolReferences.RemoveAt(i);
+        	}
         }
 
-    	// TODO: Why '_globalScope.IndexKey'? Shouldn't this just be 0, its starting the counter fresh?
         var cSharpBinderSession = new CSharpBinderSession(
             resourceUri,
             this,
@@ -330,9 +324,8 @@ public void BindNamespaceStatementNode(
 
         if (_namespaceGroupNodeMap.TryGetValue(namespaceString, out var inNamespaceGroupNode))
         {
-            var outNamespaceStatementNodeList = inNamespaceGroupNode.NamespaceStatementNodeList
-                .Add(namespaceStatementNode)
-                .ToImmutableArray();
+        	var outNamespaceStatementNodeList = new List<NamespaceStatementNode>(inNamespaceGroupNode.NamespaceStatementNodeList);
+            outNamespaceStatementNodeList.Add(namespaceStatementNode);
 
             var outNamespaceGroupNode = new NamespaceGroupNode(
                 inNamespaceGroupNode.NamespaceString,
@@ -344,7 +337,7 @@ public void BindNamespaceStatementNode(
         {
             _namespaceGroupNodeMap.Add(namespaceString, new NamespaceGroupNode(
                 namespaceString,
-                new NamespaceStatementNode[] { namespaceStatementNode }.ToImmutableArray()));
+                new List<NamespaceStatementNode> { namespaceStatementNode }));
         }
     }
 
@@ -872,7 +865,7 @@ public void ClearStateByResourceUri(ResourceUri resourceUri)
         {
             var keepStatements = namespaceGroupNodeKvp.Value.NamespaceStatementNodeList
                 .Where(x => x.IdentifierToken.TextSpan.ResourceUri != resourceUri)
-                .ToImmutableArray();
+                .ToList();
 
             _namespaceGroupNodeMap[namespaceGroupNodeKvp.Key] =
                 new NamespaceGroupNode(

Source/Lib/CompilerServices/CSharp/CompilerServiceCase/CSharpCompilerService.cs

@@ -58,12 +58,12 @@ public void SetDiagnosticRendererType(Type? diagnosticRendererType)
     	DiagnosticRendererType = diagnosticRendererType;
     }
 
-    public override ImmutableArray<AutocompleteEntry> GetAutocompleteEntries(string word, TextEditorTextSpan textSpan)
+    public override List<AutocompleteEntry> GetAutocompleteEntries(string word, TextEditorTextSpan textSpan)
     {
         var boundScope = CSharpBinder.GetScope(null, textSpan);
 
         if (boundScope is null)
-            return ImmutableArray<AutocompleteEntry>.Empty;
+            return base._emptyAutocompleteEntryList;
 
         var autocompleteEntryList = new List<AutocompleteEntry>();
 
@@ -191,7 +191,7 @@ public override ImmutableArray<AutocompleteEntry> GetAutocompleteEntries(string
 
         AddSnippets(autocompleteEntryList, word, textSpan);
 
-        return autocompleteEntryList.DistinctBy(x => x.DisplayName).ToImmutableArray();
+        return autocompleteEntryList.DistinctBy(x => x.DisplayName).ToList();
     }
 
     private void AddSnippets(List<AutocompleteEntry> autocompleteEntryList, string word, TextEditorTextSpan textSpan)

Source/Lib/CompilerServices/CSharp/CompilerServiceCase/CSharpResource.cs

@@ -11,15 +11,15 @@ public CSharpResource(ResourceUri resourceUri, CSharpCompilerService cSharpCompi
     {
     }
 
-	public ImmutableArray<TextEditorTextSpan> EscapeCharacterList { get; internal set; }
+	public IReadOnlyList<TextEditorTextSpan> EscapeCharacterList { get; internal set; }
 
-	public override ImmutableArray<TextEditorTextSpan> GetTokenTextSpans()
+	public override IReadOnlyList<TextEditorTextSpan> GetTokenTextSpans()
     {
 		var tokenTextSpanList = new List<TextEditorTextSpan>();
 
         tokenTextSpanList.AddRange(SyntaxTokenList.Select(st => st.TextSpan));
 		tokenTextSpanList.AddRange(EscapeCharacterList);
 
-		return tokenTextSpanList.ToImmutableArray();
+		return tokenTextSpanList;
     }
 }

Source/Lib/CompilerServices/CSharp/Facts/CSharpFacts.Namespaces.cs

@@ -21,13 +21,13 @@ public static Dictionary<string, NamespaceGroupNode> GetInitialBoundNamespaceSta
                 {
                     SystemNamespaceIdentifier,
                     new NamespaceGroupNode(SystemNamespaceIdentifier,
-                        new NamespaceStatementNode[] 
+                        new List<NamespaceStatementNode>
                         {
                             new NamespaceStatementNode(
                                 new(new(0, 0, 0, ResourceUri.Empty, string.Empty), SyntaxKind.UnrecognizedTokenKeyword),
                                 new(new(0, SystemNamespaceIdentifier.Length, 0, ResourceUri.Empty, SystemNamespaceIdentifier)),
-                                new CodeBlockNode(ImmutableArray<ISyntax>.Empty))
-                        }.ToImmutableArray())
+                                new CodeBlockNode(Array.Empty<ISyntax>()))
+                        })
                 }
             };
         }
@@ -37,7 +37,7 @@ public static NamespaceStatementNode GetTopLevelNamespaceStatementNode()
             return new NamespaceStatementNode(
                 new(new(0, 0, 0, ResourceUri.Empty, string.Empty), SyntaxKind.UnrecognizedTokenKeyword),
                 new(new(0, TopLevelNamespaceIdentifier.Length, 0, ResourceUri.Empty, TopLevelNamespaceIdentifier)),
-                new CodeBlockNode(ImmutableArray<ISyntax>.Empty));
+                new CodeBlockNode(Array.Empty<ISyntax>()));
         }
     }
 }