Skip to content

Commit 0997bc2

Browse files
jkrejchajkrejcha
committed
Use nameof on arguments for Ensure
1 parent 50d6978 commit 0997bc2

Some content is hidden

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

47 files changed

+337
-337
lines changed

‎LibGit2Sharp/Blob.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public virtual Stream GetContentStream()
6262
/// <exception cref="NotFoundException">Throws if blob is missing</exception>
6363
public virtual Stream GetContentStream(FilteringOptions filteringOptions)
6464
{
65-
Ensure.ArgumentNotNull(filteringOptions, "filteringOptions");
65+
Ensure.ArgumentNotNull(filteringOptions, nameof(filteringOptions));
6666

6767
return Proxy.git_blob_filtered_content_stream(repo.Handle, Id, filteringOptions.HintPath, false);
6868
}
@@ -86,7 +86,7 @@ public virtual string GetContentText()
8686
/// <exception cref="NotFoundException">Throws if blob is missing</exception>
8787
public virtual string GetContentText(Encoding encoding)
8888
{
89-
Ensure.ArgumentNotNull(encoding, "encoding");
89+
Ensure.ArgumentNotNull(encoding, nameof(encoding));
9090

9191
return ReadToEnd(GetContentStream(), encoding);
9292
}
@@ -114,7 +114,7 @@ public virtual string GetContentText(FilteringOptions filteringOptions)
114114
/// <exception cref="NotFoundException">Throws if blob is missing</exception>
115115
public virtual string GetContentText(FilteringOptions filteringOptions, Encoding encoding)
116116
{
117-
Ensure.ArgumentNotNull(filteringOptions, "filteringOptions");
117+
Ensure.ArgumentNotNull(filteringOptions, nameof(filteringOptions));
118118

119119
return ReadToEnd(GetContentStream(filteringOptions), encoding);
120120
}

