Skip to content

Commit 1acf2a1

Browse files
NathanBaulchNathanBaulch
authored
code_style: general cleanup (#1469)
1 parent e5eced5 commit 1acf2a1

Some content is hidden

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

55 files changed

+138
-277
lines changed

‎src/App.axaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static void LogException(Exception ex)
9595
builder.Append($"App Start Time: {Process.GetCurrentProcess().StartTime}\n");
9696
builder.Append($"Exception Time: {DateTime.Now}\n");
9797
builder.Append($"Memory Usage: {Process.GetCurrentProcess().PrivateMemorySize64 / 1024 / 1024} MB\n");
98-
builder.Append($"---------------------------\n\n");
98+
builder.Append("---------------------------\n\n");
9999
builder.Append(ex);
100100

101101
var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");

‎src/Commands/Branch.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static string ShowCurrent(string repo)
99
var cmd = new Command();
1010
cmd.WorkingDirectory = repo;
1111
cmd.Context = repo;
12-
cmd.Args = $"branch --show-current";
12+
cmd.Args = "branch --show-current";
1313
return cmd.ReadToEnd().StdOut.Trim();
1414
}
1515

‎src/Commands/Command.cs‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,18 +169,12 @@ private ProcessStartInfo CreateGitStartInfo()
169169
}
170170

171171
// Force using this app as git editor.
172-
switch (Editor)
172+
start.Arguments += Editor switch
173173
{
174-
case EditorType.CoreEditor:
175-
start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --core-editor\" ";
176-
break;
177-
case EditorType.RebaseEditor:
178-
start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --rebase-message-editor\" -c sequence.editor=\"\\\"{selfExecFile}\\\" --rebase-todo-editor\" -c rebase.abbreviateCommands=true ";
179-
break;
180-
default:
181-
start.Arguments += "-c core.editor=true ";
182-
break;
183-
}
174+
EditorType.CoreEditor => $"-c core.editor=\"\\\"{selfExecFile}\\\" --core-editor\" ",
175+
EditorType.RebaseEditor => $"-c core.editor=\"\\\"{selfExecFile}\\\" --rebase-message-editor\" -c sequence.editor=\"\\\"{selfExecFile}\\\" --rebase-todo-editor\" -c rebase.abbreviateCommands=true ",
176+
_ => "-c core.editor=true ",
177+
};
184178

185179
// Append command args
186180
start.Arguments += Args;

‎src/Commands/QueryFileContent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static Stream FromLFS(string repo, string oid, long size)
4141
var starter = new ProcessStartInfo();
4242
starter.WorkingDirectory = repo;
4343
starter.FileName = Native.OS.GitExecutable;
44-
starter.Arguments = $"lfs smudge";
44+
starter.Arguments = "lfs smudge";
4545
starter.UseShellExecute = false;
4646
starter.CreateNoWindow = true;
4747
starter.WindowStyle = ProcessWindowStyle.Hidden;

‎src/Commands/QueryRevisionObjects.cs‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,14 @@ private void Parse(string line)
5151
obj.Type = Models.ObjectType.Blob;
5252
obj.Path = match.Groups[3].Value;
5353

54-
switch (match.Groups[1].Value)
54+
obj.Type = match.Groups[1].Value switch
5555
{
56-
case "blob":
57-
obj.Type = Models.ObjectType.Blob;
58-
break;
59-
case "tree":
60-
obj.Type = Models.ObjectType.Tree;
61-
break;
62-
case "tag":
63-
obj.Type = Models.ObjectType.Tag;
64-
break;
65-
case "commit":
66-
obj.Type = Models.ObjectType.Commit;
67-
break;
68-
}
56+
"blob" => Models.ObjectType.Blob,
57+
"tree" => Models.ObjectType.Tree,
58+
"tag" => Models.ObjectType.Tag,
59+
"commit" => Models.ObjectType.Commit,
60+
_ => obj.Type,
61+
};
6962

7063
_objects.Add(obj);
7164
}

‎src/Commands/QueryStashes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public QueryStashes(string repo)
99
{
1010
WorkingDirectory = repo;
1111
Context = repo;
12-
Args = $"stash list -z --no-show-signature --format=\"%H%n%P%n%ct%n%gd%n%B\"";
12+
Args = "stash list -z --no-show-signature --format=\"%H%n%P%n%ct%n%gd%n%B\"";
1313
}
1414

