Skip to content

Commit 5cbc17d

Browse files
CyrusNajmabadiCyrusNajmabadi
authored
Merge pull request #74637 from CyrusNajmabadi/useAutoProp
2 parents 1d4cdca + 853b261 commit 5cbc17d

File tree

115 files changed

+1011
-1460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+1011
-1460
lines changed

‎src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyoutViewModel.cs‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
2828
{
2929
internal class RenameFlyoutViewModel : INotifyPropertyChanged, IDisposable
3030
{
31-
private readonly InlineRenameSession _session;
3231
private readonly bool _registerOleComponent;
3332
private readonly IGlobalOptionService _globalOptionService;
3433
private OleComponent? _oleComponent;
@@ -47,15 +46,15 @@ public RenameFlyoutViewModel(
4746
Lazy<ISmartRenameSessionFactoryWrapper>? smartRenameSessionFactory)
4847
#pragma warning restore CS0618
4948
{
50-
_session = session;
49+
Session = session;
5150
_registerOleComponent = registerOleComponent;
5251
_globalOptionService = globalOptionService;
53-
_session.ReplacementTextChanged += OnReplacementTextChanged;
54-
_session.ReplacementsComputed += OnReplacementsComputed;
55-
_session.ReferenceLocationsChanged += OnReferenceLocationsChanged;
52+
Session.ReplacementTextChanged += OnReplacementTextChanged;
53+
Session.ReplacementsComputed += OnReplacementsComputed;
54+
Session.ReferenceLocationsChanged += OnReferenceLocationsChanged;
5655
StartingSelection = selectionSpan;
5756
InitialTrackingSpan = session.TriggerSpan.CreateTrackingSpan(SpanTrackingMode.EdgeInclusive);
58-
var smartRenameSession = smartRenameSessionFactory?.Value.CreateSmartRenameSession(_session.TriggerSpan);
57+
var smartRenameSession = smartRenameSessionFactory?.Value.CreateSmartRenameSession(Session.TriggerSpan);
5958
if (smartRenameSession is not null)
6059
{
6160
SmartRenameViewModel = new SmartRenameViewModel(globalOptionService, threadingContext, listenerProvider, smartRenameSession.Value, this);
@@ -68,25 +67,25 @@ public RenameFlyoutViewModel(
6867

6968
public string IdentifierText
7069
{
71-
get => _session.ReplacementText;
70+
get => Session.ReplacementText;
7271
set
7372
{
74-
if (value != _session.ReplacementText)
73+
if (value != Session.ReplacementText)
7574
{
76-
_session.ApplyReplacementText(value, propagateEditImmediately: true, updateSelection: false);
75+
Session.ApplyReplacementText(value, propagateEditImmediately: true, updateSelection: false);
7776
NotifyPropertyChanged(nameof(IdentifierText));
7877
}
7978
}
8079
}
8180

82-
public InlineRenameSession Session => _session;
81+
public InlineRenameSession Session { get; }
8382

8483
public ITrackingSpan InitialTrackingSpan { get; }
8584

86-
public bool AllowFileRename => _session.FileRenameInfo == InlineRenameFileRenameInfo.Allowed && _isReplacementTextValid;
87-
public bool ShowFileRename => _session.FileRenameInfo != InlineRenameFileRenameInfo.NotAllowed;
85+
public bool AllowFileRename => Session.FileRenameInfo == InlineRenameFileRenameInfo.Allowed && _isReplacementTextValid;
86+
public bool ShowFileRename => Session.FileRenameInfo != InlineRenameFileRenameInfo.NotAllowed;
8887

89-
public string FileRenameString => _session.FileRenameInfo switch
88+
public string FileRenameString => Session.FileRenameInfo switch
9089
{
9190
InlineRenameFileRenameInfo.TypeDoesNotMatchFileName => EditorFeaturesResources.Rename_file_name_doesnt_match,
9291
InlineRenameFileRenameInfo.TypeWithMultipleLocations => EditorFeaturesResources.Rename_file_partial_type,
@@ -133,51 +132,51 @@ public Severity StatusSeverity
133132

134133
public bool RenameInCommentsFlag
135134
{
136-
get => _session.Options.RenameInComments;
135+
get => Session.Options.RenameInComments;
137136
set
138137
{
139138
_globalOptionService.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameInComments, value);
140-
_session.RefreshRenameSessionWithOptionsChanged(_session.Options with { RenameInComments = value });
139+
Session.RefreshRenameSessionWithOptionsChanged(Session.Options with { RenameInComments = value });
141140
}
142141
}
143142

144143
public bool RenameInStringsFlag
145144
{
146-
get => _session.Options.RenameInStrings;
145+
get => Session.Options.RenameInStrings;
147146
set
148147
{
149148
_globalOptionService.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameInStrings, value);
150-
_session.RefreshRenameSessionWithOptionsChanged(_session.Options with { RenameInStrings = value });
149+
Session.RefreshRenameSessionWithOptionsChanged(Session.Options with { RenameInStrings = value });
151150
}
152151
}
153152

154153
public bool RenameFileFlag
155154
{
156-
get => _session.Options.RenameFile;
155+
get => Session.Options.RenameFile;
157156
set
158157
{
159158
_globalOptionService.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameFile, value);
160-
_session.RefreshRenameSessionWithOptionsChanged(_session.Options with { RenameFile = value });
159+
Session.RefreshRenameSessionWithOptionsChanged(Session.Options with { RenameFile = value });
161160
}
162161
}
163162

164163
public bool PreviewChangesFlag
165164
{
166-
get => _session.PreviewChanges;
165+
get => Session.PreviewChanges;
167166
set
168167
{
169168
_globalOptionService.SetGlobalOption(InlineRenameSessionOptionsStorage.PreviewChanges, value);
170-
_session.SetPreviewChanges(value);
169+
Session.SetPreviewChanges(value);
171170
}
172171
}
173172

174173
public bool RenameOverloadsFlag
175174
{
176-
get => _session.Options.RenameOverloads;
175+
get => Session.Options.RenameOverloads;
177176
set
178177
{
179178
_globalOptionService.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameOverloads, value);
180-
_session.RefreshRenameSessionWithOptionsChanged(_session.Options with { RenameOverloads = value });
179+
Session.RefreshRenameSessionWithOptionsChanged(Session.Options with { RenameOverloads = value });
181180
}
182181
}
183182

@@ -202,10 +201,10 @@ public bool IsExpanded
202201
}
203202

204203
public bool IsRenameOverloadsEditable
205-
=> !_session.MustRenameOverloads;
204+
=> !Session.MustRenameOverloads;
206205

207206
public bool IsRenameOverloadsVisible
208-
=> _session.HasRenameOverloads;
207+
=> Session.HasRenameOverloads;
209208

210209
public TextSpan StartingSelection { get; }
211210

@@ -217,14 +216,14 @@ public bool Submit()
217216
}
218217