‎LibGit2Sharp/BranchCollection.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public virtual Branch this[string name]
3939
{
4040
get
4141
{
42-
Ensure.ArgumentNotNullOrEmptyString(name, "name");
42+
Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
4343

4444
if (LooksLikeABranchName(name))
4545
{
@@ -138,7 +138,7 @@ public virtual Branch Add(string name, Commit commit)
138138
/// <returns>A new <see cref="Branch"/>.</returns>
139139
public virtual Branch Add(string name, Commit commit, bool allowOverwrite)
140140
{
141-
Ensure.ArgumentNotNull(commit, "commit");
141+
Ensure.ArgumentNotNull(commit, nameof(commit));
142142

143143
return Add(name, commit.Sha, allowOverwrite);
144144
}
@@ -152,8 +152,8 @@ public virtual Branch Add(string name, Commit commit, bool allowOverwrite)
152152
/// <returns>A new <see cref="Branch"/>.</returns>
153153
public virtual Branch Add(string name, string committish, bool allowOverwrite)
154154
{
155-
Ensure.ArgumentNotNullOrEmptyString(name, "name");
156-
Ensure.ArgumentNotNullOrEmptyString(committish, "committish");
155+
Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
156+
Ensure.ArgumentNotNullOrEmptyString(committish, nameof(committish));
157157

158158
using (Proxy.git_branch_create_from_annotated(repo.Handle, name, committish, allowOverwrite))
159159
{ }
@@ -178,7 +178,7 @@ public virtual void Remove(string name)
178178
/// <param name="isRemote">True if the provided <paramref name="name"/> is the name of a remote branch, false otherwise.</param>
179179
public virtual void Remove(string name, bool isRemote)
180180
{
181-
Ensure.ArgumentNotNullOrEmptyString(name, "name");
181+
Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
182182

183183
string branchName = isRemote ? Reference.RemoteTrackingBranchPrefix + name : name;
184184

@@ -197,7 +197,7 @@ public virtual void Remove(string name, bool isRemote)
197197
/// <param name="branch">The branch to delete.</param>
198198
public virtual void Remove(Branch branch)
199199
{
200-
Ensure.ArgumentNotNull(branch, "branch");
200+
Ensure.ArgumentNotNull(branch, nameof(branch));
201201

202202
using (ReferenceHandle referencePtr = repo.Refs.RetrieveReferencePtr(branch.CanonicalName))
203203
{
@@ -225,8 +225,8 @@ public virtual Branch Rename(string currentName, string newName)
225225
/// <returns>A new <see cref="Branch"/>.</returns>
226226
public virtual Branch Rename(string currentName, string newName, bool allowOverwrite)
227227
{
228-
Ensure.ArgumentNotNullOrEmptyString(currentName, "currentName");
229-
Ensure.ArgumentNotNullOrEmptyString(newName, "newName");
228+
Ensure.ArgumentNotNullOrEmptyString(currentName, nameof(currentName));
229+
Ensure.ArgumentNotNullOrEmptyString(newName, nameof(newName));
230230

231231
Branch branch = this[currentName];
232232

@@ -258,8 +258,8 @@ public virtual Branch Rename(Branch branch, string newName)
258258
/// <returns>A new <see cref="Branch"/>.</returns>
259259
public virtual Branch Rename(Branch branch, string newName, bool allowOverwrite)
260260
{
261-
Ensure.ArgumentNotNull(branch, "branch");
262-
Ensure.ArgumentNotNullOrEmptyString(newName, "newName");
261+
Ensure.ArgumentNotNull(branch, nameof(branch));
262+
Ensure.ArgumentNotNullOrEmptyString(newName, nameof(newName));
263263

264264
if (branch.IsRemote)
265265
{

‎LibGit2Sharp/BranchUpdater.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ protected BranchUpdater()
2020

2121
internal BranchUpdater(Repository repo, Branch branch)
2222
{
23-
Ensure.ArgumentNotNull(repo, "repo");
24-
Ensure.ArgumentNotNull(branch, "branch");
23+
Ensure.ArgumentNotNull(repo, nameof(repo));
24+
Ensure.ArgumentNotNull(branch, nameof(branch));
2525

2626
this.repo = repo;
2727
this.branch = branch;

‎LibGit2Sharp/CloneOptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public sealed class CloneOptions : IConvertableToGitCheckoutOpts
1414
/// <param name="fetchOptions">The fetch options to use.</param>
1515
public CloneOptions(FetchOptions fetchOptions) : this()
1616
{
17-
Ensure.ArgumentNotNull(fetchOptions, "fetchOptions");
17+
Ensure.ArgumentNotNull(fetchOptions, nameof(fetchOptions));
1818

1919
FetchOptions = fetchOptions;
2020
}

‎LibGit2Sharp/Commands/Checkout.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public static Branch Checkout(IRepository repository, string committishOrBranchS
3434
/// <returns>The <see cref="Branch"/> that was checked out.</returns>
3535
public static Branch Checkout(IRepository repository, string committishOrBranchSpec, CheckoutOptions options)
3636
{
37-
Ensure.ArgumentNotNull(repository, "repository");
38-
Ensure.ArgumentNotNullOrEmptyString(committishOrBranchSpec, "committishOrBranchSpec");
39-
Ensure.ArgumentNotNull(options, "options");
37+
Ensure.ArgumentNotNull(repository, nameof(repository));
38+
Ensure.ArgumentNotNullOrEmptyString(committishOrBranchSpec, nameof(committishOrBranchSpec));
39+
Ensure.ArgumentNotNull(options, nameof(options));
4040

4141
Reference reference = null;
4242
GitObject obj = null;
@@ -109,9 +109,9 @@ public static Branch Checkout(IRepository repository, Branch branch)
109109
/// <returns>The <see cref="Branch"/> that was checked out.</returns>
110110
public static Branch Checkout(IRepository repository, Branch branch, CheckoutOptions options)
111111
{
112-
Ensure.ArgumentNotNull(repository, "repository");
113-
Ensure.ArgumentNotNull(branch, "branch");
114-
Ensure.ArgumentNotNull(options, "options");
112+
Ensure.ArgumentNotNull(repository, nameof(repository));
113+
Ensure.ArgumentNotNull(branch, nameof(branch));
114+
Ensure.ArgumentNotNull(options, nameof(options));
115115

116116
// Make sure this is not an unborn branch.
117117
if (branch.Tip == null)
@@ -160,9 +160,9 @@ public static Branch Checkout(IRepository repository, Commit commit)
160160
/// <returns>The <see cref="Branch"/> that was checked out.</returns>
161161
public static Branch Checkout(IRepository repository, Commit commit, CheckoutOptions options)
162162
{
163-
Ensure.ArgumentNotNull(repository, "repository");
164-
Ensure.ArgumentNotNull(commit, "commit");
165-
Ensure.ArgumentNotNull(options, "options");
163+
Ensure.ArgumentNotNull(repository, nameof(repository));
164+
Ensure.ArgumentNotNull(commit, nameof(commit));
165+
Ensure.ArgumentNotNull(options, nameof(options));
166166

167167
Checkout(repository, commit.Tree, options, commit.Id.Sha);
168168

‎LibGit2Sharp/Commands/Fetch.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private static RemoteHandle RemoteFromNameOrUrl(RepositoryHandle repoHandle, str
3333
/// <param name="refspecs">List of refspecs to apply as active.</param>
3434
public static void Fetch(Repository repository, string remote, IEnumerable<string> refspecs, FetchOptions options, string logMessage)
3535
{
36-
Ensure.ArgumentNotNull(remote, "remote");
36+
Ensure.ArgumentNotNull(remote, nameof(remote));
3737

3838
options = options ?? new FetchOptions();
3939
using (var remoteHandle = RemoteFromNameOrUrl(repository.Handle, remote))

‎LibGit2Sharp/Commands/Pull.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public static partial class Commands
1616
/// <param name="options">The options for fetch and merging.</param>
1717
public static MergeResult Pull(Repository repository, Signature merger, PullOptions options)
1818
{
19-
Ensure.ArgumentNotNull(repository, "repository");
20-
Ensure.ArgumentNotNull(merger, "merger");
19+
Ensure.ArgumentNotNull(repository, nameof(repository));
20+
Ensure.ArgumentNotNull(merger, nameof(merger));
2121

2222

2323
options = options ?? new PullOptions();

‎LibGit2Sharp/Commands/Remove.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public static void Remove(IRepository repository, string path, bool removeFromWo
6868
/// </param>
6969
public static void Remove(IRepository repository, string path, bool removeFromWorkingDirectory, ExplicitPathsOptions explicitPathsOptions)
7070
{
71-
Ensure.ArgumentNotNull(repository, "repository");
72-
Ensure.ArgumentNotNull(path, "path");
71+
Ensure.ArgumentNotNull(repository, nameof(repository));
72+
Ensure.ArgumentNotNull(path, nameof(path));
7373

7474
Remove(repository, new[] { path }, removeFromWorkingDirectory, explicitPathsOptions);
7575
}
@@ -115,16 +115,16 @@ public static void Remove(IRepository repository, IEnumerable<string> paths)
115115
/// </param>
116116
public static void Remove(IRepository repository, IEnumerable<string> paths, bool removeFromWorkingDirectory, ExplicitPathsOptions explicitPathsOptions)
117117
{
118-
Ensure.ArgumentNotNull(repository, "repository");
119-
Ensure.ArgumentNotNullOrEmptyEnumerable<string>(paths, "paths");
118+
Ensure.ArgumentNotNull(repository, nameof(repository));
119+
Ensure.ArgumentNotNullOrEmptyEnumerable<string>(paths, nameof(paths));
120120

121121
var pathsToDelete = paths.Where(p => Directory.Exists(Path.Combine(repository.Info.WorkingDirectory, p))).ToList();
122122
var notConflictedPaths = new List<string>();
123123
var index = repository.Index;
124124

125125
foreach (var path in paths)
126126
{
127-
Ensure.ArgumentNotNullOrEmptyString(path, "path");
127+
Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
128128

129129
var conflict = index.Conflicts[path];
130130

‎LibGit2Sharp/Commands/Stage.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public static partial class Commands
1919
/// <param name="path">The path of the file within the working directory.</param>
2020
public static void Stage(IRepository repository, string path)
2121
{
22-
Ensure.ArgumentNotNull(repository, "repository");
23-
Ensure.ArgumentNotNull(path, "path");
22+
Ensure.ArgumentNotNull(repository, nameof(repository));
23+
Ensure.ArgumentNotNull(path, nameof(path));
2424

2525
Stage(repository, new[] { path }, null);
2626
}
@@ -35,8 +35,8 @@ public static void Stage(IRepository repository, string path)
3535
/// <param name="stageOptions">Determines how paths will be staged.</param>
3636
public static void Stage(IRepository repository, string path, StageOptions stageOptions)
3737
{
38-
Ensure.ArgumentNotNull(repository, "repository");
39-
Ensure.ArgumentNotNull(path, "path");
38+
Ensure.ArgumentNotNull(repository, nameof(repository));
39+
Ensure.ArgumentNotNull(path, nameof(path));
4040

4141
Stage(repository, new[] { path }, stageOptions);
4242
}
@@ -63,8 +63,8 @@ public static void Stage(IRepository repository, IEnumerable<string> paths)
6363
/// <param name="stageOptions">Determines how paths will be staged.</param>
6464
public static void Stage(IRepository repository, IEnumerable<string> paths, StageOptions stageOptions)
6565
{
66-
Ensure.ArgumentNotNull(repository, "repository");
67-
Ensure.ArgumentNotNull(paths, "paths");
66+
Ensure.ArgumentNotNull(repository, nameof(repository));
67+
Ensure.ArgumentNotNull(paths, nameof(paths));
6868

6969
DiffModifiers diffModifiers = DiffModifiers.IncludeUntracked;
7070
ExplicitPathsOptions explicitPathsOptions = stageOptions != null ? stageOptions.ExplicitPathsOptions : null;
@@ -160,8 +160,8 @@ public static void Unstage(IRepository repository, string path)
160160
/// </param>
161161
public static void Unstage(IRepository repository, string path, ExplicitPathsOptions explicitPathsOptions)
162162
{
163-
Ensure.ArgumentNotNull(repository, "repository");
164-
Ensure.ArgumentNotNull(path, "path");
163+
Ensure.ArgumentNotNull(repository, nameof(repository));
164+
Ensure.ArgumentNotNull(path, nameof(path));
165165

166166
Unstage(repository, new[] { path }, explicitPathsOptions);
167167
}
@@ -187,8 +187,8 @@ public static void Unstage(IRepository repository, IEnumerable<string> paths)
187187
/// </param>
188188
public static void Unstage(IRepository repository, IEnumerable<string> paths, ExplicitPathsOptions explicitPathsOptions)
189189
{
190-
Ensure.ArgumentNotNull(repository, "repository");
191-
Ensure.ArgumentNotNull(paths, "paths");
190+
Ensure.ArgumentNotNull(repository, nameof(repository));
191+
Ensure.ArgumentNotNull(paths, nameof(paths));
192192

193193
if (repository.Info.IsHeadUnborn)
194194
{
@@ -222,9 +222,9 @@ public static void Move(IRepository repository, string sourcePath, string destin
222222
/// <param name="destinationPaths">The target paths of the files within the working directory.</param>
223223
public static void Move(IRepository repository, IEnumerable<string> sourcePaths, IEnumerable<string> destinationPaths)
224224
{
225-
Ensure.ArgumentNotNull(repository, "repository");
226-
Ensure.ArgumentNotNull(sourcePaths, "sourcePaths");
227-
Ensure.ArgumentNotNull(destinationPaths, "destinationPaths");
225+
Ensure.ArgumentNotNull(repository, nameof(repository));
226+
Ensure.ArgumentNotNull(sourcePaths, nameof(sourcePaths));
227+
Ensure.ArgumentNotNull(destinationPaths, nameof(destinationPaths));
228228

229229
//TODO: Move() should support following use cases:
230230
// - Moving a file under a directory ('file' and 'dir' -> 'dir/file')

‎LibGit2Sharp/Commit.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,12 @@ public static SignatureInfo ExtractSignature(Repository repo, ObjectId id)
185185
/// <returns>The contents of the commit object.</returns>
186186
public static string CreateBuffer(Signature author, Signature committer, string message, Tree tree, IEnumerable<Commit> parents, bool prettifyMessage, char? commentChar)
187187
{
188-
Ensure.ArgumentNotNull(message, "message");
189-
Ensure.ArgumentDoesNotContainZeroByte(message, "message");
190-
Ensure.ArgumentNotNull(author, "author");
191-
Ensure.ArgumentNotNull(committer, "committer");
192-
Ensure.ArgumentNotNull(tree, "tree");
193-
Ensure.ArgumentNotNull(parents, "parents");
188+
Ensure.ArgumentNotNull(message, nameof(message));
189+
Ensure.ArgumentDoesNotContainZeroByte(message, nameof(message));
190+
Ensure.ArgumentNotNull(author, nameof(author));
191+
Ensure.ArgumentNotNull(committer, nameof(committer));
192+
Ensure.ArgumentNotNull(tree, nameof(tree));
193+
Ensure.ArgumentNotNull(parents, nameof(parents));
194194

195195
if (prettifyMessage)
196196
{

‎LibGit2Sharp/CommitLog.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ IEnumerator IEnumerable.GetEnumerator()
7272
/// <returns>A list of commits, ready to be enumerated.</returns>
7373
public ICommitLog QueryBy(CommitFilter filter)
7474
{
75-
Ensure.ArgumentNotNull(filter, "filter");
76-
Ensure.ArgumentNotNull(filter.IncludeReachableFrom, "filter.IncludeReachableFrom");
77-
Ensure.ArgumentNotNullOrEmptyString(filter.IncludeReachableFrom.ToString(), "filter.IncludeReachableFrom");
75+
Ensure.ArgumentNotNull(filter, nameof(filter));
76+
Ensure.ArgumentNotNull(filter.IncludeReachableFrom, nameof(filter.IncludeReachableFrom));
77+
Ensure.ArgumentNotNullOrEmptyString(filter.IncludeReachableFrom.ToString(), nameof(filter.IncludeReachableFrom.ToString()));
7878

7979
return new CommitLog(repo, filter);
8080
}
@@ -86,7 +86,7 @@ public ICommitLog QueryBy(CommitFilter filter)
8686
/// <returns>A list of file history entries, ready to be enumerated.</returns>
8787
public IEnumerable<LogEntry> QueryBy(string path)
8888
{
89-
Ensure.ArgumentNotNull(path, "path");
89+
Ensure.ArgumentNotNull(path, nameof(path));
9090

9191
return new FileHistory(repo, path);
9292
}
@@ -99,8 +99,8 @@ public IEnumerable<LogEntry> QueryBy(string path)
9999
/// <returns>A list of file history entries, ready to be enumerated.</returns>
100100
public IEnumerable<LogEntry> QueryBy(string path, CommitFilter filter)
101101
{
102-
Ensure.ArgumentNotNull(path, "path");
103-
Ensure.ArgumentNotNull(filter, "filter");
102+
Ensure.ArgumentNotNull(path, nameof(path));
103+
Ensure.ArgumentNotNull(filter, nameof(filter));
104104

105105
return new FileHistory(repo, path, filter);
106106
}

0 commit comments

Comments
 (0)