Merge pull request #375 from Luthetus/staging

Staging

README.md

@@ -1,9 +1,12 @@
 # Luthetus.Ide (In Development)
 ![Example GIF](./Images/Ide/Gifs/9.5.1BetterGif.gif)
-Gif length is 1 minute 35 seconds
+The above Gif length is 1 minute 35 seconds
 
-![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)
+![Example GIF](./Images/Ide/Gifs/parseSolutionWideUpdated.gif)
+
+Only 287.1 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.7)
+
+The gif is sped up by cutting the frames in half.
 
 ## Demo:
 https://luthetus.github.io/Luthetus.Ide/

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

@@ -21,11 +21,13 @@ public CSharpCompilationUnit(
 	}
 
 	public ResourceUri ResourceUri { get; set; }
-    public CSharpLexer Lexer { get; set; }
-    public CSharpParser Parser { get; set; }
-    public CSharpParserModel ParserModel { get; set; }
+    public CSharpLexerOutput LexerOutput { get; set; }
     public CSharpBinder Binder { get; set; }
     public CSharpBinderSession BinderSession { get; set; }
     public CodeBlockNode RootCodeBlockNode { get; set; }
+
+    /// <summary>
+    /// This seems to no longer get set (noticed this on 2024-12-14).
+    /// </summary>
     public ImmutableArray<TextEditorDiagnostic> DiagnosticsList { get; init; }
-}
+}

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

@@ -74,16 +74,15 @@ public override Task ParseAsync(ITextEditorEditContext editContext, TextEditorMo
 			x => x.TextEditorPresentationKey == CompilerServiceDiagnosticPresentationFacts.PresentationKey);
 
 		var cSharpCompilationUnit = new CSharpCompilationUnit(resourceUri, CSharpBinder);
-		cSharpCompilationUnit.Lexer = new CSharpLexer(resourceUri, presentationModel.PendingCalculation.ContentAtRequest);
-		cSharpCompilationUnit.Lexer.Lex();
+
+		cSharpCompilationUnit.LexerOutput = CSharpLexer.Lex(resourceUri, presentationModel.PendingCalculation.ContentAtRequest);
 
 		// Even if the parser throws an exception, be sure to
 		// make use of the Lexer to do whatever syntax highlighting is possible.
 		try
 		{
 			cSharpCompilationUnit.BinderSession = (CSharpBinderSession)CSharpBinder.StartBinderSession(resourceUri);
-			var parser = new CSharpParser();
-			parser.Parse(cSharpCompilationUnit);
+			CSharpParser.Parse(cSharpCompilationUnit);
 		}
 		finally
 		{
@@ -93,8 +92,8 @@ public override Task ParseAsync(ITextEditorEditContext editContext, TextEditorMo
 				{
 					var resource = (CSharpResource)_resourceMap[resourceUri];
 
-			        resource.EscapeCharacterList = cSharpCompilationUnit.Lexer.EscapeCharacterList;
-					resource.SyntaxTokenList = cSharpCompilationUnit.Lexer.SyntaxTokenList;
+			        resource.EscapeCharacterList = cSharpCompilationUnit.LexerOutput.EscapeCharacterList;
+					resource.SyntaxTokenList = cSharpCompilationUnit.LexerOutput.SyntaxTokenList;
 
 					if (cSharpCompilationUnit is not null)
 						resource.CompilationUnit = cSharpCompilationUnit;

Source/Lib/CompilerServices/CSharp/LexerCase/CSharpLexerOutput.cs

@@ -0,0 +1,23 @@
+using Luthetus.TextEditor.RazorLib.CompilerServices;
+using Luthetus.TextEditor.RazorLib.CompilerServices.Syntax;
+using Luthetus.TextEditor.RazorLib.Lexers.Models;
+
+namespace Luthetus.CompilerServices.CSharp.LexerCase;
+
+public struct CSharpLexerOutput
+{
+	public CSharpLexerOutput()
+    {
+    	#if DEBUG
+    	++LuthetusDebugSomething.Lexer_ConstructorInvocationCount;
+    	#endif
+
+    	SyntaxTokenList = new();
+    	EscapeCharacterList = new();
+    	DiagnosticBag = new();
+    }
+
+    public List<ISyntaxToken> SyntaxTokenList { get; }
+    public List<TextEditorTextSpan> EscapeCharacterList { get; }
+    public DiagnosticBag DiagnosticBag { get; }
+}

Source/Lib/CompilerServices/CSharp/ParserCase/CSharpDeferredChildScope.cs

@@ -23,19 +23,19 @@ public CSharpDeferredChildScope(
 
 	public int TokenIndexToRestore { get; private set; }
 
-	public void PrepareMainParserLoop(int tokenIndexToRestore, CSharpCompilationUnit compilationUnit)
+	public void PrepareMainParserLoop(int tokenIndexToRestore, CSharpCompilationUnit compilationUnit, ref CSharpParserModel parserModel)
 	{
 		TokenIndexToRestore = tokenIndexToRestore;
-		compilationUnit.ParserModel.CurrentCodeBlockBuilder.PermitInnerPendingCodeBlockOwnerToBeParsed = true;
+		parserModel.CurrentCodeBlockBuilder.PermitInnerPendingCodeBlockOwnerToBeParsed = true;
 
-		compilationUnit.ParserModel.CurrentCodeBlockBuilder.DequeuedIndexForChildList = null;
+		parserModel.CurrentCodeBlockBuilder.DequeuedIndexForChildList = null;
 
-		compilationUnit.ParserModel.TokenWalker.DeferredParsing(
+		parserModel.TokenWalker.DeferredParsing(
 			OpenTokenIndex,
 			CloseTokenIndex,
 			TokenIndexToRestore);
 
-		compilationUnit.ParserModel.SyntaxStack.Push(PendingCodeBlockOwner);
-		compilationUnit.ParserModel.CurrentCodeBlockBuilder.InnerPendingCodeBlockOwner = PendingCodeBlockOwner;
+		parserModel.SyntaxStack.Push(PendingCodeBlockOwner);
+		parserModel.CurrentCodeBlockBuilder.InnerPendingCodeBlockOwner = PendingCodeBlockOwner;
 	}
 }