Backwards merging

Source/Lib/CompilerServices/C/CLexer.cs

@@ -19,7 +19,7 @@ public CLexer(ResourceUri resourceUri, string sourceText)
         : base(
             resourceUri,
             sourceText,
-            new LexerKeywords(CLanguageFacts.Keywords.ALL_LIST, CLanguageFacts.Keywords.CONTROL_KEYWORDS, ImmutableArray<string>.Empty))
+            new LexerKeywords(CLanguageFacts.Keywords.ALL_LIST, CLanguageFacts.Keywords.CONTROL_KEYWORDS, Array.Empty<string>()))
     {
         _cSyntaxTree = new GenericSyntaxTree(CLanguageDefinition);
     }

Source/Lib/CompilerServices/C/Facts/CLanguageFacts.Keywords.cs

@@ -39,7 +39,7 @@ public class Keywords
         public const string VOLATILE_KEYWORD = "volatile";
         public const string WHILE_KEYWORD = "while";
 
-        public static readonly ImmutableArray<string> ALL_LIST = new[]
+        public static readonly string[] ALL_LIST = new[]
         {
             AUTO_KEYWORD,
             BREAK_KEYWORD,
@@ -73,9 +73,9 @@ public class Keywords
             VOID_KEYWORD,
             VOLATILE_KEYWORD,
             WHILE_KEYWORD,
-        }.ToImmutableArray();
+        };
 
-        public static readonly ImmutableArray<string> CONTROL_KEYWORDS = new[]
+        public static readonly string[] CONTROL_KEYWORDS = new[]
         {
             BREAK_KEYWORD,
             CASE_KEYWORD,
@@ -88,6 +88,6 @@ public class Keywords
             RETURN_KEYWORD,
             SWITCH_KEYWORD,
             WHILE_KEYWORD,
-        }.ToImmutableArray();
+        };
     }
 }

Source/Lib/CompilerServices/CSharp/BinderCase/CSharpBinderSession.cs

@@ -21,6 +21,10 @@ public CSharpBinderSession(
         int globalScopeIndexKey,
         NamespaceStatementNode topLevelNamespaceStatementNode)
     {
+    	#if DEBUG
+    	++LuthetusDebugSomething.BinderSession_ConstructorInvocationCount;
+    	#endif
+
     	ResourceUri = resourceUri;
         Binder = binder;
         CurrentScopeIndexKey = globalScopeIndexKey;
@@ -40,10 +44,9 @@ public CSharpBinderSession(
     public Dictionary<ScopeKeyAndIdentifierText, FunctionDefinitionNode> ScopeFunctionDefinitionMap { get; } = new();
     public Dictionary<ScopeKeyAndIdentifierText, IVariableDeclarationNode> ScopeVariableDeclarationMap { get; } = new();
     public Dictionary<int, TypeClauseNode> ScopeReturnTypeClauseNodeMap { get; } = new();
-
-    IBinder IBinderSession.Binder => Binder;
-    int IBinderSession.CurrentScopeIndexKey { get => CurrentScopeIndexKey; set => CurrentScopeIndexKey = value; }
 
+    IBinder IBinderSession.Binder => Binder;
+
     public int GetNextIndexKey()
     {
     	return ++_indexKey;

Source/Lib/CompilerServices/CSharp/CSharpKeywords.cs

@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using Luthetus.TextEditor.RazorLib.CompilerServices;
 
 namespace Luthetus.CompilerServices.CSharp;
 
@@ -128,7 +129,7 @@ public class CSharpKeywords
     public const string WITH_KEYWORD = "with";
     public const string YIELD_KEYWORD = "yield";
 
-    public static readonly ImmutableArray<string> NON_CONTEXTUAL_KEYWORDS = new[]
+    public static readonly string[] NON_CONTEXTUAL_KEYWORDS = new[]
     {
         ABSTRACT_KEYWORD,
         AS_KEYWORD,
@@ -207,9 +208,9 @@ public class CSharpKeywords
         VOID_KEYWORD,
         VOLATILE_KEYWORD,
         WHILE_KEYWORD,
-    }.ToImmutableArray();
+    };
 
-    public static readonly ImmutableArray<string> CONTROL_KEYWORDS = new[]
+    public static readonly string[] CONTROL_KEYWORDS = new[]
     {
         BREAK_KEYWORD,
         CASE_KEYWORD,
@@ -225,9 +226,9 @@ public class CSharpKeywords
         THROW_KEYWORD,
         WHILE_KEYWORD,
         YIELD_KEYWORD
-    }.ToImmutableArray();
+    };
 
-    public static readonly ImmutableArray<string> CONTEXTUAL_KEYWORDS = new[]
+    public static readonly string[] CONTEXTUAL_KEYWORDS = new[]
     {
         ADD_KEYWORD,
         AND_KEYWORD,
@@ -272,9 +273,16 @@ public class CSharpKeywords
         WHERE_KEYWORD,
         WITH_KEYWORD,
         YIELD_KEYWORD,
-    }.ToImmutableArray();
+    };
 
