Skip to content

Commit b14ca48

Browse files
davidwengierdavidwengier
committed
Remove unnecessary wrapper classes
Guess IVTs have changed since this was written
1 parent 0c6c9de commit b14ca48

File tree

9 files changed

+27
-83
lines changed

9 files changed

+27
-83
lines changed

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentExcerpt/DocumentExcerptHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@ internal static class DocumentExcerptHelper
121121
return builder;
122122
}
123123

124-
public static TextSpan ChooseExcerptSpan(SourceText text, TextSpan span, ExcerptModeInternal mode)
124+
public static TextSpan ChooseExcerptSpan(SourceText text, TextSpan span, RazorExcerptMode mode)
125125
{
126126
var startLine = text.Lines.GetLineFromPosition(span.Start);
127127
var endLine = text.Lines.GetLineFromPosition(span.End);
128128

129-
if (mode == ExcerptModeInternal.Tooltip)
129+
if (mode == RazorExcerptMode.Tooltip)
130130
{
131131
// Expand the range by 3 in each direction (if possible).
132132
var startIndex = Math.Max(startLine.LineNumber - 3, 0);

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentExcerpt/ExcerptModeInternal.cs‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentExcerpt/ExcerptResultInternal.cs‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/RemoteSpanMappingService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected override IRemoteSpanMappingService CreateService(in ServiceArgs args)
6565
var razorDocumentSpan = razorDocumentText.GetTextSpan(mappedSpan.LinePositionSpan);
6666

6767
// First compute the range of text we want to we to display relative to the primary document.
68-
var excerptSpan = DocumentExcerptHelper.ChooseExcerptSpan(razorDocumentText, razorDocumentSpan, (ExcerptModeInternal)mode);
68+
var excerptSpan = DocumentExcerptHelper.ChooseExcerptSpan(razorDocumentText, razorDocumentSpan, mode);
6969

7070
// Then we'll classify the spans based on the primary document, since that's the coordinate
7171
// space that our output mappings use.

‎src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/DocumentExcerptService.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,26 @@
55
using System.Threading.Tasks;
66
using Microsoft.CodeAnalysis;
77
using Microsoft.CodeAnalysis.ExternalAccess.Razor;
8-
using Microsoft.CodeAnalysis.Razor.DocumentExcerpt;
98
using Microsoft.CodeAnalysis.Text;
109

1110
namespace Microsoft.VisualStudio.Razor.DynamicFiles;
1211

1312
internal abstract class DocumentExcerptService : IRazorDocumentExcerptServiceImplementation
1413
{
15-
async Task<RazorExcerptResult?> IRazorDocumentExcerptServiceImplementation.TryExcerptAsync(
14+
Task<RazorExcerptResult?> IRazorDocumentExcerptServiceImplementation.TryExcerptAsync(
1615
Document document,
1716
TextSpan span,
1817
RazorExcerptMode mode,
1918
RazorClassificationOptionsWrapper options,
2019
CancellationToken cancellationToken)
2120
{
22-
var result = await TryGetExcerptInternalAsync(document, span, (ExcerptModeInternal)mode, options, cancellationToken).ConfigureAwait(false);
23-
return result?.ToExcerptResult();
21+
return TryGetExcerptInternalAsync(document, span, mode, options, cancellationToken);
2422
}
2523

26-
internal abstract Task<ExcerptResultInternal?> TryGetExcerptInternalAsync(
24+
internal abstract Task<RazorExcerptResult?> TryGetExcerptInternalAsync(
2725
Document document,
2826
TextSpan span,
29-
ExcerptModeInternal mode,
27+
RazorExcerptMode mode,
3028
RazorClassificationOptionsWrapper options,
3129
CancellationToken cancellationToken);
3230
}

‎src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/RazorDocumentExcerptService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ internal class RazorDocumentExcerptService(
1818
private readonly IDocumentSnapshot _document = document;
1919
private readonly IRazorMappingService _mappingService = mappingService;
2020

21-
internal override async Task<ExcerptResultInternal?> TryGetExcerptInternalAsync(
21+
internal override async Task<RazorExcerptResult?> TryGetExcerptInternalAsync(
2222
Document document,
2323
TextSpan span,
24-
ExcerptModeInternal mode,
24+
RazorExcerptMode mode,
2525
RazorClassificationOptionsWrapper options,
2626
CancellationToken cancellationToken)
2727
{
@@ -63,6 +63,6 @@ internal class RazorDocumentExcerptService(
6363

6464
var excerptText = DocumentExcerptHelper.GetTranslatedExcerptText(razorDocumentText, ref razorDocumentSpan, ref excerptSpan, classifiedSpans);
6565

66-
return new ExcerptResultInternal(excerptText, razorDocumentSpan, classifiedSpans.ToImmutable(), document, span);
66+
return new RazorExcerptResult(excerptText, razorDocumentSpan, classifiedSpans.ToImmutable(), document, span);
6767
}
6868
}

‎src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/CSharpDocumentExcerptService.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ internal CSharpDocumentExcerptService()
4646
{
4747
}
4848

49-
internal override async Task<ExcerptResultInternal?> TryGetExcerptInternalAsync(
49+
internal override async Task<RazorExcerptResult?> TryGetExcerptInternalAsync(
5050
Document document,
5151
TextSpan span,
52-
ExcerptModeInternal mode,
52+
RazorExcerptMode mode,
5353
RazorClassificationOptionsWrapper options,
5454
CancellationToken cancellationToken)
5555
{
@@ -69,10 +69,10 @@ internal CSharpDocumentExcerptService()
6969
cancellationToken).ConfigureAwait(false);
7070
}
7171

72-
internal async Task<ExcerptResultInternal?> TryGetExcerptInternalAsync(
72+
internal async Task<RazorExcerptResult?> TryGetExcerptInternalAsync(
7373
Document document,
7474
TextSpan span,
75-
ExcerptModeInternal mode,
75+
RazorExcerptMode mode,
7676
SourceText razorDocumentText,
7777
LinePositionSpan mappedLinePosition,
7878
RazorClassificationOptionsWrapper options,
@@ -97,7 +97,7 @@ internal CSharpDocumentExcerptService()
9797

9898
var excerptText = DocumentExcerptHelper.GetTranslatedExcerptText(razorDocumentText, ref razorDocumentSpan, ref excerptSpan, classifiedSpans);
9999

100-
return new ExcerptResultInternal(excerptText, razorDocumentSpan, classifiedSpans.ToImmutable(), document, span);
100+
return new RazorExcerptResult(excerptText, razorDocumentSpan, classifiedSpans.ToImmutable(), document, span);
101101
}
102102

103103
private static async Task<ImmutableArray<ClassifiedSpan>.Builder> ClassifyPreviewAsync(

‎src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DynamicFiles/RazorDocumentExcerptServiceTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp()
3434

3535
// Act
3636
var options = RazorClassificationOptionsWrapper.Default;
37-
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.SingleLine, options, DisposalToken);
37+
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, RazorExcerptMode.SingleLine, options, DisposalToken);
3838

3939
// Assert
4040
Assert.NotNull(result);
@@ -112,7 +112,7 @@ public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp_Implic
112112

113113
// Act
114114
var options = RazorClassificationOptionsWrapper.Default;
115-
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.SingleLine, options, DisposalToken);
115+
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, RazorExcerptMode.SingleLine, options, DisposalToken);
116116

117117
// Assert
118118
Assert.NotNull(result);
@@ -165,7 +165,7 @@ public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp_Comple
165165

166166
// Act
167167
var options = RazorClassificationOptionsWrapper.Default;
168-
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.SingleLine, options, DisposalToken);
168+
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, RazorExcerptMode.SingleLine, options, DisposalToken);
169169

170170
// Assert
171171
Assert.NotNull(result);
@@ -272,7 +272,7 @@ than that.
272272

273273
// Act
274274
var options = RazorClassificationOptionsWrapper.Default;
275-
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.Tooltip, options, DisposalToken);
275+
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, RazorExcerptMode.Tooltip, options, DisposalToken);
276276

