test

Author: reakaleek

docs/testing/index.md

@@ -9,8 +9,14 @@ The files in this directory are used for testing purposes. Do not edit these fil
 
 ```json
 { // <1>
-  "key": "value" // <1> <2>
+  "key": "value" // <1> <2> <3>
 } // <2>
 ```
 1. What
-2. Why
+2. Why
+3. Wut
+
+```yaml
+wtf:
+ is_this: 123 # Wtf
+```

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

@@ -130,10 +130,12 @@ public override bool Close(BlockProcessor processor, Block block)
 		//update string slices to ignore call outs
 		if (codeBlock.CallOuts?.Count > 0)
 		{
-			foreach (var calloutLine in codeBlock.CallOuts.Select(c => c.Line).ToHashSet())
+			foreach (var calloutLine in codeBlock.CallOuts.Select(c => c.Line).Distinct())
 			{
 				var line = lines.Lines[calloutLine - 1];
 				var index = Math.Max(line.Slice.AsSpan().IndexOf("//"), line.Slice.AsSpan().IndexOf('#'));
+				if (index < 0)
+					continue;
 				var newSpan = line.Slice.AsSpan()[..(index)];
 				var s = new StringSlice(newSpan.ToString());
 				lines.Lines[calloutLine - 1] = new StringLine(ref s);
@@ -163,46 +165,71 @@ private static List<CallOut> EnumerateAnnotations(Regex.ValueMatchEnumerator mat
 			if (match.Length == 0)
 				continue;
 
-			var startIndex = span.LastIndexOf("<");
-			if (!inlineCodeAnnotation && startIndex <= 0)
-				continue;
 			if (inlineCodeAnnotation)
 			{
-				startIndex = Math.Max(span.LastIndexOf("//"), span.LastIndexOf('#'));
-				if (startIndex <= 0)
-					continue;
+				var callOut = ParseMagicCallout(match, ref span, ref callOutIndex, originatingLine);
+				if (callOut != null)
+					return [callOut];
+				continue;
 			}
 
-			callOutIndex++;
+			var classicCallOuts = ParseClassicCallOuts(match, ref span, ref callOutIndex, originatingLine);
+			callOuts.AddRange(classicCallOuts);
+		}
 
-			var allStartIndices = new List<int>();
-			for (var i = 0; i < span.Length; i++)
-			{
-			    if (span[i] == '<') allStartIndices.Add(i);
-			}
+		return callOuts;
+	}
+
+	private static CallOut? ParseMagicCallout(ValueMatch match, ref ReadOnlySpan<char> span, ref int callOutIndex, int originatingLine)
+	{
+		var startIndex = Math.Max(span.LastIndexOf("//"), span.LastIndexOf('#'));
+		if (startIndex <= 0)
+			return null;
+
+		callOutIndex++;
+		var callout = span.Slice(match.Index + startIndex, match.Length - startIndex);
 
-			foreach (var individualStartIndex in allStartIndices)
+		return new CallOut
+		{
+			Index = callOutIndex,
+			Text = callout.TrimStart('/').TrimStart('#').TrimStart().ToString(),
+			InlineCodeAnnotation = true,
+			SliceStart = startIndex,
+			Line = originatingLine,
+		};
+	}
+
+	private static List<CallOut> ParseClassicCallOuts(ValueMatch match, ref ReadOnlySpan<char> span, ref int callOutIndex, int originatingLine)
+	{
+		var startIndex = span.LastIndexOf("<");
+		if (startIndex <= 0)
+			return [];
+
+		callOutIndex++;
+
+		var allStartIndices = new List<int>();
+		for (var i = 0; i < span.Length; i++)
+		{
+			if (span[i] == '<')
+				allStartIndices.Add(i);
+		}
+
+		var callOuts = new List<CallOut>();
+		foreach (var individualStartIndex in allStartIndices)
+		{
+			var endIndex = span.Slice(match.Index + individualStartIndex).IndexOf('>') + 1;
+			var callout = span.Slice(match.Index + individualStartIndex, endIndex);
+			_ = int.TryParse(callout.Trim(['<', '>']), out var index);
+			callOuts.Add(new CallOut
 			{
-				var endIndex = span.Slice(match.Index + individualStartIndex).IndexOf('>') + 1;
-				var callout = span.Slice(match.Index + individualStartIndex, endIndex);
-				var index = callOutIndex;
-				if (!inlineCodeAnnotation && int.TryParse(callout.Trim(['<', '>']), out index))
-				{
-
-				}
-
-				callOuts.Add(new CallOut
-				{
-					Index = index,
-					Text = callout.TrimStart('/').TrimStart('#').TrimStart().ToString(),
-					InlineCodeAnnotation = inlineCodeAnnotation,
-					SliceStart = individualStartIndex,
-					Line = originatingLine,
-				});
-			}
+				Index = index,
+				Text = callout.TrimStart('/').TrimStart('#').TrimStart().ToString(),
+				InlineCodeAnnotation = false,
+				SliceStart = individualStartIndex,
+				Line = originatingLine,
+			});
 		}
 
 		return callOuts;
 	}
 }
-