Skip to content

Commit d143234

Browse files
authored
Code Quality: Formatted code for readability (#10537)
1 parent c45d6d3 commit d143234

File tree

3 files changed

+14
-33
lines changed

3 files changed

+14
-33
lines changed

src/Files.App/Helpers/ResourceHelpers.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,10 @@ namespace Files.App.Helpers
66
[MarkupExtensionReturnType(ReturnType = typeof(string))]
77
public sealed class ResourceString : MarkupExtension
88
{
9-
private static ResourceLoader resourceLoader = new ResourceLoader();
9+
private static readonly ResourceLoader resourceLoader = new();
1010

11-
public string Name
12-
{
13-
get; set;
14-
}
11+
public string Name { get; set; } = string.Empty;
1512

16-
protected override object ProvideValue()
17-
{
18-
return resourceLoader.GetString(this.Name);
19-
}
13+
protected override object ProvideValue() => resourceLoader.GetString(Name);
2014
}
2115
}

src/Files.App/Serialization/BaseObservableJsonSettings.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,16 @@ internal abstract class BaseObservableJsonSettings : BaseJsonSettings, INotifyPr
77
{
88
public event PropertyChangedEventHandler? PropertyChanged;
99

10-
protected override bool Set<TValue>(TValue? value, [CallerMemberName] string propertyName = "")
11-
where TValue : default
10+
protected override bool Set<TValue>(TValue? value, [CallerMemberName] string propertyName = "") where TValue : default
1211
{
13-
if (base.Set<TValue>(value, propertyName))
14-
{
15-
OnPropertyChanged(propertyName);
16-
return true;
17-
}
12+
if (!base.Set<TValue>(value, propertyName))
13+
return false;
1814

19-
return false;
15+
OnPropertyChanged(propertyName);
16+
return true;
2017
}
2118

2219
protected void OnPropertyChanged([CallerMemberName] string propertyName = "")
23-
{
24-
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
25-
}
20+
=> PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
2621
}
2722
}

src/Files.App/Shell/ContextMenuItem.cs

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ namespace Files.App.Shell
66
{
77
public class ContextMenuItem : Win32ContextMenuItem, IDisposable
88
{
9-
public ContextMenuItem()
10-
{
11-
SubItems = new List<Win32ContextMenuItem>();
12-
}
9+
public ContextMenuItem() => SubItems = new List<Win32ContextMenuItem>();
1310

1411
public void Dispose()
1512
{
@@ -19,17 +16,12 @@ public void Dispose()
1916

2017
protected virtual void Dispose(bool disposing)
2118
{
22-
if (disposing)
19+
if (disposing && SubItems is not null)
2320
{
24-
if (SubItems is not null)
25-
{
26-
foreach (var si in SubItems)
27-
{
28-
(si as IDisposable)?.Dispose();
29-
}
21+
foreach (var subItem in SubItems)
22+
(subItem as IDisposable)?.Dispose();
3023

31-
SubItems = null;
32-
}
24+
SubItems = null;
3325
}
3426
}
3527
}

0 commit comments

Comments
 (0)