From d5567cf32a6ce9e8ecb2973f5e22a70d4dd24a54 Mon Sep 17 00:00:00 2001 From: Matt Parker <61717342+MattParkerDev@users.noreply.github.com> Date: Fri, 17 Oct 2025 23:22:20 +1000 Subject: [PATCH] simplify razor classified spans --- .../Features/Analysis/RoslynAnalysis.cs | 2 +- src/SharpIDE.RazorAccess/RazorAccessors.cs | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs b/src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs index b7ed562..900c2d0 100644 --- a/src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs +++ b/src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs @@ -396,7 +396,7 @@ public static class RoslynAnalysis // return span; // }).ToList(); //var test = _semanticTokensLegendService.TokenTypes.All; - var (razorSpans, sourceMappings) = RazorAccessors.GetSpansAndMappingsForRazorCodeDocument(razorCodeDocument, razorCSharpDocument); + var sourceMappings = razorCSharpDocument.SourceMappings.Select(s => s.ToSharpIdeSourceMapping()).ToImmutableArray(); List sharpIdeRazorSpans = []; var classifiedSpans = await Classifier.GetClassifiedSpansAsync(generatedDocument, generatedDocSyntaxRoot!.FullSpan, cancellationToken); diff --git a/src/SharpIDE.RazorAccess/RazorAccessors.cs b/src/SharpIDE.RazorAccess/RazorAccessors.cs index 00bf702..e83feb2 100644 --- a/src/SharpIDE.RazorAccess/RazorAccessors.cs +++ b/src/SharpIDE.RazorAccess/RazorAccessors.cs @@ -9,6 +9,7 @@ public static class RazorAccessors { //private static RazorProjectEngine? _razorProjectEngine; + // I didn't end up using the Razor ClassifiedSpans public static (ImmutableArray, List) GetSpansAndMappingsForRazorCodeDocument(RazorCodeDocument razorCodeDocument, RazorCSharpDocument razorCSharpDocument) { var razorSpans = RazorCodeDocumentExtensions.GetClassifiedSpans(razorCodeDocument); @@ -18,11 +19,11 @@ public static class RazorAccessors return result; } - public static ImmutableArray GetClassifiedSpansForRazorCodeDocument(RazorCodeDocument razorCodeDocument) - { - var razorSpans = RazorCodeDocumentExtensions.GetClassifiedSpans(razorCodeDocument); - return razorSpans; - } + // public static ImmutableArray GetClassifiedSpansForRazorCodeDocument(RazorCodeDocument razorCodeDocument) + // { + // var razorSpans = RazorCodeDocumentExtensions.GetClassifiedSpans(razorCodeDocument); + // return razorSpans; + // } // public static (ImmutableArray, SourceText Text, List) GetClassifiedSpans(SourceText sourceText, SourceText importsSourceText, string razorDocumentFilePath, string projectDirectory) // {