-    public static readonly ImmutableArray<string> ALL_KEYWORDS = NON_CONTEXTUAL_KEYWORDS
+    public static readonly string[] ALL_KEYWORDS = NON_CONTEXTUAL_KEYWORDS
         .Union(CONTEXTUAL_KEYWORDS)
-        .ToImmutableArray();
+        .ToArray();
+
+    public static readonly HashSet<string> ALL_KEYWORDS_HASH_SET = new(ALL_KEYWORDS);
+
+    public static readonly LexerKeywords LexerKeywords = new LexerKeywords(
+    	NON_CONTEXTUAL_KEYWORDS,
+    	CONTROL_KEYWORDS, 
+    	CONTEXTUAL_KEYWORDS);
 }

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

@@ -0,0 +1,31 @@
+using System.Collections.Immutable;
+using Luthetus.TextEditor.RazorLib.CompilerServices;
+using Luthetus.TextEditor.RazorLib.CompilerServices.Implementations;
+using Luthetus.TextEditor.RazorLib.CompilerServices.Interfaces;
+using Luthetus.TextEditor.RazorLib.CompilerServices.Syntax.Nodes;
+using Luthetus.TextEditor.RazorLib.Lexers.Models;
+using Luthetus.CompilerServices.CSharp.LexerCase;
+using Luthetus.CompilerServices.CSharp.ParserCase;
+using Luthetus.CompilerServices.CSharp.BinderCase;
+
+namespace Luthetus.CompilerServices.CSharp.CompilerServiceCase;
+
+public sealed class CSharpCompilationUnit : ICompilationUnit
+{
+	public CSharpCompilationUnit(
+		ResourceUri resourceUri,
+		CSharpBinder binder)
+	{
+		ResourceUri = resourceUri;
+		Binder = binder;
+	}
+
+	public ResourceUri ResourceUri { get; set; }
+    public CSharpLexer Lexer { get; set; }
+    public CSharpParser Parser { get; set; }
+    public CSharpParserModel ParserModel { get; set; }
+    public CSharpBinder Binder { get; set; }
+    public CSharpBinderSession BinderSession { get; set; }
+    public CodeBlockNode RootCodeBlockNode { get; set; }
+    public ImmutableArray<TextEditorDiagnostic> DiagnosticsList { get; init; }
+}

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

@@ -1,8 +1,13 @@
 using System.Collections.Immutable;
 using Luthetus.Common.RazorLib.Keys.Models;
 using Luthetus.TextEditor.RazorLib;
+using Luthetus.TextEditor.RazorLib.Exceptions;
 using Luthetus.TextEditor.RazorLib.Autocompletes.Models;
+using Luthetus.TextEditor.RazorLib.CompilerServices;
+using Luthetus.TextEditor.RazorLib.CompilerServices.Interfaces;
 using Luthetus.TextEditor.RazorLib.CompilerServices.Implementations;
+using Luthetus.TextEditor.RazorLib.CompilerServices.Facts;
+using Luthetus.TextEditor.RazorLib.CompilerServices.Syntax.Nodes;
 using Luthetus.TextEditor.RazorLib.Cursors.Models;
 using Luthetus.TextEditor.RazorLib.Lexers.Models;
 using Luthetus.TextEditor.RazorLib.TextEditors.Models;