219218
SmartRenameViewModel?.Commit(IdentifierText);
220-
_session.Commit();
219+
Session.Commit();
221220
return true;
222221
}
223222

224223
public void Cancel()
225224
{
226225
SmartRenameViewModel?.Cancel();
227-
_session.Cancel();
226+
Session.Cancel();
228227
}
229228

230229
public void Dispose()
@@ -309,8 +308,8 @@ protected virtual void Dispose(bool disposing)
309308
{
310309
if (disposing)
311310
{
312-
_session.ReplacementTextChanged -= OnReplacementTextChanged;
313-
_session.ReplacementsComputed -= OnReplacementsComputed;
311+
Session.ReplacementTextChanged -= OnReplacementTextChanged;
312+
Session.ReplacementsComputed -= OnReplacementsComputed;
314313

315314
if (SmartRenameViewModel is not null)
316315
{

‎src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboardViewModel.cs‎

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,19 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
1616
{
1717
internal class RenameDashboardViewModel : INotifyPropertyChanged, IDisposable
1818
{
19-
private readonly InlineRenameSession _session;
20-
2119
private RenameDashboardSeverity _severity = RenameDashboardSeverity.None;
22-
private string _searchText;
2320
private int _resolvableConflictCount;
2421
private int _unresolvableConflictCount;
25-
private string _errorText;
2622
private bool _isReplacementTextValid;
2723

2824
public RenameDashboardViewModel(InlineRenameSession session)
2925
{
30-
_session = session;
31-
_searchText = EditorFeaturesResources.Searching;
26+
Session = session;
27+
SearchText = EditorFeaturesResources.Searching;
3228

33-
_session.ReferenceLocationsChanged += OnReferenceLocationsChanged;
34-
_session.ReplacementsComputed += OnReplacementsComputed;
35-
_session.ReplacementTextChanged += OnReplacementTextChanged;
29+
Session.ReferenceLocationsChanged += OnReferenceLocationsChanged;
30+
Session.ReplacementsComputed += OnReplacementsComputed;
31+
Session.ReplacementTextChanged += OnReplacementTextChanged;
3632

3733
// Set the flag to true by default if we're showing the option.
3834
_isReplacementTextValid = true;
@@ -67,7 +63,7 @@ private void OnReplacementsComputed(object sender, IInlineRenameReplacementInfo
6763
OnIsReplacementTextValidChanged(result.ReplacementTextValid);
6864
if (result.ReplacementTextValid)
6965
{
70-
_errorText = null;
66+
ErrorText = null;
7167
foreach (var resolution in result.GetAllReplacementKinds())
7268
{
7369
switch (resolution)
@@ -84,7 +80,7 @@ private void OnReplacementsComputed(object sender, IInlineRenameReplacementInfo
8480
}
8581
else
8682
{
87-
_errorText = string.IsNullOrEmpty(session.ReplacementText)
83+
ErrorText = string.IsNullOrEmpty(session.ReplacementText)
8884
? null
8985
: EditorFeaturesResources.The_new_name_is_not_a_valid_identifier;
9086
}
@@ -113,23 +109,23 @@ private void UpdateSearchText(int referenceCount, int fileCount)
113109
{
114110
if (referenceCount == 1 && fileCount == 1)
115111
{
116-
_searchText = EditorFeaturesResources.Rename_will_update_1_reference_in_1_file;
112+
SearchText = EditorFeaturesResources.Rename_will_update_1_reference_in_1_file;
117113
}
118114
else if (fileCount == 1)
119115
{
120-
_searchText = string.Format(EditorFeaturesResources.Rename_will_update_0_references_in_1_file, referenceCount);
116+
SearchText = string.Format(EditorFeaturesResources.Rename_will_update_0_references_in_1_file, referenceCount);
121117
}
122118
else
123119
{
124-
_searchText = string.Format(EditorFeaturesResources.Rename_will_update_0_references_in_1_files, referenceCount, fileCount);
120+
SearchText = string.Format(EditorFeaturesResources.Rename_will_update_0_references_in_1_files, referenceCount, fileCount);
125121
}
126122

127123
NotifyPropertyChanged("SearchText");
128124
}
129125

130126
private void UpdateSeverity()
131127
{
132-
if (_errorText != null ||
128+
if (ErrorText != null ||
133129
_unresolvableConflictCount > 0)
134130
{
135131
_severity = RenameDashboardSeverity.Error;
@@ -144,13 +140,13 @@ private void UpdateSeverity()
144140
}
145141
}
146142

147-
public InlineRenameSession Session => _session;
143+
public InlineRenameSession Session { get; }
148144

149145
public RenameDashboardSeverity Severity => _severity;
150146

151-
public bool AllowFileRename => _session.FileRenameInfo == InlineRenameFileRenameInfo.Allowed && _isReplacementTextValid;
152-
public bool ShowFileRename => _session.FileRenameInfo != InlineRenameFileRenameInfo.NotAllowed;
153-
public string FileRenameString => _session.FileRenameInfo switch
147+
public bool AllowFileRename => Session.FileRenameInfo == InlineRenameFileRenameInfo.Allowed && _isReplacementTextValid;
148+
public bool ShowFileRename => Session.FileRenameInfo != InlineRenameFileRenameInfo.NotAllowed;
149+
public string FileRenameString => Session.FileRenameInfo switch
154150
{
155151
InlineRenameFileRenameInfo.TypeDoesNotMatchFileName => EditorFeaturesResources.Rename_file_name_doesnt_match,
156152
InlineRenameFileRenameInfo.TypeWithMultipleLocations => EditorFeaturesResources.Rename_file_partial_type,
@@ -189,7 +185,7 @@ public bool ShouldShowNewName
189185
}
190186
}
191187

192-
public string SearchText => _searchText;
188+
public string SearchText { get; private set; }
193189

194190
public bool HasResolvableConflicts
195191
{
@@ -222,80 +218,80 @@ public string UnresolvableConflictText
222218
}
223219

224220
public bool HasError
225-
=> _errorText != null;
221+
=> ErrorText != null;
226222

227-
public string ErrorText => _errorText;
223+
public string ErrorText { get; private set; }
228224

229225
public Visibility RenameOverloadsVisibility
230-
=> _session.HasRenameOverloads ? Visibility.Visible : Visibility.Collapsed;
226+
=> Session.HasRenameOverloads ? Visibility.Visible : Visibility.Collapsed;
231227

232228
public bool IsRenameOverloadsEditable
233-
=> !_session.MustRenameOverloads;
229+
=> !Session.MustRenameOverloads;
234230

235231
public bool DefaultRenameOverloadFlag
236232
{
237-
get => _session.Options.RenameOverloads;
233+
get => Session.Options.RenameOverloads;
238234

239235
set
240236
{
241237
if (IsRenameOverloadsEditable)
242238
{
243-
_session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameOverloads, value);
244-
_session.RefreshRenameSessionWithOptionsChanged(_session.Options with { RenameOverloads = value });
239+
Session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameOverloads, value);
240+
Session.RefreshRenameSessionWithOptionsChanged(Session.Options with { RenameOverloads = value });
245241
}
246242
}
247243
}
248244

249245
public bool DefaultRenameInStringsFlag
250246
{
251-
get => _session.Options.RenameInStrings;
247+
get => Session.Options.RenameInStrings;
252248

253249
set
254250
{
255-
_session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameInStrings, value);
256-
_session.RefreshRenameSessionWithOptionsChanged(_session.Options with { RenameInStrings = value });
251+
Session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameInStrings, value);
252+
Session.RefreshRenameSessionWithOptionsChanged(Session.Options with { RenameInStrings = value });
257253
}
258254
}
259255

260256
public bool DefaultRenameInCommentsFlag
261257
{
262-
get => _session.Options.RenameInComments;
258+
get => Session.Options.RenameInComments;
263259

264260
set
265261
{
266-
_session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameInComments, value);
267-
_session.RefreshRenameSessionWithOptionsChanged(_session.Options with { RenameInComments = value });
262+
Session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameInComments, value);
263+
Session.RefreshRenameSessionWithOptionsChanged(Session.Options with { RenameInComments = value });
268264
}
269265
}
270266

271267
public bool DefaultRenameFileFlag
272268
{
273-
get => _session.Options.RenameFile;
269+
get => Session.Options.RenameFile;
274270
set
275271
{
276-
_session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameFile, value);
277-
_session.RefreshRenameSessionWithOptionsChanged(_session.Options with { RenameFile = value });
272+
Session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.RenameFile, value);
273+
Session.RefreshRenameSessionWithOptionsChanged(Session.Options with { RenameFile = value });
278274
}
279275
}
280276

281277
public bool DefaultPreviewChangesFlag
282278
{
283-
get => _session.PreviewChanges;
279+
get => Session.PreviewChanges;
284280

285281
set
286282
{
287-
_session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.PreviewChanges, value);
288-
_session.SetPreviewChanges(value);
283+
Session.RenameService.GlobalOptions.SetGlobalOption(InlineRenameSessionOptionsStorage.PreviewChanges, value);
284+
Session.SetPreviewChanges(value);
289285
}
290286
}
291287

