Skip to content

Commit c4062db

Browse files
Simplify
1 parent 70e036b commit c4062db

File tree

1 file changed

+11
-28
lines changed

1 file changed

+11
-28
lines changed

src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptClassificationService.cs

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,11 @@
1818
namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript;
1919

2020
[ExportLanguageService(typeof(IClassificationService), InternalLanguageNames.TypeScript), Shared]
21-
internal sealed class VSTypeScriptClassificationService : IClassificationService
21+
[method: ImportingConstructor]
22+
[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
23+
internal sealed class VSTypeScriptClassificationService(
24+
[Import(AllowDefault = true)] IVSTypeScriptClassificationService? classificationService) : IClassificationService
2225
{
23-
private readonly IVSTypeScriptClassificationService? _classificationService;
24-
25-
[ImportingConstructor]
26-
[Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
27-
public VSTypeScriptClassificationService(
28-
[Import(AllowDefault = true)] IVSTypeScriptClassificationService? classificationService)
29-
{
30-
_classificationService = classificationService;
31-
}
32-
3326
public void AddLexicalClassifications(SourceText text, TextSpan textSpan, SegmentedList<ClassifiedSpan> result, CancellationToken cancellationToken)
3427
{
3528
}
@@ -39,38 +32,28 @@ public void AddSyntacticClassifications(SolutionServices services, SyntaxNode? r
3932
}
4033

4134
public Task AddSyntacticClassificationsAsync(Document document, ImmutableArray<TextSpan> textSpans, SegmentedList<ClassifiedSpan> result, CancellationToken cancellationToken)
42-
{
43-
return Task.CompletedTask;
44-
}
35+
=> Task.CompletedTask;
4536

4637
public Task AddEmbeddedLanguageClassificationsAsync(Document document, ImmutableArray<TextSpan> textSpans, ClassificationOptions options, SegmentedList<ClassifiedSpan> result, CancellationToken cancellationToken)
47-
{
48-
return Task.CompletedTask;
49-
}
38+
=> Task.CompletedTask;
5039

5140
public ClassifiedSpan AdjustStaleClassification(SourceText text, ClassifiedSpan classifiedSpan)
52-
{
53-
return classifiedSpan;
54-
}
41+
=> classifiedSpan;
5542

5643
public ValueTask<TextChangeRange?> ComputeSyntacticChangeRangeAsync(Document oldDocument, Document newDocument, TimeSpan timeout, CancellationToken cancellationToken)
57-
{
58-
return default;
59-
}
44+
=> default;
6045

6146
public TextChangeRange? ComputeSyntacticChangeRange(SolutionServices workspace, SyntaxNode oldRoot, SyntaxNode newRoot, TimeSpan timeout, CancellationToken cancellationToken)
62-
{
63-
return null;
64-
}
47+
=> null;
6548

6649
public async Task AddSemanticClassificationsAsync(Document document, ImmutableArray<TextSpan> textSpans, ClassificationOptions options, SegmentedList<ClassifiedSpan> result, CancellationToken cancellationToken)
6750
{
68-
if (_classificationService is null)
51+
if (classificationService is null)
6952
return;
7053

7154
using var _ = SharedPools.BigDefault<List<ClassifiedSpan>>().GetPooledObject(out var list);
7255

73-
await _classificationService.AddSemanticClassificationsAsync(document, textSpans, list, cancellationToken).ConfigureAwait(false);
56+
await classificationService.AddSemanticClassificationsAsync(document, textSpans, list, cancellationToken).ConfigureAwait(false);
7457

7558
foreach (var classifiedSpan in list)
7659
result.Add(classifiedSpan);

0 commit comments

Comments
 (0)