Merge pull request #371 from Luthetus/staging

Staging
Luthetus · Dec 14, 2024 · 15f46f5 · 15f46f5
2 parents 6d83c08 + 520047f
commit 15f46f5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/Source/Lib/CompilerServices/Razor/CompilerServiceCase/RazorResource.cs b/Source/Lib/CompilerServices/Razor/CompilerServiceCase/RazorResource.cs
@@ -32,9 +32,9 @@ public override IReadOnlyList<ITextEditorSymbol> GetSymbols()
         if (localRazorSyntaxTree?.SemanticResultRazor is null)
             return Array.Empty<ITextEditorSymbol>();
 
-        var symbols = ((CompilationUnit)localRazorSyntaxTree.SemanticResultRazor.CompilationUnit)
+        var symbols = localRazorSyntaxTree.SemanticResultRazor.CompilationUnit
             .Binder
-            .SymbolsList;
+            .Symbols;
 
         var originalText = _textEditorService.ModelApi.GetAllText(ResourceUri);
 

diff --git a/Source/Lib/CompilerServices/Razor/CompilerServiceCase/SemanticResultRazor.cs b/Source/Lib/CompilerServices/Razor/CompilerServiceCase/SemanticResultRazor.cs
@@ -3,6 +3,7 @@
 using Luthetus.TextEditor.RazorLib.CompilerServices.Interfaces;
 using Luthetus.TextEditor.RazorLib.CompilerServices.Syntax.Nodes;
 using Luthetus.TextEditor.RazorLib.Lexers.Models;
+using Luthetus.CompilerServices.CSharp.CompilerServiceCase;
 
 namespace Luthetus.CompilerServices.Razor.CompilerServiceCase;
 
@@ -27,7 +28,7 @@ public record SemanticResultRazor
     /// diagnostics, on hover tooltips, etc...
     /// </summary>
     public SemanticResultRazor(
-        ICompilationUnit compilationUnit,
+        CSharpCompilationUnit compilationUnit,
         List<AdhocTextInsertion> codebehindClassInsertions,
         List<AdhocTextInsertion> codebehindRenderFunctionInsertions,
         AdhocTextInsertion adhocTextInsertionOfTheRenderFunctionItselfIntoTheCodebehindClass,
@@ -40,7 +41,7 @@ public SemanticResultRazor(
         ClassContents = classContents;
     }
 
-    public ICompilationUnit CompilationUnit { get; }
+    public CSharpCompilationUnit CompilationUnit { get; }
     public List<AdhocTextInsertion> CodebehindClassInsertions { get; }
     public List<AdhocTextInsertion> CodebehindRenderFunctionInsertions { get; }
     public AdhocTextInsertion AdhocTextInsertionOfTheRenderFunctionItselfIntoTheCodebehindClass { get; }

diff --git a/Source/Lib/CompilerServices/Razor/RazorSyntaxTree.cs b/Source/Lib/CompilerServices/Razor/RazorSyntaxTree.cs
@@ -109,17 +109,23 @@ public void ParseCodebehind()
 
         lexer.Lex();
 
-		// TODO: (2024-12-12)
-        /*var parser = new CSharpParser(lexer);
-
-        var compilationUnit = parser.Parse(new CSharpBinder(), lexer.ResourceUri);
+        var compilationUnit = new CSharpCompilationUnit(
+        	_codebehindResourceUri,
+			new CSharpBinder());
+
+		compilationUnit.Lexer = lexer;
+
+		compilationUnit.BinderSession = (CSharpBinderSession)compilationUnit.Binder.StartBinderSession(_codebehindResourceUri);
+
+		var parser = new CSharpParser();
+        parser.Parse(compilationUnit);
 
         SemanticResultRazor = new SemanticResultRazor(
             compilationUnit,
             _codebehindClassInsertions,
             _codebehindRenderFunctionInsertions,
             renderFunctionAdhocTextInsertion,
-            classContents);*/
+            classContents);
     }
 
     /// <summary>currentCharacterIn:<br/> -<see cref="InjectedLanguageDefinition.TransitionSubstring"/><br/></summary>

diff --git a/Source/Lib/Ide/Ide.RazorLib/Luthetus.Ide.RazorLib.csproj b/Source/Lib/Ide/Ide.RazorLib/Luthetus.Ide.RazorLib.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>0.9.7.6</Version>
+        <Version>0.9.7.7</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Source/Lib/Ide/Ide.RazorLib/Shareds/Displays/Internals/IdeInfoDisplay.razor b/Source/Lib/Ide/Ide.RazorLib/Shareds/Displays/Internals/IdeInfoDisplay.razor
@@ -172,6 +172,12 @@
         Recent Changes:
 		<div>
 			<div>
+                <div>v <em class="luth_em">0.9.7.7 </em> (WIP_DATE)</div>
+                <ul>
+					<li>WIP_DESCRIPTION</li>
+                </ul>
+            </div>
+            <div>
                 <div>v <em class="luth_em">0.9.7.6 </em> (2024-12-13)</div>
                 <ul>
 					<li>Solution wide parse is 40% faster.</li>