Skip to content

Commit 0b943fe

Browse files
committed
Cleaning code (_field)
1 parent dbb8ded commit 0b943fe

40 files changed

+207
-205
lines changed

DataCommander.Providers.SqlServer/SqlServerProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ GetCompletionResponse IProvider.GetCompletion(
404404
{
405405
var parts = new IdentifierParser(new StringReader(currentToken.Value)).Parse().ToList();
406406
var lastPart = parts.Count > 0
407-
? IListExtensions.Last(parts)
407+
? ListExtensions.Last(parts)
408408
: null;
409409
var lastPartLength = lastPart != null
410410
? lastPart.Length
@@ -923,7 +923,7 @@ List<Statement> IProvider.GetStatements(string commandText)
923923
foreach (var statementTokens in tokens.Split(token => IsBatchSeparator(commandText, token)).Where(statementTokens => statementTokens.Length > 0))
924924
{
925925
var startIndex = statementTokens[0].StartPosition;
926-
var endIndex = IListExtensions.Last(statementTokens).EndPosition;
926+
var endIndex = ListExtensions.Last(statementTokens).EndPosition;
927927
var length = endIndex - startIndex + 1;
928928
var statement = new Statement
929929
{

Foundation.NetStandard-2.0/ArgumentEqualsSelection.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ namespace Foundation
99
/// <typeparam name="TArgument"></typeparam>
1010
public sealed class ArgumentEqualsSelection<TArgument> where TArgument : IEquatable<TArgument>
1111
{
12-
private readonly TArgument argument;
13-
private bool selected;
12+
private readonly TArgument _argument;
13+
private bool _selected;
1414

1515
/// <summary>
1616
///
1717
/// </summary>
1818
/// <param name="argument"></param>
1919
public ArgumentEqualsSelection(TArgument argument)
2020
{
21-
this.argument = argument;
21+
this._argument = argument;
2222
}
2323

2424
/// <summary>
@@ -31,10 +31,10 @@ public ArgumentEqualsSelection<TArgument> IfArgumentEquals(TArgument other, Acti
3131
{
3232
Assert.IsNotNull(action);
3333

34-
if (!selected)
34+
if (!_selected)
3535
{
36-
selected = argument.Equals(other);
37-
if (selected)
36+
_selected = _argument.Equals(other);
37+
if (_selected)
3838
{
3939
action();
4040
}
@@ -51,7 +51,7 @@ public void Else(Action action)
5151
{
5252
Assert.IsNotNull(action);
5353

54-
if (!selected)
54+
if (!_selected)
5555
action();
5656
}
5757
}

Foundation.NetStandard-2.0/ArgumentIsSelection.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ namespace Foundation
99
/// <typeparam name="TArgument"></typeparam>
1010
public sealed class ArgumentIsSelection<TArgument> where TArgument : class
1111
{
12-
private readonly TArgument argument;
13-
private bool selected;
12+
private readonly TArgument _argument;
13+
private bool _selected;
1414

1515
/// <summary>
1616
///
1717
/// </summary>
1818
/// <param name="argument"></param>
1919
public ArgumentIsSelection(TArgument argument)
2020
{
21-
this.argument = argument;
21+
this._argument = argument;
2222
}
2323

2424
/// <summary>
@@ -31,11 +31,11 @@ public ArgumentIsSelection<TArgument> IfArgumentIs<TArgumentAs>(Action<TArgument
3131
{
3232
Assert.IsNotNull(action);
3333

34-
if (!selected)
34+
if (!_selected)
3535
{
36-
var argumentAs = argument as TArgumentAs;
37-
selected = argumentAs != null;
38-
if (selected)
36+
var argumentAs = _argument as TArgumentAs;
37+
_selected = argumentAs != null;
38+
if (_selected)
3939
{
4040
action(argumentAs);
4141
}
@@ -53,10 +53,10 @@ public ArgumentIsSelection<TArgument> IfArgumentIsNull(Action action)
5353
{
5454
Assert.IsNotNull(action);
5555

56-
if (!selected)
56+
if (!_selected)
5757
{
58-
selected = argument == null;
59-
if (selected)
58+
_selected = _argument == null;
59+
if (_selected)
6060
{
6161
action();
6262
}
@@ -75,10 +75,10 @@ public ArgumentIsSelection<TArgument> If(Func<bool> condition, Action action)
7575
{
7676
Assert.IsNotNull(action);
7777

78-
if (!selected)
78+
if (!_selected)
7979
{
80-
selected = condition();
81-
if (selected)
80+
_selected = condition();
81+
if (_selected)
8282
{
8383
action();
8484
}
@@ -95,7 +95,7 @@ public void Else(Action action)
9595
{
9696
Assert.IsNotNull(action);
9797

98-
if (!selected)
98+
if (!_selected)
9999
action();
100100
}
101101
}

Foundation.NetStandard-2.0/CommandLine.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Foundation
1313
/// </summary>
1414
public sealed class CommandLine
1515
{
16-
private readonly IndexableCollection<CommandLineArgument> arguments;
16+
private readonly IndexableCollection<CommandLineArgument> _arguments;
1717

1818
/// <summary>
1919
///
@@ -23,17 +23,17 @@ public CommandLine(string commandLine)
2323
{
2424
Assert.IsNotNull(commandLine);
2525

26-
this.arguments = new IndexableCollection<CommandLineArgument>(ListIndex);
26+
this._arguments = new IndexableCollection<CommandLineArgument>(ListIndex);
2727
var dictionary = new Dictionary<string, ICollection<CommandLineArgument>>(StringComparer.InvariantCultureIgnoreCase);
2828
NameIndex = new NonUniqueIndex<string, CommandLineArgument>(
2929
"nameIndex",
3030
argument => GetKeyResponse.Create(argument.Name != null, argument.Name),
3131
dictionary,
3232
() => new List<CommandLineArgument>());
33-
this.arguments.Indexes.Add(NameIndex);
33+
this._arguments.Indexes.Add(NameIndex);
3434
var stringReader = new StringReader(commandLine);
3535
var arguments = Parse(stringReader);
36-
this.arguments.Add(arguments);
36+
this._arguments.Add(arguments);
3737
}
3838

3939
/// <summary>

Foundation.NetStandard-2.0/CurrentDirectoryChanger.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ namespace Foundation
77
/// </summary>
88
public sealed class CurrentDirectoryChanger : IDisposable
99
{
10-
private readonly string currentDirectory;
10+
private readonly string _currentDirectory;
1111

1212
/// <summary>
1313
///
1414
/// </summary>
1515
/// <param name="path"></param>
1616
public CurrentDirectoryChanger( string path )
1717
{
18-
currentDirectory = Environment.CurrentDirectory;
18+
_currentDirectory = Environment.CurrentDirectory;
1919
Environment.CurrentDirectory = path;
2020
}
2121

2222
#region IDisposable Members
2323

2424
void IDisposable.Dispose()
2525
{
26-
Environment.CurrentDirectory = currentDirectory;
26+
Environment.CurrentDirectory = _currentDirectory;
2727
}
2828

2929
#endregion

Foundation.NetStandard-2.0/Data/ExecuteNonReaderRequest.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ public ExecuteNonReaderRequest(CreateCommandRequest createCommandRequest, Cancel
1515
}
1616

1717
public ExecuteNonReaderRequest(string commandText)
18-
: this(new CreateCommandRequest(commandText), CancellationToken.None) => ;
18+
: this(new CreateCommandRequest(commandText), CancellationToken.None)
19+
{
20+
}
1921

2022
public ExecuteNonReaderRequest(string commandText, ReadOnlyCollection<object> parameters)
21-
: this(new CreateCommandRequest(commandText, parameters), CancellationToken.None) => ;
23+
: this(new CreateCommandRequest(commandText, parameters), CancellationToken.None)
24+
{
25+
}
2226
}
2327
}

Foundation.NetStandard-2.0/Data/IDataParameterCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Foundation.Data
1111
/// <summary>
1212
///
1313
/// </summary>
14-
public static class IDataParameterCollectionExtensions
14+
public static class DataParameterCollectionExtensions
1515
{
1616
/// <summary>
1717
///

Foundation.NetStandard-2.0/Data/IDataReaderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Foundation.Data
99
{
10-
public static class IDataReaderExtensions
10+
public static class DataReaderExtensions
1111
{
1212
public static void ReadResult(this IDataReader dataReader, Action readRecord)
1313
{

Foundation.NetStandard-2.0/Data/IDataRecordExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Foundation.Data
77
/// <summary>
88
///
99
/// </summary>
10-
public static class IDataRecordExtensions
10+
public static class DataRecordExtensions
1111
{
1212
public static byte[] GetBytes(this IDataRecord dataRecord, int fieldIndex)
1313
{

Foundation.NetStandard-2.0/Data/IDbCommandAsyncExecutorExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Foundation.Data
99
{
10-
public static class IDbCommandAsyncExecutorExtensions
10+
public static class DbCommandAsyncExecutorExtensions
1111
{
1212
private static Task ExecuteAsync(this IDbCommandAsyncExecutor executor, IEnumerable<ExecuteCommandAsyncRequest> requests, CancellationToken cancellationToken)
1313
{

0 commit comments

Comments
 (0)