292-
public string OriginalName => _session.OriginalSymbolName;
288+
public string OriginalName => Session.OriginalSymbolName;
293289

294290
public void Dispose()
295291
{
296-
_session.ReplacementTextChanged -= OnReplacementTextChanged;
297-
_session.ReferenceLocationsChanged -= OnReferenceLocationsChanged;
298-
_session.ReplacementsComputed -= OnReplacementsComputed;
292+
Session.ReplacementTextChanged -= OnReplacementTextChanged;
293+
Session.ReferenceLocationsChanged -= OnReferenceLocationsChanged;
294+
Session.ReplacementsComputed -= OnReplacementsComputed;
299295
}
300296
}
301297
}

‎src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ internal abstract class InteractiveCommandHandler :
2323
ICommandHandler<ExecuteInInteractiveCommandArgs>,
2424
ICommandHandler<CopyToInteractiveCommandArgs>
2525
{
26-
private readonly IContentTypeRegistryService _contentTypeRegistryService;
2726
private readonly EditorOptionsService _editorOptionsService;
2827
private readonly IEditorOperationsFactoryService _editorOperationsFactoryService;
2928

@@ -32,12 +31,12 @@ protected InteractiveCommandHandler(
3231
EditorOptionsService editorOptionsService,
3332
IEditorOperationsFactoryService editorOperationsFactoryService)
3433
{
35-
_contentTypeRegistryService = contentTypeRegistryService;
34+
ContentTypeRegistryService = contentTypeRegistryService;
3635
_editorOptionsService = editorOptionsService;
3736
_editorOperationsFactoryService = editorOperationsFactoryService;
3837
}
3938

40-
protected IContentTypeRegistryService ContentTypeRegistryService { get { return _contentTypeRegistryService; } }
39+
protected IContentTypeRegistryService ContentTypeRegistryService { get; }
4140

4241
protected abstract IInteractiveWindow OpenInteractiveWindow(bool focus);
4342

0 commit comments

Comments
 (0)