starred/markdig
1
0
Fork 0
mirror of https://github.com/xoofx/markdig.git synced 2026-10-08 14:48:32 +00:00
Code Issues 690 Packages Projects Releases 21 Wiki Activity

Remove hardcoded attached LinkReferenceDefinitions from Document and use GetData/SetData

Browse Source
This commit is contained in:
Alexandre Mutel
2016-03-03 23:57:09 +09:00
parent 63e5bf6718
commit efdecce098
7 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Textamina.Markdig/Extensions/Footnotes/FootnoteParser.cs
View File

@@ -53,7 +53,7 @@ namespace Textamina.Markdig.Extensions.Footnotes
Footnote = footnote,
CreateLinkInline = CreateLinkToFootnote
};
state.Document.LinkReferenceDefinitions[footnote.Label] = linkRef;
state.Document.GetLinkReferenceDefinitions()[footnote.Label] = linkRef;
state.NewBlocks.Push(footnote);
return BlockState.Continue;

4
src/Textamina.Markdig/Parsers/Inlines/LinkInlineParser.cs
View File

@@ -53,7 +53,7 @@ namespace Textamina.Markdig.Parsers.Inlines
// If the label is followed by either a ( or a [, this is not a shortcut
if (LinkHelper.TryParseLabel(ref slice, out label))
{
if (!state.Document.LinkReferenceDefinitions.ContainsKey(label))
if (!state.Document.GetLinkReferenceDefinitions().ContainsKey(label))
{
label = null;
}
@@ -93,7 +93,7 @@ namespace Textamina.Markdig.Parsers.Inlines
{
bool isValidLink = false;
LinkReferenceDefinition linkRef;
if (state.Document.LinkReferenceDefinitions.TryGetValue(label, out linkRef))
if (state.Document.GetLinkReferenceDefinitions().TryGetValue(label, out linkRef))
{
Inline link = null;
// Try to use a callback directly defined on the LinkReferenceDefinition

5
src/Textamina.Markdig/Parsers/ParagraphBlockParser.cs
View File

@@ -139,6 +139,7 @@ namespace Textamina.Markdig.Parsers
{
bool atLeastOneFound = false;
var references = state.Document.GetLinkReferenceDefinitions();
while (true)
{
// If we have found a LinkReferenceDefinition, we can discard the previous paragraph
@@ -146,9 +147,9 @@ namespace Textamina.Markdig.Parsers
LinkReferenceDefinition linkReferenceDefinition;
if (LinkReferenceDefinition.TryParse(ref iterator, out linkReferenceDefinition))
{
if (!state.Document.LinkReferenceDefinitions.ContainsKey(linkReferenceDefinition.Label))
if (!references.ContainsKey(linkReferenceDefinition.Label))
{
state.Document.LinkReferenceDefinitions[linkReferenceDefinition.Label] = linkReferenceDefinition;
references[linkReferenceDefinition.Label] = linkReferenceDefinition;
}
atLeastOneFound = true;

8
src/Textamina.Markdig/Syntax/Document.cs
View File

@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
namespace Textamina.Markdig.Syntax
namespace Textamina.Markdig.Syntax
{
public class Document : ContainerBlock
{
public Document() : base(null)
{
LinkReferenceDefinitions = new Dictionary<string, LinkReferenceDefinition>(StringComparer.OrdinalIgnoreCase);
}
public Dictionary<string, LinkReferenceDefinition> LinkReferenceDefinitions { get; }
}
}

2
src/Textamina.Markdig/Syntax/LinkReferenceDefinition.cs
View File

@@ -6,6 +6,8 @@ namespace Textamina.Markdig.Syntax
{
public class LinkReferenceDefinition : LeafBlock
{
public static readonly object DocumentKey = typeof (LinkReferenceDefinition);
public delegate Inline CreateLinkInlineDelegate(InlineParserState inlineState, LinkReferenceDefinition linkRef, Inline child = null);
public LinkReferenceDefinition() : base(null)

19
src/Textamina.Markdig/Syntax/LinkReferenceDefinitionExtensions.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
namespace Textamina.Markdig.Syntax
{
public static class LinkReferenceDefinitionExtensions
{
public static Dictionary<string, LinkReferenceDefinition> GetLinkReferenceDefinitions(this Document document)
{
var references = document.GetData(LinkReferenceDefinition.DocumentKey) as Dictionary<string, LinkReferenceDefinition>;
if (references == null)
{
references = new Dictionary<string, LinkReferenceDefinition>(StringComparer.OrdinalIgnoreCase);
document.SetData(LinkReferenceDefinition.DocumentKey, references);
}
return references;
}
}
}

1
src/Textamina.Markdig/Textamina.Markdig.csproj
View File

@@ -86,6 +86,7 @@
<Compile Include="Parsers\BlockParserList.cs" />
<Compile Include="Parsers\IBlockParser.cs" />
<Compile Include="Renderers\TextRendererBase.cs" />
<Compile Include="Syntax\LinkReferenceDefinitionExtensions.cs" />
<Compile Include="Syntax\MarkdownObject.cs" />
<Compile Include="Parsers\IMarkdownParser.cs" />
<Compile Include="Parsers\IDelimiterProcessor.cs" />