Skip to content

Commit 31e51c4

Browse files
Use auto properties in Microsoft.CodeAnalysis.EditorFeatures
1 parent 6e393ce commit 31e51c4

File tree

8 files changed

+72
-97
lines changed

8 files changed

+72
-97
lines changed

src/EditorFeatures/Core/CodeActions/CodeActionEditHandlerService.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ internal class CodeActionEditHandlerService(
3636
private readonly IThreadingContext _threadingContext = threadingContext;
3737
private readonly IPreviewFactoryService _previewService = previewService;
3838
private readonly IInlineRenameService _renameService = renameService;
39-
private readonly ITextBufferAssociatedViewService _associatedViewService = associatedViewService;
4039

41-
public ITextBufferAssociatedViewService AssociatedViewService => _associatedViewService;
40+
public ITextBufferAssociatedViewService AssociatedViewService { get; } = associatedViewService;
4241

4342
public async Task<SolutionPreviewResult?> GetPreviewsAsync(
4443
Workspace workspace, ImmutableArray<CodeActionOperation> operations, CancellationToken cancellationToken)

src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/VSTypeScriptGlobalOptions.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,20 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api;
1616
[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
1717
internal sealed class VSTypeScriptGlobalOptions(IGlobalOptionService globalOptions)
1818
{
19-
private readonly IGlobalOptionService _globalOptions = globalOptions;
20-
2119
public bool BlockForCompletionItems
2220
{
23-
get => _globalOptions.GetOption(CompletionViewOptionsStorage.BlockForCompletionItems, InternalLanguageNames.TypeScript);
24-
set => _globalOptions.SetGlobalOption(CompletionViewOptionsStorage.BlockForCompletionItems, InternalLanguageNames.TypeScript, value);
21+
get => Service.GetOption(CompletionViewOptionsStorage.BlockForCompletionItems, InternalLanguageNames.TypeScript);
22+
set => Service.SetGlobalOption(CompletionViewOptionsStorage.BlockForCompletionItems, InternalLanguageNames.TypeScript, value);
2523
}
2624

2725
public void SetBackgroundAnalysisScope(bool openFilesOnly)
2826
{
29-
_globalOptions.SetGlobalOption(SolutionCrawlerOptionsStorage.BackgroundAnalysisScopeOption, InternalLanguageNames.TypeScript,
27+
Service.SetGlobalOption(SolutionCrawlerOptionsStorage.BackgroundAnalysisScopeOption, InternalLanguageNames.TypeScript,
3028
openFilesOnly ? BackgroundAnalysisScope.OpenFiles : BackgroundAnalysisScope.FullSolution);
31-
_globalOptions.SetGlobalOption(SolutionCrawlerOptionsStorage.CompilerDiagnosticsScopeOption, InternalLanguageNames.TypeScript,
29+
Service.SetGlobalOption(SolutionCrawlerOptionsStorage.CompilerDiagnosticsScopeOption, InternalLanguageNames.TypeScript,
3230
openFilesOnly ? CompilerDiagnosticsScope.OpenFiles : CompilerDiagnosticsScope.FullSolution);
3331

34-
_globalOptions.SetGlobalOption(SolutionCrawlerOptionsStorage.RemoveDocumentDiagnosticsOnDocumentClose, InternalLanguageNames.TypeScript,
32+
Service.SetGlobalOption(SolutionCrawlerOptionsStorage.RemoveDocumentDiagnosticsOnDocumentClose, InternalLanguageNames.TypeScript,
3533
openFilesOnly);
3634
}
3735

@@ -41,5 +39,5 @@ public void SetBackgroundAnalysisScope(Workspace workspace, bool openFilesOnly)
4139
=> SetBackgroundAnalysisScope(openFilesOnly);
4240
#pragma warning restore
4341

44-
internal IGlobalOptionService Service => _globalOptions;
42+
internal IGlobalOptionService Service { get; } = globalOptions;
4543
}

src/EditorFeatures/Core/InlineRename/InlineRenameSession.OpenTextBufferManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ internal void SetReferenceSpans(IEnumerable<TextSpan> spans)
185185
foreach (var span in spans)
186186
{
187187
var document = _baseDocuments.First();
188-
var renameableSpan = _session._renameInfo.GetReferenceEditSpan(
188+
var renameableSpan = _session.RenameInfo.GetReferenceEditSpan(
189189
new InlineRenameLocation(document, span), GetTriggerText(document, span), CancellationToken.None);
190190
var trackingSpan = new RenameTrackingSpan(
191191
_subjectBuffer.CurrentSnapshot.CreateTrackingSpan(renameableSpan.ToSpan(), SpanTrackingMode.EdgeInclusive, TrackingFidelityMode.Forward),
@@ -470,7 +470,7 @@ internal void ApplyConflictResolutionEdits(IInlineRenameReplacementInfo conflict
470470

471471
if (_referenceSpanToLinkedRenameSpanMap.ContainsKey(replacement.OriginalSpan) && kind != RenameSpanKind.Complexified)
472472
{
473-
var linkedRenameSpan = _session._renameInfo.GetConflictEditSpan(
473+
var linkedRenameSpan = _session.RenameInfo.GetConflictEditSpan(
474474
new InlineRenameLocation(newDocument, replacement.NewSpan), GetTriggerText(newDocument, replacement.NewSpan),
475475
GetWithoutAttributeSuffix(_session.ReplacementText,
476476
document.GetLanguageService<LanguageService.ISyntaxFactsService>().IsCaseSensitive), cancellationToken);

0 commit comments

Comments
 (0)