github/SharpIDE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix more razor symbol hovers

Browse Source
This commit is contained in:
Matt Parker
2025-10-27 18:21:01 +10:00
parent bb2805f1e5
commit c4f46320f7
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs
View File

@@ -725,9 +725,10 @@ public class RoslynAnalysis(ILogger<RoslynAnalysis> logger, BuildService buildSe
var generatedDocSyntaxRoot = await generatedDocument.GetSyntaxRootAsync(cancellationToken); var generatedDocSyntaxRoot = await generatedDocument.GetSyntaxRootAsync(cancellationToken);
var razorText = await additionalDocument.GetTextAsync(cancellationToken); var razorText = await additionalDocument.GetTextAsync(cancellationToken);
var razorAbsoluteIndex = razorText.Lines.GetPosition(linePosition);
var mappedPosition = MapRazorLinePositionToGeneratedCSharpAbsolutePosition(razorCSharpDocument, razorText, linePosition); var mappedPosition = MapRazorLinePositionToGeneratedCSharpAbsolutePosition(razorCSharpDocument, razorAbsoluteIndex);
if (mappedPosition is null) return (null, null); if (mappedPosition is null) return (null, null);
var semanticModelAsync = await generatedDocument.GetSemanticModelAsync(cancellationToken); var semanticModelAsync = await generatedDocument.GetSemanticModelAsync(cancellationToken);
var (symbol, linePositionSpan) = GetSymbolAtPosition(semanticModelAsync!, generatedDocSyntaxRoot!, mappedPosition!.Value); var (symbol, linePositionSpan) = GetSymbolAtPosition(semanticModelAsync!, generatedDocSyntaxRoot!, mappedPosition!.Value);
if (symbol is null || linePositionSpan is null) return (null, null); if (symbol is null || linePositionSpan is null) return (null, null);
@@ -783,8 +784,9 @@ public class RoslynAnalysis(ILogger<RoslynAnalysis> logger, BuildService buildSe
var generatedDocSyntaxRoot = await generatedDocument.GetSyntaxRootAsync(cancellationToken); var generatedDocSyntaxRoot = await generatedDocument.GetSyntaxRootAsync(cancellationToken);
var razorText = await additionalDocument.GetTextAsync(cancellationToken); var razorText = await additionalDocument.GetTextAsync(cancellationToken);
var razorAbsoluteIndex = razorText.Lines.GetPosition(linePosition);
var mappedPosition = MapRazorLinePositionToGeneratedCSharpAbsolutePosition(razorCSharpDocument, razorAbsoluteIndex);
var mappedPosition = MapRazorLinePositionToGeneratedCSharpAbsolutePosition(razorCSharpDocument, razorText, linePosition);
var semanticModel = await generatedDocument.GetSemanticModelAsync(cancellationToken); var semanticModel = await generatedDocument.GetSemanticModelAsync(cancellationToken);
var (symbol, linePositionSpan) = GetSymbolAtPosition(semanticModel!, generatedDocSyntaxRoot!, mappedPosition!.Value); var (symbol, linePositionSpan) = GetSymbolAtPosition(semanticModel!, generatedDocSyntaxRoot!, mappedPosition!.Value);
@@ -817,6 +819,9 @@ public class RoslynAnalysis(ILogger<RoslynAnalysis> logger, BuildService buildSe
VariableDeclaratorSyntax variableDecl => variableDecl.Identifier.Span, VariableDeclaratorSyntax variableDecl => variableDecl.Identifier.Span,
AccessorDeclarationSyntax accessorDecl => accessorDecl.Keyword.Span, AccessorDeclarationSyntax accessorDecl => accessorDecl.Keyword.Span,
IndexerDeclarationSyntax indexerDecl => indexerDecl.ThisKeyword.Span, IndexerDeclarationSyntax indexerDecl => indexerDecl.ThisKeyword.Span,
GenericNameSyntax genericDecl => genericDecl.Identifier.Span,
IdentifierNameSyntax identifierDecl => identifierDecl.Identifier.Span,
_ => node.Span _ => node.Span
}; };
@@ -825,21 +830,11 @@ public class RoslynAnalysis(ILogger<RoslynAnalysis> logger, BuildService buildSe
return (symbol, linePositionSpan); return (symbol, linePositionSpan);
} }
private static int? MapRazorLinePositionToGeneratedCSharpAbsolutePosition(RazorCSharpDocument razorCSharpDocument, SourceText razorText, LinePosition razorLinePosition) private static int? MapRazorLinePositionToGeneratedCSharpAbsolutePosition(RazorCSharpDocument razorCSharpDocument, int razorAbsoluteIndex)
{ {
var mappings = razorCSharpDocument.SourceMappings; if (_documentMappingService!.TryMapToCSharpDocumentPosition(razorCSharpDocument, razorAbsoluteIndex, out var csharpPosition, out var csharpIndex))
var razorOffset = razorText.Lines.GetPosition(razorLinePosition);
foreach (var mapping in mappings)
{ {
var span = mapping.OriginalSpan; return csharpIndex;
if (razorOffset >= span.AbsoluteIndex && razorOffset < span.AbsoluteIndex + span.Length)
{
// Calculate offset within the mapping
var offsetInMapping = razorOffset - span.AbsoluteIndex;
// Map to generated C# position
return mapping.GeneratedSpan.AbsoluteIndex + offsetInMapping;
}
} }
return null; return null;
} }