Fix callouts on api headers

Author: reakaleek

docs/testing/index.md

@@ -33,11 +33,13 @@ The files in this directory are used for testing purposes. Do not edit these fil
       ```
 
 ```console
-PUT metricbeat-2016.05.30/_doc/1?refresh
+PUT metricbeat-2016.05.30/_doc/1?refresh <1>
 {"system.cpu.idle.pct": 0.908}
-PUT metricbeat-2016.05.31/_doc/1?refresh
+PUT metricbeat-2016.05.31/_doc/1?refresh <2>
 {"system.cpu.idle.pct": 0.105}
 ```
+1. test 1
+2. test 2
 
 ```console
 POST _reindex

src/Elastic.Markdown/Myst/CodeBlocks/Code.cshtml

@@ -13,7 +13,7 @@
 		{
 			@foreach (var segment in Model.ApiSegments)
 			{
-				<code class="language-apiheader">@segment.Header</code>
+				<code class="language-apiheader">@segment.Header@(Model.RenderConsoleCallouts(segment.LineNumber))</code>
 				@if (segment.ContentLines.Count > 0)
 				{
 					<code class="language-json">@string.Join("\n", segment.ContentLines)</code>

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

@@ -29,4 +29,21 @@ public HtmlString RenderBlock()
 		DocumentationObjectPoolProvider.HtmlRendererPool.Return(subscription);
 		return new HtmlString(result);
 	}
+
+	public HtmlString RenderConsoleCallouts(int lineNumber)
+	{
+		if (EnhancedCodeBlock?.CallOuts == null)
+			return HtmlString.Empty;
+
+		var callouts = EnhancedCodeBlock.CallOuts.Where(c => c.Line == lineNumber);
+		if (!callouts.Any())
+			return HtmlString.Empty;
+
+		var html = new System.Text.StringBuilder();
+		foreach (var callout in callouts)
+		{
+			_ = html.Append($"<span class=\"code-callout\" data-index=\"{callout.Index}\"></span>");
+		}
+		return new HtmlString(html.ToString());
+	}
 }

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

@@ -14,6 +14,7 @@ public class ApiSegment
 {
 	public string Header { get; set; } = "";
 	public List<string> ContentLines { get; set; } = [];
+	public int LineNumber { get; set; }
 }
 
 public class EnhancedCodeBlock(BlockParser parser, ParserContext context)

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

@@ -329,14 +329,17 @@ private static void ProcessConsoleCodeBlock(
 			// Check if this line is an HTTP verb (API call header)
 			if (IsHttpVerb(lineText))
 			{
-				// If we have a current segment with content, save it
 				if (!string.IsNullOrEmpty(currentSegment.Header) || currentSegment.ContentLines.Count > 0)
 					codeBlock.ApiSegments.Add(currentSegment);
 
-				// Start a new segment
+				// Process callouts before creating the segment to capture them on the original line
+				if (codeBlockArgs.UseCallouts && codeBlock.OpeningFencedCharCount <= 3)
+					ProcessCalloutsForLine(span, codeBlock, ref callOutIndex, originatingLine);
+
 				currentSegment = new ApiSegment
 				{
-					Header = lineText
+					Header = lineText,
+					LineNumber = originatingLine
 				};
 
 				// Clear this line from the content since it's now a header
@@ -345,14 +348,12 @@ private static void ProcessConsoleCodeBlock(
 			}
 			else
 			{
-				// This is content for the current segment
 				if (!string.IsNullOrEmpty(lineText.Trim()))
 					currentSegment.ContentLines.Add(lineText);
-			}
 
-			// Process callouts if enabled
-			if (codeBlockArgs.UseCallouts && codeBlock.OpeningFencedCharCount <= 3)
-				ProcessCalloutsForLine(span, codeBlock, ref callOutIndex, originatingLine);
+				if (codeBlockArgs.UseCallouts && codeBlock.OpeningFencedCharCount <= 3)
+					ProcessCalloutsForLine(span, codeBlock, ref callOutIndex, originatingLine);
+			}
 		}
 
 		// Add the last segment if it has content
@@ -413,12 +414,38 @@ private static void ProcessCalloutPostProcessing(StringLineGroup lines, Enhanced
 				return acc;
 			});
 
-			foreach (var callout in callouts.Values)
+			// Console code blocks use ApiSegments for rendering, so we need to update headers directly
+			// Note: console language gets converted to "json" for syntax highlighting
+			if ((codeBlock.Language == "json" || codeBlock.Language == "console") && codeBlock.ApiSegments.Count > 0)
 			{
-				var line = lines.Lines[callout.Line - 1];
-				var newSpan = line.Slice.AsSpan()[..callout.SliceStart];
-				var s = new StringSlice(newSpan.ToString());
-				lines.Lines[callout.Line - 1] = new StringLine(ref s);
+				foreach (var callout in callouts.Values)
+				{
+					foreach (var segment in codeBlock.ApiSegments)
+					{
+						var calloutPattern = $"<{callout.Index}>";
+						if (segment.Header.Contains(calloutPattern))
+						{
+							segment.Header = segment.Header.Replace(calloutPattern, "").Trim();
+							break;
+						}
+					}
+				}
+			}
+			else
+			{
+				foreach (var callout in callouts.Values)
+				{
+					var line = lines.Lines[callout.Line - 1];
+					var span = line.Slice.AsSpan();
+
+					// Skip callouts on cleared lines to avoid ArgumentOutOfRangeException
+					if (span.Length == 0 || callout.SliceStart >= span.Length)
+						continue;
+
+					var newSpan = span[..callout.SliceStart];
+					var s = new StringSlice(newSpan.ToString());
+					lines.Lines[callout.Line - 1] = new StringLine(ref s);
+				}
 			}
 		}
 	}