@@ -23,29 +28,23 @@ public sealed class CSharpCompilerService : CompilerService
     public CSharpCompilerService(ITextEditorService textEditorService)
         : base(textEditorService)
     {
-        Binder = CSharpBinder;
-
+    	#if DEBUG
+    	++LuthetusDebugSomething.CompilerService_ConstructorInvocationCount;
+    	#endif
+
+    	Binder = CSharpBinder;
+
         _compilerServiceOptions = new()
         {
             RegisterResourceFunc = resourceUri => new CSharpResource(resourceUri, this),
-            GetLexerFunc = (resource, sourceText) => new CSharpLexer(resource.ResourceUri, sourceText),
-            GetParserFunc = (resource, lexer) => new CSharpParser((CSharpLexer)lexer),
-            GetBinderFunc = (resource, parser) => Binder,
-			OnAfterLexAction = (resource, lexer) =>
-            {
-                var cSharpResource = (CSharpResource)resource;
-                var cSharpLexer = (CSharpLexer)lexer;
-
-                cSharpResource.EscapeCharacterList = cSharpLexer.EscapeCharacterList;
-            },
         };
 
         RuntimeAssembliesLoaderFactory.LoadDotNet6(CSharpBinder);
     }
 
 	public override Type? SymbolRendererType { get; protected set; }
     public override Type? DiagnosticRendererType { get; protected set; }
-
+    
     public event Action? CursorMovedInSyntaxTree;
 
     public void SetSymbolRendererType(Type? symbolRendererType)
@@ -57,6 +56,72 @@ public void SetDiagnosticRendererType(Type? diagnosticRendererType)
     {
     	DiagnosticRendererType = diagnosticRendererType;
     }
