Merge branch 'main' into feature/fix-relative-links

Author: reakaleek

.github/workflows/comment-on-asciidoc-changes.yml

@@ -36,7 +36,7 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: context.payload.pull_request.number,
-              body: 'It looks like this PR modifies one or more `.asciidoc` files. These files are being migrated to Markdown, and any changes merged now will be lost. See the [migration guide](https://elastic.github.io/docs-builder/migration/freeze/index.html) for details.'
+              body: '> [!WARNING]\n> It looks like this PR modifies one or more `.asciidoc` files. These files are being migrated to Markdown, and any changes merged now will be lost. See the [migration guide](https://elastic.github.io/docs-builder/migration/freeze/index.html) for details.'
             })
 
       - name: Error if .asciidoc files changed

docs/syntax/applies.md

@@ -52,9 +52,7 @@ Are equivalent, note `all` just means we won't be rendering the version portion
 ## This section has its own applies annotations [#sections]
 
 :::{applies}
-:stack: unavailable
-:serverless: tech-preview
-:cloud: ga
+:serverless: unavailable
 :::
 
 :::{note}

src/Elastic.Markdown/DocumentationGenerator.cs

@@ -72,7 +72,6 @@ public async Task GenerateAll(Cancel ctx)
 
 		await ExtractEmbeddedStaticResources(ctx);
 
-
 		_logger.LogInformation($"Completing diagnostics channel");
 		Context.Collector.Channel.TryComplete();
 
@@ -92,6 +91,7 @@ private async Task ProcessDocumentationFiles(HashSet<string> offendingFiles, Dat
 	{
 		var processedFileCount = 0;
 		var exceptionCount = 0;
+		var totalFileCount = DocumentationSet.Files.Count;
 		_ = Context.Collector.StartAsync(ctx);
 		await Parallel.ForEachAsync(DocumentationSet.Files, ctx, async (file, token) =>
 		{
@@ -112,8 +112,9 @@ await Parallel.ForEachAsync(DocumentationSet.Files, ctx, async (file, token) =>
 			}
 
 			if (processedFiles % 100 == 0)
-				_logger.LogInformation($"-> Handled {processedFiles} files");
+				_logger.LogInformation($"-> Processed {processedFiles}/{totalFileCount} files");
 		});
+		_logger.LogInformation($"-> Processed {processedFileCount}/{totalFileCount} files");
 	}
 
 	private async Task ExtractEmbeddedStaticResources(Cancel ctx)
@@ -149,7 +150,7 @@ private async Task ProcessFile(HashSet<string> offendingFiles, DocumentationFile
 				return;
 		}
 
-		_logger.LogTrace($"{file.SourceFile.FullName}");
+		_logger.LogTrace($"--> {file.SourceFile.FullName}");
 		var outputFile = OutputFile(file.RelativePath);
 		if (file is MarkdownFile markdown)
 			await HtmlWriter.WriteAsync(outputFile, markdown, token);

src/Elastic.Markdown/Myst/CodeBlocks/CallOutParser.cs

@@ -8,9 +8,9 @@ namespace Elastic.Markdown.Myst.CodeBlocks;
 
 public static partial class CallOutParser
 {
-	[GeneratedRegex(@"^.+\S+.*?\s<\d+>$", RegexOptions.IgnoreCase, "en-US")]
+	[GeneratedRegex(@"^.+\S+.*?\s<\d+>$", RegexOptions.IgnoreCase, 2000, "en-US")]
 	public static partial Regex CallOutNumber();
 
-	[GeneratedRegex(@"^.+\S+.*?\s(?:\/\/|#)\s[^""\/#]+$", RegexOptions.IgnoreCase, "en-US")]
+	[GeneratedRegex(@"^.+\S+.*?\s(?:\/\/|#)\s[^""\/#]+$", RegexOptions.IgnoreCase, 2000, "en-US")]
 	public static partial Regex MathInlineAnnotation();
 }

src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockParser.cs

@@ -119,7 +119,7 @@ public override bool Close(BlockProcessor processor, Block block)
 				continue;
 
 			List<CallOut> callOuts = [];
-			var hasClassicCallout = span.IndexOf("<") > 0;
+			var hasClassicCallout = span.IndexOf("<") > 0 && span.LastIndexOf(">") == span.Length - 1;
 			if (hasClassicCallout)
 			{
 				var matchClassicCallout = CallOutParser.CallOutNumber().EnumerateMatches(span);

src/Elastic.Markdown/Myst/Comments/CommentBlockParser.cs

@@ -155,7 +155,7 @@ public override bool Close(BlockProcessor processor, Block block)
 	{
 		if (!processor.TrackTrivia)
 		{
-			var heading = (HeadingBlock)block;
+			var heading = (CommentBlock)block;
 			heading.Lines.Trim();
 		}
 

src/Elastic.Markdown/Myst/MarkdownParser.cs

@@ -60,7 +60,6 @@ public static MarkdownPipeline Pipeline
 				return _pipeline;
 
 			var builder = new MarkdownPipelineBuilder()
-				.EnableTrackTrivia()
 				.UseInlineAnchors()
 				.UsePreciseSourceLocation()
 				.UseDiagnosticLinks()

src/Elastic.Markdown/Slices/HtmlWriter.cs

@@ -28,6 +28,9 @@ public HtmlWriter(DocumentationSet documentationSet, IFileSystem writeFileSystem
 	public ILoggerFactory LoggerFactory { get; }
 	public ServiceProvider ServiceProvider { get; }
 
+	private Task<string> RenderEmptyString(MarkdownFile markdown, Cancel ctx = default) =>
+		Task.FromResult(string.Empty);
+
 	private async Task<string> RenderNavigation(MarkdownFile markdown, Cancel ctx = default)
 	{
 		var slice = Layout._TocTree.Create(new NavigationViewModel

src/docs-assembler/Cli/Filters.cs

@@ -45,7 +45,8 @@ public override async Task InvokeAsync(ConsoleAppContext context, CancellationTo
 				return;
 			}
 
-			ConsoleApp.LogError(ex.ToString()); // .ToString() shows stacktrace, .Message can avoid showing stacktrace to user.
+			throw;
+
 		}
 	}
 }

src/docs-builder/Cli/Filters.cs

@@ -44,7 +44,8 @@ public override async Task InvokeAsync(ConsoleAppContext context, CancellationTo
 				return;
 			}
 
-			ConsoleApp.LogError(ex.ToString());
+			throw;
+
 		}
 	}
 }