Skip to content

Fix truncated text in code callout #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 21, 2025
Merged

Fix truncated text in code callout #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e39b04
Fix code callouts
reakaleek Feb 21, 2025
7a18a3d
cleanup
reakaleek Feb 21, 2025
d5dbe8c
Do the same for the # comment char
reakaleek Feb 21, 2025
2d3b137
Revert
reakaleek Feb 21, 2025
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
2 changes: 1 addition & 1 deletion docs/testing/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ The files in this directory are used for testing purposes. Do not edit these fil
{
"key": "value"
}
```
```
9 changes: 7 additions & 2 deletions src/Elastic.Markdown/Assets/markdown/code.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
}
}

pre code .code-callout .hljs-number {
pre code .code-callout {
@apply ml-1;
transform: translateY(-1px);
user-select: none;
}
Expand All @@ -47,8 +48,12 @@
left: calc(-1 * var(--spacing) * 6);
}
}

pre code .code-callout .hljs-number {
@apply text-white!;
}

pre code .code-callout .hljs-number,
pre code .code-callout,
ol.code-callouts li::before {
@apply text-xs!
text-white!
Expand Down
6 changes: 3 additions & 3 deletions src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ private static List<CallOut> EnumerateAnnotations(Regex.ValueMatchEnumerator mat

private static CallOut? ParseMagicCallout(ValueMatch match, ref ReadOnlySpan<char> span, ref int callOutIndex, int originatingLine)
{
var startIndex = Math.Max(span.LastIndexOf("//"), span.LastIndexOf('#'));
var startIndex = Math.Max(span.LastIndexOf(" // "), span.LastIndexOf(" # "));
if (startIndex <= 0)
return null;

Expand All @@ -248,7 +248,7 @@ private static List<CallOut> EnumerateAnnotations(Regex.ValueMatchEnumerator mat
return new CallOut
{
Index = callOutIndex,
Text = callout.TrimStart('/').TrimStart('#').TrimStart().ToString(),
Text = callout.TrimStart().TrimStart('/').TrimStart('#').TrimStart().ToString(),
InlineCodeAnnotation = true,
SliceStart = startIndex,
Line = originatingLine,
Expand All @@ -257,7 +257,7 @@ private static List<CallOut> EnumerateAnnotations(Regex.ValueMatchEnumerator mat

private static List<CallOut> ParseClassicCallOuts(ValueMatch match, ref ReadOnlySpan<char> span, ref int callOutIndex, int originatingLine)
{
var indexOfLastComment = Math.Max(span.LastIndexOf('#'), span.LastIndexOf("//"));
var indexOfLastComment = Math.Max(span.LastIndexOf(" # "), span.LastIndexOf(" // "));
var startIndex = span.LastIndexOf('<');
if (startIndex <= 0)
return [];
Expand Down