Skip to content

NLogMessageParameterList - Changed _originalMessageIndex from nullable to magic value #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snakefoot merged 1 commit into from
Nov 7, 2024
Merged

NLogMessageParameterList - Changed _originalMessageIndex from nullable to magic value #771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ internal class NLogMessageParameterList : IList<MessageTemplateParameter>
private static readonly NLogMessageParameterList OriginalMessageList = new NLogMessageParameterList(new[] { new KeyValuePair<string, object>(NLogLogger.OriginalFormatPropertyName, string.Empty) }, 0, default, default);

private readonly IReadOnlyList<KeyValuePair<string, object>> _parameterList;
private readonly int? _originalMessageIndex;
private readonly int _originalMessageIndex;
private readonly bool _hasComplexParameters;
private readonly bool _isPositional;

public bool HasComplexParameters => _hasComplexParameters;
public bool IsPositional => _isPositional;
public int Count => _parameterList.Count - (_originalMessageIndex.HasValue ? 1 : 0);
public int Count => _originalMessageIndex != int.MaxValue ? _parameterList.Count - 1 : _parameterList.Count;
public bool IsReadOnly => true;

private NLogMessageParameterList(IReadOnlyList<KeyValuePair<string, object>> parameterList, int? originalMessageIndex, bool hasComplexParameters, bool isPositional)
{
_parameterList = parameterList;
_originalMessageIndex = originalMessageIndex;
_originalMessageIndex = originalMessageIndex ?? int.MaxValue;
_hasComplexParameters = hasComplexParameters;
_isPositional = isPositional;
}
Expand Down Expand Up @@ -72,14 +72,14 @@ public static NLogMessageParameterList TryParse(IReadOnlyList<KeyValuePair<strin

public bool HasMessageTemplateSyntax(bool parseMessageTemplates)
{
return _originalMessageIndex.HasValue && (HasComplexParameters || (parseMessageTemplates && Count > 0));
return _originalMessageIndex != int.MaxValue && (HasComplexParameters || (parseMessageTemplates && _parameterList.Count > 1));
}

public string GetOriginalMessage(IReadOnlyList<KeyValuePair<string, object>> messageProperties)
{
if (_originalMessageIndex < messageProperties?.Count)
{
return messageProperties[_originalMessageIndex.Value].Value as string;
return messageProperties[_originalMessageIndex].Value as string;
}
return null;
}
Expand Down Expand Up @@ -179,7 +179,7 @@ public MessageTemplateParameter this[int index]
{
get
{
var parameter = _parameterList[index >= _originalMessageIndex ? index + 1 : index];
var parameter = _parameterList[index < _originalMessageIndex ? index : index + 1];
return _hasComplexParameters ?
GetMessageTemplateParameter(parameter.Key, parameter.Value) :
new MessageTemplateParameter(parameter.Key, parameter.Value, null, CaptureType.Normal);
Expand Down