1515
public List<Models.Stash> Result()

‎src/Commands/SaveRevisionFile.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static void Run(string repo, string revision, string file, string saveTo)
1818
if (isLFSFiltered)
1919
{
2020
var pointerStream = QueryFileContent.Run(repo, revision, file);
21-
ExecCmd(repo, $"lfs smudge", saveTo, pointerStream);
21+
ExecCmd(repo, "lfs smudge", saveTo, pointerStream);
2222
}
2323
else
2424
{

‎src/Converters/FilterModeConverters.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ public static class FilterModeConverters
88
public static readonly FuncValueConverter<Models.FilterMode, IBrush> ToBorderBrush =
99
new FuncValueConverter<Models.FilterMode, IBrush>(v =>
1010
{
11-
switch (v)
11+
return v switch
1212
{
13-
case Models.FilterMode.Included:
14-
return Brushes.Green;
15-
case Models.FilterMode.Excluded:
16-
return Brushes.Red;
17-
default:
18-
return Brushes.Transparent;
19-
}
13+
Models.FilterMode.Included => Brushes.Green,
14+
Models.FilterMode.Excluded => Brushes.Red,
15+
_ => Brushes.Transparent,
16+
};
2017
});
2118
}
2219
}

‎src/Converters/InteractiveRebaseActionConverters.cs‎

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,19 @@ public static class InteractiveRebaseActionConverters
88
public static readonly FuncValueConverter<Models.InteractiveRebaseAction, IBrush> ToIconBrush =
99
new FuncValueConverter<Models.InteractiveRebaseAction, IBrush>(v =>
1010
{
11-
switch (v)
11+
return v switch
1212
{
13-
case Models.InteractiveRebaseAction.Pick:
14-
return Brushes.Green;
15-
case Models.InteractiveRebaseAction.Edit:
16-
return Brushes.Orange;
17-
case Models.InteractiveRebaseAction.Reword:
18-
return Brushes.Orange;
19-
case Models.InteractiveRebaseAction.Squash:
20-
return Brushes.LightGray;
21-
case Models.InteractiveRebaseAction.Fixup:
22-
return Brushes.LightGray;
23-
default:
24-
return Brushes.Red;
25-
}
13+
Models.InteractiveRebaseAction.Pick => Brushes.Green,
14+
Models.InteractiveRebaseAction.Edit => Brushes.Orange,
15+
Models.InteractiveRebaseAction.Reword => Brushes.Orange,
16+
Models.InteractiveRebaseAction.Squash => Brushes.LightGray,
17+
Models.InteractiveRebaseAction.Fixup => Brushes.LightGray,
18+
_ => Brushes.Red,
19+
};
2620
});
2721

2822
public static readonly FuncValueConverter<Models.InteractiveRebaseAction, string> ToName =
29-
new FuncValueConverter<Models.InteractiveRebaseAction, string>(v =>
30-
{
31-
switch (v)
32-
{
33-
case Models.InteractiveRebaseAction.Pick:
34-
return "Pick";
35-
case Models.InteractiveRebaseAction.Edit:
36-
return "Edit";
37-
case Models.InteractiveRebaseAction.Reword:
38-
return "Reword";
39-
case Models.InteractiveRebaseAction.Squash:
40-
return "Squash";
41-
case Models.InteractiveRebaseAction.Fixup:
42-
return "Fixup";
43-
default:
44-
return "Drop";
45-
}
46-
});
23+
new FuncValueConverter<Models.InteractiveRebaseAction, string>(v => v.ToString());
4724

4825
public static readonly FuncValueConverter<Models.InteractiveRebaseAction, bool> CanEditMessage =
4926
new FuncValueConverter<Models.InteractiveRebaseAction, bool>(v => v == Models.InteractiveRebaseAction.Reword || v == Models.InteractiveRebaseAction.Squash);

‎src/Models/AvatarManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public void SetFromLocal(string email, string file)
185185
{
186186
try
187187
{
188-
Bitmap image = null;
188+
Bitmap image;
189189

190190
using (var stream = File.OpenRead(file))
191191
{

0 commit comments

Comments
 (0)