277277
// Assert
278278
Assert.NotNull(result);
@@ -376,7 +376,7 @@ This is a
376376

377377
// Act
378378
var options = RazorClassificationOptionsWrapper.Default;
379-
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.SingleLine, options, DisposalToken);
379+
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, RazorExcerptMode.SingleLine, options, DisposalToken);
380380

381381
// Assert
382382
Assert.NotNull(result);
@@ -450,7 +450,7 @@ public async Task TryGetExcerptInternalAsync_MultiLine_CanClassifyCSharp()
450450

451451
// Act
452452
var options = RazorClassificationOptionsWrapper.Default;
453-
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.Tooltip, options, DisposalToken);
453+
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, RazorExcerptMode.Tooltip, options, DisposalToken);
454454

455455
// Assert
456456
Assert.NotNull(result);
@@ -559,7 +559,7 @@ public async Task TryGetExcerptInternalAsync_MultiLine_Boundaries_CanClassifyCSh
559559

560560
// Act
561561
var options = RazorClassificationOptionsWrapper.Default;
562-
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.Tooltip, options, DisposalToken);
562+
var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, RazorExcerptMode.Tooltip, options, DisposalToken);
563563

564564
// Assert
565565
// Verifies that the right part of the primary document will be highlighted.

‎src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/CSharpDocumentExcerptServiceTests.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#nullable disable
5-
64
using System.Threading.Tasks;
75
using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
86
using Microsoft.CodeAnalysis.Classification;
97
using Microsoft.CodeAnalysis.ExternalAccess.Razor;
108
using Microsoft.CodeAnalysis.Text;
11-
using Microsoft.VisualStudio.Razor.DynamicFiles;
129
using Xunit;
1310
using Xunit.Abstractions;
1411