+
+    public override Task ParseAsync(ITextEditorEditContext editContext, TextEditorModelModifier modelModifier, bool shouldApplySyntaxHighlighting)
+	{
+		var resourceUri = modelModifier.ResourceUri;
+
+		if (!_resourceMap.ContainsKey(resourceUri))
+			return Task.CompletedTask;
+
+		_textEditorService.ModelApi.StartPendingCalculatePresentationModel(
+			editContext,
+	        modelModifier,
+	        CompilerServiceDiagnosticPresentationFacts.PresentationKey,
+			CompilerServiceDiagnosticPresentationFacts.EmptyPresentationModel);
+
+		var presentationModel = modelModifier.PresentationModelList.First(
+			x => x.TextEditorPresentationKey == CompilerServiceDiagnosticPresentationFacts.PresentationKey);
+
+		var cSharpCompilationUnit = new CSharpCompilationUnit(resourceUri, CSharpBinder);
+		cSharpCompilationUnit.Lexer = new CSharpLexer(resourceUri, presentationModel.PendingCalculation.ContentAtRequest);
+		cSharpCompilationUnit.Lexer.Lex();
+
+		// 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);
+		}
+		finally
+		{
+			lock (_resourceMapLock)
+			{
+				if (_resourceMap.ContainsKey(resourceUri))
+				{
+					var resource = (CSharpResource)_resourceMap[resourceUri];
+
+			        resource.EscapeCharacterList = cSharpCompilationUnit.Lexer.EscapeCharacterList;
+					resource.SyntaxTokenList = cSharpCompilationUnit.Lexer.SyntaxTokenList;
+
+					if (cSharpCompilationUnit is not null)
+						resource.CompilationUnit = cSharpCompilationUnit;
+				}
+			}
+
+			var diagnosticTextSpans = GetDiagnosticsFor(modelModifier.ResourceUri)
+				.Select(x => x.TextSpan)
+				.ToArray();
+
+			modelModifier.CompletePendingCalculatePresentationModel(
+				CompilerServiceDiagnosticPresentationFacts.PresentationKey,
+				CompilerServiceDiagnosticPresentationFacts.EmptyPresentationModel,
+				diagnosticTextSpans);
+
+			if (shouldApplySyntaxHighlighting)
+			{
+				editContext.TextEditorService.ModelApi.ApplySyntaxHighlighting(
+					editContext,
+					modelModifier);
+			}
+
+			OnResourceParsed();
+        }
+
+        return Task.CompletedTask;
+	}
 
     public override List<AutocompleteEntry> GetAutocompleteEntries(string word, TextEditorTextSpan textSpan)
     {
@@ -72,7 +137,7 @@ public override List<AutocompleteEntry> GetAutocompleteEntries(string word, Text
         while (targetScope is not null)
         {
             autocompleteEntryList.AddRange(
-            	CSharpBinder.GetVariableDeclarationNodesByScope(model: null, textSpan.ResourceUri, targetScope.IndexKey)
+            	CSharpBinder.GetVariableDeclarationNodesByScope(compilationUnit: null, textSpan.ResourceUri, targetScope.IndexKey)
             	.Select(x => x.IdentifierToken.TextSpan.GetText())
                 .ToArray()
                 .Where(x => x.Contains(word, StringComparison.InvariantCulture))
@@ -87,7 +152,7 @@ public override List<AutocompleteEntry> GetAutocompleteEntries(string word, Text
                 }));
 
             autocompleteEntryList.AddRange(
-                CSharpBinder.GetFunctionDefinitionNodesByScope(model: null, textSpan.ResourceUri, targetScope.IndexKey)
+                CSharpBinder.GetFunctionDefinitionNodesByScope(compilationUnit: null, textSpan.ResourceUri, targetScope.IndexKey)
             	.Select(x => x.FunctionIdentifierToken.TextSpan.GetText())
                 .ToArray()
                 .Where(x => x.Contains(word, StringComparison.InvariantCulture))
@@ -104,7 +169,7 @@ public override List<AutocompleteEntry> GetAutocompleteEntries(string word, Text
 			if (targetScope.ParentIndexKey is null)
 				targetScope = null;
 			else
-            	targetScope = CSharpBinder.GetScopeByScopeIndexKey(model: null, textSpan.ResourceUri, targetScope.ParentIndexKey.Value);
+            	targetScope = CSharpBinder.GetScopeByScopeIndexKey(compilationUnit: null, textSpan.ResourceUri, targetScope.ParentIndexKey.Value);
         }
 
         var allTypeDefinitions = CSharpBinder.AllTypeDefinitions;

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

@@ -1,19 +1,33 @@
 using System.Collections.Immutable;
 using Luthetus.TextEditor.RazorLib.CompilerServices;
+using Luthetus.TextEditor.RazorLib.CompilerServices.Interfaces;
+using Luthetus.TextEditor.RazorLib.CompilerServices.Syntax;
 using Luthetus.TextEditor.RazorLib.Lexers.Models;
 
 namespace Luthetus.CompilerServices.CSharp.CompilerServiceCase;
 
-public class CSharpResource : CompilerServiceResource
+public sealed class CSharpResource : ICompilerServiceResource
 {
     public CSharpResource(ResourceUri resourceUri, CSharpCompilerService cSharpCompilerService)
-        : base(resourceUri, cSharpCompilerService)
     {
+    	ResourceUri = resourceUri;
+        CompilerService = cSharpCompilerService;
     }
-
+
+	public ResourceUri ResourceUri { get; }
+    public ICompilerService CompilerService { get; }
+	public CSharpCompilationUnit? CompilationUnit { get; set; }
+	public IReadOnlyList<ISyntaxToken> SyntaxTokenList { get; set; } = ImmutableArray<ISyntaxToken>.Empty;
 	public IReadOnlyList<TextEditorTextSpan> EscapeCharacterList { get; internal set; }
-
-	public override IReadOnlyList<TextEditorTextSpan> GetTokenTextSpans()
+
+	ICompilationUnit? ICompilerServiceResource.CompilationUnit => CompilationUnit;
+
+    public IReadOnlyList<ISyntaxToken> GetTokens()
+    {
+        return SyntaxTokenList;
+    }
+
+    public IReadOnlyList<TextEditorTextSpan> GetTokenTextSpans()
     {
 		var tokenTextSpanList = new List<TextEditorTextSpan>();
 
@@ -22,4 +36,30 @@ public override IReadOnlyList<TextEditorTextSpan> GetTokenTextSpans()
 
 		return tokenTextSpanList;
     }
+
+    public IReadOnlyList<ITextEditorSymbol> GetSymbols()
+    {
+        var localCompilationUnit = CompilationUnit;
+
+        if (localCompilationUnit is null)
+            return Array.Empty<ITextEditorSymbol>();
+
+        return localCompilationUnit.Binder.Symbols
+            .Where(s => s.TextSpan.ResourceUri == ResourceUri)
+            .ToArray();
+    }
+
+    public IReadOnlyList<TextEditorDiagnostic> GetDiagnostics()
+    {
+        var localCompilationUnit = CompilationUnit;
+
+        if (localCompilationUnit is null)
+            return Array.Empty<TextEditorDiagnostic>();
+
+		// TODO: (2024-12-12)
+        /*return localCompilationUnit.DiagnosticsList
+            .Where(s => s.TextSpan.ResourceUri == ResourceUri)
+            .ToArray();*/
+        return Array.Empty<TextEditorDiagnostic>();
+    }
 }