diff --git a/src/Markdig/Syntax/Block.cs b/src/Markdig/Syntax/Block.cs
index 55c5f5fc..f275a6da 100644
--- a/src/Markdig/Syntax/Block.cs
+++ b/src/Markdig/Syntax/Block.cs
@@ -14,8 +14,8 @@ namespace Markdig.Syntax
///
public abstract class Block : MarkdownObject, IBlock
{
- private BlockTriviaProperties? _trivia;
- private BlockTriviaProperties Trivia => _trivia ??= new();
+ private BlockTriviaProperties? _trivia => GetTrivia();
+ private BlockTriviaProperties Trivia => GetOrSetTrivia();
///
/// Initializes a new instance of the class.
diff --git a/src/Markdig/Syntax/Inlines/CodeInline.cs b/src/Markdig/Syntax/Inlines/CodeInline.cs
index ef336dcf..9d0fb0c2 100644
--- a/src/Markdig/Syntax/Inlines/CodeInline.cs
+++ b/src/Markdig/Syntax/Inlines/CodeInline.cs
@@ -14,8 +14,8 @@ namespace Markdig.Syntax.Inlines
[DebuggerDisplay("`{Content}`")]
public class CodeInline : LeafInline
{
- private TriviaProperties? _trivia;
- private TriviaProperties Trivia => _trivia ??= new();
+ private TriviaProperties? _trivia => GetTrivia();
+ private TriviaProperties Trivia => GetOrSetTrivia();
public CodeInline(string content)
{
diff --git a/src/Markdig/Syntax/Inlines/LinkDelimiterInline.cs b/src/Markdig/Syntax/Inlines/LinkDelimiterInline.cs
index 6b666a18..c954dc49 100644
--- a/src/Markdig/Syntax/Inlines/LinkDelimiterInline.cs
+++ b/src/Markdig/Syntax/Inlines/LinkDelimiterInline.cs
@@ -13,8 +13,8 @@ namespace Markdig.Syntax.Inlines
///
public class LinkDelimiterInline : DelimiterInline
{
- private TriviaProperties? _trivia;
- private TriviaProperties Trivia => _trivia ??= new();
+ private TriviaProperties? _trivia => GetTrivia();
+ private TriviaProperties Trivia => GetOrSetTrivia();
public LinkDelimiterInline(InlineParser parser) : base(parser)
{
diff --git a/src/Markdig/Syntax/Inlines/LinkInline.cs b/src/Markdig/Syntax/Inlines/LinkInline.cs
index 43d587a5..57a05aea 100644
--- a/src/Markdig/Syntax/Inlines/LinkInline.cs
+++ b/src/Markdig/Syntax/Inlines/LinkInline.cs
@@ -21,8 +21,8 @@ namespace Markdig.Syntax.Inlines
[DebuggerDisplay("Url: {Url} Title: {Title} Image: {IsImage}")]
public class LinkInline : ContainerInline
{
- private TriviaProperties? _trivia;
- private TriviaProperties Trivia => _trivia ??= new();
+ private TriviaProperties? _trivia => GetTrivia();
+ private TriviaProperties Trivia => GetOrSetTrivia();
///
/// A delegate to use if it is setup on this instance to allow late binding
diff --git a/src/Markdig/Syntax/MarkdownObject.cs b/src/Markdig/Syntax/MarkdownObject.cs
index f0dc7795..070bffb7 100644
--- a/src/Markdig/Syntax/MarkdownObject.cs
+++ b/src/Markdig/Syntax/MarkdownObject.cs
@@ -71,7 +71,7 @@ namespace Markdig.Syntax
/// as we expect less than 5~10 entries, usually typically 1 (HtmlAttributes)
/// so it will gives faster access than a Dictionary, and lower memory occupation
///
- private DataEntries? _attachedDatas;
+ private DataEntriesAndTrivia? _attachedDatas;
///
/// Gets or sets the text column this instance was declared (zero-based).
@@ -111,7 +111,7 @@ namespace Markdig.Syntax
/// The key.
/// The value.
/// if key is null
- public void SetData(object key, object value) => (_attachedDatas ??= new DataEntries()).SetData(key, value);
+ public void SetData(object key, object value) => (_attachedDatas ??= new DataEntriesAndTrivia()).SetData(key, value);
///
/// Determines whether this instance contains the specified key data.
@@ -137,7 +137,21 @@ namespace Markdig.Syntax
///
public bool RemoveData(object key) => _attachedDatas?.RemoveData(key) ?? false;
- private class DataEntries
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ private protected T? GetTrivia() where T : class
+ {
+ object? trivia = _attachedDatas?.Trivia;
+ return trivia is null ? null : Unsafe.As(trivia);
+ }
+
+ private protected T GetOrSetTrivia() where T : class, new()
+ {
+ var storage = _attachedDatas ??= new DataEntriesAndTrivia();
+ storage.Trivia ??= new T();
+ return Unsafe.As(storage.Trivia);
+ }
+
+ private class DataEntriesAndTrivia
{
private struct DataEntry
{
@@ -151,37 +165,41 @@ namespace Markdig.Syntax
}
}
- private DataEntry[] _entries;
+ private DataEntry[]? _entries;
private int _count;
- public DataEntries()
- {
- _entries = new DataEntry[2];
- }
+ public object? Trivia;
public void SetData(object key, object value)
{
if (key is null) ThrowHelper.ArgumentNullException_key();
- DataEntry[] entries = _entries;
+ DataEntry[]? entries = _entries;
int count = _count;
- for (int i = 0; i < entries.Length && i < count; i++)
+ if (entries is null)
{
- ref DataEntry entry = ref entries[i];
- if (entry.Key == key)
+ _entries = new DataEntry[2];
+ }
+ else
+ {
+ for (int i = 0; i < entries.Length && i < count; i++)
{
- entry.Value = value;
- return;
+ ref DataEntry entry = ref entries[i];
+ if (entry.Key == key)
+ {
+ entry.Value = value;
+ return;
+ }
+ }
+
+ if (count == entries.Length)
+ {
+ Array.Resize(ref _entries, count + 2);
}
}
- if (count == entries.Length)
- {
- Array.Resize(ref _entries, count + 2);
- }
-
- _entries[count] = new DataEntry(key, value);
+ _entries![count] = new DataEntry(key, value);
_count++;
}
@@ -189,7 +207,12 @@ namespace Markdig.Syntax
{
if (key is null) ThrowHelper.ArgumentNullException_key();
- DataEntry[] entries = _entries;
+ DataEntry[]? entries = _entries;
+ if (entries is null)
+ {
+ return null;
+ }
+
int count = _count;
for (int i = 0; i < entries.Length && i < count; i++)
@@ -208,7 +231,12 @@ namespace Markdig.Syntax
{
if (key is null) ThrowHelper.ArgumentNullException_key();
- DataEntry[] entries = _entries;
+ DataEntry[]? entries = _entries;
+ if (entries is null)
+ {
+ return false;
+ }
+
int count = _count;
for (int i = 0; i < entries.Length && i < count; i++)
@@ -226,7 +254,12 @@ namespace Markdig.Syntax
{
if (key is null) ThrowHelper.ArgumentNullException_key();
- DataEntry[] entries = _entries;
+ DataEntry[]? entries = _entries;
+ if (entries is null)
+ {
+ return false;
+ }
+
int count = _count;
for (int i = 0; i < entries.Length && i < count; i++)