@@ -47,7 +44,7 @@ public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp()
4744
var result = await excerptService.TryGetExcerptInternalAsync(
4845
generatedDocument,
4946
generatedSpan,
50-
ExcerptModeInternal.SingleLine,
47+
RazorExcerptMode.SingleLine,
5148
razorSourceText,
5249
mappedLinePositionSpan,
5350
options,
@@ -135,7 +132,7 @@ public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp_Implic
135132
var result = await excerptService.TryGetExcerptInternalAsync(
136133
generatedDocument,
137134
generatedSpan,
138-
ExcerptModeInternal.SingleLine,
135+
RazorExcerptMode.SingleLine,
139136
razorSourceText,
140137
mappedLinePositionSpan,
141138
options,
@@ -181,7 +178,7 @@ public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp_Comple
181178
var result = await excerptService.TryGetExcerptInternalAsync(
182179
generatedDocument,
183180
generatedSpan,
184-
ExcerptModeInternal.SingleLine,
181+
RazorExcerptMode.SingleLine,
185182
razorSourceText,
186183
mappedLinePositionSpan,
187184
options,
@@ -228,7 +225,7 @@ public async Task TryGetExcerptInternalAsync_MultiLine_CanClassifyCSharp()
228225
var result = await excerptService.TryGetExcerptInternalAsync(
229226
generatedDocument,
230227
generatedSpan,
231-
ExcerptModeInternal.Tooltip,
228+
RazorExcerptMode.Tooltip,
232229
razorSourceText,
233230
mappedLinePositionSpan,
234231
options,
@@ -274,7 +271,7 @@ public async Task TryGetExcerptInternalAsync_MultiLine_Boundaries_CanClassifyCSh
274271
var result = await excerptService.TryGetExcerptInternalAsync(
275272
generatedDocument,
276273
generatedSpan,
277-
ExcerptModeInternal.Tooltip,
274+
RazorExcerptMode.Tooltip,
278275
razorSourceText,
279276
mappedLinePositionSpan,
280277
options,

0 commit comments

Comments
 (0)