Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public override void Build(FileModel model, IHostService host)
}
var content = (Dictionary<string, object>)model.Content;
var markdown = (string)content[ConceptualKey];
var result = host.Markup(markdown, model.OriginalFileAndType, false, true);
var result = host.Markup(markdown, model.OriginalFileAndType, false);

var htmlInfo = HtmlDocumentUtility.SeparateHtml(result.Html);
content["rawTitle"] = htmlInfo.RawTitle;
Expand Down
19 changes: 3 additions & 16 deletions src/Docfx.Build.Engine/HostService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,33 +104,20 @@ public MarkupResult Markup(string markdown, FileAndType ft)

public MarkupResult Markup(string markdown, FileAndType ft, bool omitParse)
{
return Markup(markdown, ft, omitParse, false);
}

public MarkupResult Markup(string markdown, FileAndType ft, bool omitParse, bool enableValidation)
{
if (markdown == null)
{
throw new ArgumentNullException(nameof(markdown));
}
if (ft == null)
{
throw new ArgumentNullException(nameof(ft));
}
return MarkupCore(markdown, ft, omitParse, enableValidation);
return MarkupCore(markdown, ft, omitParse);
}

public MarkupResult Parse(MarkupResult markupResult, FileAndType ft)
{
return MarkupUtility.Parse(markupResult, ft.File, SourceFiles);
}

private MarkupResult MarkupCore(string markdown, FileAndType ft, bool omitParse, bool enableValidation)
private MarkupResult MarkupCore(string markdown, FileAndType ft, bool omitParse)
{
try
{
var mr = MarkdownService is MarkdigMarkdownService markdig
? markdig.Markup(markdown, ft.File, enableValidation, ft.Type is DocumentType.Overwrite)
? markdig.Markup(markdown, ft.File, ft.Type is DocumentType.Overwrite)
: MarkdownService.Markup(markdown, ft.File);
if (omitParse)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ private static string MarkupCore(string content, IProcessContext context, string
{
var host = context.Host;

var mr = host.Markup(content, context.GetOriginalContentFile(path), false, true);
var mr = host.Markup(content, context.GetOriginalContentFile(path), false);
(context.FileLinkSources).Merge(mr.FileLinkSources);
(context.UidLinkSources).Merge(mr.UidLinkSources);
(context.Dependency).UnionWith(mr.Dependency);
Expand Down
19 changes: 6 additions & 13 deletions src/Docfx.MarkdigEngine/MarkdigMarkdownService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public class MarkdigMarkdownService : IMarkdownService
public string Name => "markdig";

private readonly MarkdownServiceParameters _parameters;
private readonly MarkdownValidatorBuilder _mvb;
private readonly MarkdownContext _context;
private readonly Func<MarkdownPipelineBuilder, MarkdownPipelineBuilder> _configureMarkdig;

Expand All @@ -26,7 +25,6 @@ public MarkdigMarkdownService(
{
_parameters = parameters;
_configureMarkdig = configureMarkdig;
_mvb = MarkdownValidatorBuilder.Create(parameters);
_context = new MarkdownContext(
key => _parameters.Tokens.TryGetValue(key, out var value) ? value : null,
(code, message, origin, line) => Logger.LogInfo(message, null, InclusionContext.File.ToString(), line?.ToString(), code),
Expand All @@ -40,10 +38,10 @@ public MarkdigMarkdownService(

public MarkupResult Markup(string content, string filePath)
{
return Markup(content, filePath, false, false);
return Markup(content, filePath, false);
}

public MarkupResult Markup(string content, string filePath, bool enableValidation, bool multipleYamlHeader)
public MarkupResult Markup(string content, string filePath, bool multipleYamlHeader)
{
if (content == null)
{
Expand All @@ -55,7 +53,7 @@ public MarkupResult Markup(string content, string filePath, bool enableValidatio
throw new ArgumentException("file path can't be null or empty.");
}

var pipeline = CreateMarkdownPipeline(isInline: false, enableValidation, multipleYamlHeader);
var pipeline = CreateMarkdownPipeline(isInline: false, multipleYamlHeader);

using (InclusionContext.PushFile((RelativePath)filePath))
{
Expand Down Expand Up @@ -84,7 +82,7 @@ public MarkdownDocument Parse(string content, string filePath, bool isInline)
throw new ArgumentException("file path can't be null or empty.");
}

var pipeline = CreateMarkdownPipeline(isInline, enableValidation: false);
var pipeline = CreateMarkdownPipeline(isInline);

using (InclusionContext.PushFile((RelativePath)filePath))
{
Expand Down Expand Up @@ -112,7 +110,7 @@ public MarkupResult Render(MarkdownDocument document, bool isInline)
throw new ArgumentNullException("file path can't be found in AST.");
}

var pipeline = CreateMarkdownPipeline(isInline, enableValidation: false);
var pipeline = CreateMarkdownPipeline(isInline);

using (InclusionContext.PushFile((RelativePath)filePath))
{
Expand All @@ -130,7 +128,7 @@ public MarkupResult Render(MarkdownDocument document, bool isInline)
}
}

private MarkdownPipeline CreateMarkdownPipeline(bool isInline, bool enableValidation, bool multipleYamlHeader = false)
private MarkdownPipeline CreateMarkdownPipeline(bool isInline, bool multipleYamlHeader = false)
{
var enableSourceInfo = _parameters?.Extensions?.EnableSourceInfo ?? true;

Expand All @@ -144,11 +142,6 @@ private MarkdownPipeline CreateMarkdownPipeline(bool isInline, bool enableValida
builder.UseLineNumber(file => ((RelativePath)file).RemoveWorkingFolder());
}

if (enableValidation)
{
builder.Extensions.Add(new ValidationExtension(_mvb, _context));
}

if (isInline)
{
builder.UseInlineOnly();
Expand Down
219 changes: 0 additions & 219 deletions src/Docfx.MarkdigEngine/Validation/MarkdownValidatorBuilder.cs

This file was deleted.

Loading