Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 603a19a

Browse files
drewnoakesdrewnoakes
committedJul 18, 2018
Annotations
1 parent c1f30ad commit 603a19a

File tree

8 files changed

+33
-39
lines changed

8 files changed

+33
-39
lines changed
 

‎GitCommands/UserRepositoryHistory/RecentRepoInfo.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
using System.Drawing;
44
using System.IO;
55
using System.Linq;
6+
using JetBrains.Annotations;
67

78
namespace GitCommands.UserRepositoryHistory
89
{
910
public class RecentRepoInfo
1011
{
1112
public Repository Repo { get; set; }
12-
public string Caption { get; set; }
13+
[CanBeNull] public string Caption { get; set; }
1314
public bool MostRecent { get; set; }
14-
public DirectoryInfo DirInfo { get; set; }
15-
public string ShortName { get; set; }
15+
[CanBeNull] public DirectoryInfo DirInfo { get; set; }
16+
[CanBeNull] public string ShortName { get; set; }
1617
public string DirName { get; set; }
1718

1819
public RecentRepoInfo(Repository repo, bool mostRecent)
@@ -40,10 +41,7 @@ public RecentRepoInfo(Repository repo, bool mostRecent)
4041

4142
public bool FullPath => DirInfo == null;
4243

43-
public override string ToString()
44-
{
45-
return Repo.ToString();
46-
}
44+
public override string ToString() => Repo.ToString();
4745
}
4846

4947
public class RecentRepoSplitter

‎GitUI/CommandsDialogs/BrowseDialog/FormOpenDirectory.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ private static IReadOnlyList<string> GetDirectories(GitModule currentModule, IEn
8282
return directories.Distinct().ToList();
8383
}
8484

85+
[CanBeNull]
8586
public static GitModule OpenModule(IWin32Window owner, GitModule currentModule)
8687
{
8788
using (var open = new FormOpenDirectory(currentModule))

‎GitUI/CommandsDialogs/FormBrowse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public sealed partial class FormBrowse : GitModuleForm, IBrowseRepo
9494
private readonly ILongShaProvider _longShaProvider;
9595
private readonly WindowsJumpListManager _windowsJumpListManager;
9696

97-
private BuildReportTabPageExtension _buildReportTabPageExtension;
97+
[CanBeNull] private BuildReportTabPageExtension _buildReportTabPageExtension;
9898
private ConEmuControl _terminal;
9999
private Dashboard _dashboard;
100100
private ToolStripItem _rebase;

‎GitUI/CommandsDialogs/FormCommit.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using GitUI.Hotkey;
2424
using GitUI.Script;
2525
using GitUI.SpellChecker;
26+
using JetBrains.Annotations;
2627
using Microsoft.VisualStudio.Threading;
2728
using ResourceManager;
2829

@@ -136,7 +137,7 @@ public sealed partial class FormCommit : GitModuleForm
136137

137138
private readonly ICommitTemplateManager _commitTemplateManager;
138139
private readonly CommitKind _commitKind;
139-
private readonly GitRevision _editedCommit;
140+
[CanBeNull] private readonly GitRevision _editedCommit;
140141
private readonly ToolStripMenuItem _stageSelectedLinesToolStripMenuItem;
141142
private readonly ToolStripMenuItem _resetSelectedLinesToolStripMenuItem;
142143
private readonly AsyncLoader _unstagedLoader = new AsyncLoader();
@@ -170,7 +171,7 @@ private FormCommit()
170171
{
171172
}
172173

173-
public FormCommit(GitUICommands commands, CommitKind commitKind = CommitKind.Normal, GitRevision editedCommit = null)
174+
public FormCommit([CanBeNull] GitUICommands commands, CommitKind commitKind = CommitKind.Normal, GitRevision editedCommit = null)
174175
: base(enablePositionRestore: true, commands)
175176
{
176177
ThreadHelper.ThrowIfNotOnUIThread();

‎GitUI/FormProcess.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ public FormProcess(string process, string arguments, string workingDirectory, st
4848
{
4949
}
5050

51-
public static bool ShowDialog(IWin32Window owner, GitModule module, string arguments)
51+
public static bool ShowDialog([CanBeNull] IWin32Window owner, GitModule module, string arguments)
5252
{
5353
return ShowDialog(owner, null, arguments, module.WorkingDir, null, true);
5454
}
5555

56-
public static bool ShowDialog(IWin32Window owner, GitModule module, string process, string arguments)
56+
public static bool ShowDialog([CanBeNull] IWin32Window owner, GitModule module, string process, string arguments)
5757
{
5858
return ShowDialog(owner, process, arguments, module.WorkingDir, null, true);
5959
}
@@ -73,12 +73,12 @@ public static bool ShowDialog(GitModuleForm owner, string arguments, bool useDia
7373
return ShowDialog(owner, owner.Module, arguments, useDialogSettings);
7474
}
7575

76-
public static bool ShowDialog(IWin32Window owner, GitModule module, string arguments, bool useDialogSettings)
76+
public static bool ShowDialog([CanBeNull] IWin32Window owner, GitModule module, string arguments, bool useDialogSettings)
7777
{
7878
return ShowDialog(owner, null, arguments, module.WorkingDir, null, useDialogSettings);
7979
}
8080

81-
public static bool ShowDialog(IWin32Window owner, string process, string arguments, string workingDirectory, string input, bool useDialogSettings)
81+
public static bool ShowDialog([CanBeNull] IWin32Window owner, string process, string arguments, string workingDirectory, string input, bool useDialogSettings)
8282
{
8383
using (var formProcess = new FormProcess(process, arguments, workingDirectory, input, useDialogSettings))
8484
{
@@ -87,7 +87,7 @@ public static bool ShowDialog(IWin32Window owner, string process, string argumen
8787
}
8888
}
8989

90-
public static bool ShowStandardProcessDialog(IWin32Window owner, string process, string arguments, string workingDirectory, string input, bool useDialogSettings)
90+
public static bool ShowStandardProcessDialog([CanBeNull] IWin32Window owner, string process, string arguments, string workingDirectory, string input, bool useDialogSettings)
9191
{
9292
var outputCtrl = new EditboxBasedConsoleOutputControl();
9393
using (var formProcess = new FormProcess(outputCtrl, process, arguments, workingDirectory, input, useDialogSettings))
@@ -97,7 +97,7 @@ public static bool ShowStandardProcessDialog(IWin32Window owner, string process,
9797
}
9898
}
9999

100-
public static FormProcess ShowModeless(IWin32Window owner, string process, string arguments, string workingDirectory, string input, bool useDialogSettings)
100+
public static FormProcess ShowModeless([CanBeNull] IWin32Window owner, string process, string arguments, string workingDirectory, string input, bool useDialogSettings)
101101
{
102102
var formProcess = new FormProcess(process, arguments, workingDirectory, input, useDialogSettings)
103103
{
@@ -119,7 +119,7 @@ public static string ReadDialog(GitModuleForm owner, string arguments)
119119
return ReadDialog(owner, null, arguments, owner.Module, null, true);
120120
}
121121

122-
public static string ReadDialog(IWin32Window owner, string process, string arguments, GitModule module, string input, bool useDialogSettings)
122+
public static string ReadDialog([CanBeNull] IWin32Window owner, string process, string arguments, GitModule module, string input, bool useDialogSettings)
123123
{
124124
using (var formProcess = new FormProcess(process, arguments, module.WorkingDir, input, useDialogSettings))
125125
{

‎GitUI/GitUICommands.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public sealed class GitUICommands : IGitUICommands
2424

2525
public GitModule Module { get; private set; }
2626
public ILockableNotifier RepoChangedNotifier { get; }
27-
public IBrowseRepo BrowseRepo { get; set; }
27+
[CanBeNull] public IBrowseRepo BrowseRepo { get; set; }
2828

2929
public GitUICommands([NotNull] GitModule module)
3030
{
@@ -82,7 +82,7 @@ public async Task<string> CommandLineCommandAsync(string cmd, string arguments)
8282
return await Module.RunCmdAsync(cmd, arguments).ConfigureAwait(false);
8383
}
8484

85-
private bool RequiresValidWorkingDir(object owner)
85+
private bool RequiresValidWorkingDir([CanBeNull] object owner)
8686
{
8787
if (!Module.IsValidGitWorkingDir())
8888
{
@@ -264,8 +264,12 @@ void FormClosed(object sender, FormClosedEventArgs e)
264264
/// <param name="postEvent">Event invoked after performing action</param>
265265
/// <param name="action">Action to do. Return true to indicate that the action was successfully done.</param>
266266
/// <returns>true if action was successfully done, false otherwise</returns>
267-
private bool DoActionOnRepo(IWin32Window owner, bool requiresValidWorkingDir, bool changesRepo,
268-
EventHandler<GitUIEventArgs> preEvent, EventHandler<GitUIPostActionEventArgs> postEvent,
267+
private bool DoActionOnRepo(
268+
[CanBeNull] IWin32Window owner,
269+
bool requiresValidWorkingDir,
270+
bool changesRepo,
271+
EventHandler<GitUIEventArgs> preEvent,
272+
EventHandler<GitUIPostActionEventArgs> postEvent,
269273
[InstantHandle] Func<bool> action)
270274
{
271275
bool actionDone = false;
@@ -1201,12 +1205,12 @@ bool Action()
12011205
return DoActionOnRepo(owner, true, false, null, null, Action);
12021206
}
12031207

1204-
private bool InvokeEvent(IWin32Window ownerForm, [CanBeNull] EventHandler<GitUIEventArgs> gitUIEventHandler)
1208+
private bool InvokeEvent([CanBeNull] IWin32Window ownerForm, [CanBeNull] EventHandler<GitUIEventArgs> gitUIEventHandler)
12051209
{
12061210
return InvokeEvent(this, ownerForm, gitUIEventHandler);
12071211
}
12081212

1209-
private void InvokePostEvent(IWin32Window ownerForm, bool actionDone, EventHandler<GitUIPostActionEventArgs> gitUIEventHandler)
1213+
private void InvokePostEvent([CanBeNull] IWin32Window ownerForm, bool actionDone, EventHandler<GitUIPostActionEventArgs> gitUIEventHandler)
12101214
{
12111215
if (gitUIEventHandler != null)
12121216
{

‎GitUI/MessageBoxes.cs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Windows.Forms;
22
using GitCommands;
3+
using JetBrains.Annotations;
34
using ResourceManager;
45

56
namespace GitUI
@@ -36,22 +37,11 @@ internal MessageBoxes()
3637
Translator.Translate(this, AppSettings.CurrentTranslation);
3738
}
3839

39-
private static MessageBoxes instance;
40+
[CanBeNull] private static MessageBoxes instance;
4041

41-
private static MessageBoxes Instance
42-
{
43-
get
44-
{
45-
if (instance == null)
46-
{
47-
instance = new MessageBoxes();
48-
}
49-
50-
return instance;
51-
}
52-
}
42+
private static MessageBoxes Instance => instance ?? (instance = new MessageBoxes());
5343

54-
public static void NotValidGitDirectory(IWin32Window owner)
44+
public static void NotValidGitDirectory([CanBeNull] IWin32Window owner)
5545
{
5646
MessageBox.Show(owner, Instance._notValidGitDirectory.Text, Instance._error.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
5747
}

‎GitUI/UserControls/FileStatusList.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public sealed partial class FileStatusList : GitModuleControl
3131
{
3232
private static readonly TimeSpan SelectedIndexChangeThrottleDuration = TimeSpan.FromMilliseconds(50);
3333

34-
private static ImageList _images;
34+
[CanBeNull] private static ImageList _images;
3535

3636
private readonly TranslationString _diffWithParent = new TranslationString("Diff with:");
3737
public readonly TranslationString CombinedDiff = new TranslationString("Combined Diff");
@@ -41,7 +41,7 @@ public sealed partial class FileStatusList : GitModuleControl
4141

4242
private bool _alwaysRevisionGroups;
4343
private ToolStripItem _openSubmoduleMenuItem;
44-
private IDisposable _selectedIndexChangeSubscription;
44+
[CanBeNull] private IDisposable _selectedIndexChangeSubscription;
4545

4646
public DescribeRevisionDelegate DescribeRevision { get; set; }
4747

0 commit comments

Comments
 (0)
Please sign in to comment.