Skip to content
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

feat(ai-help): use prism for syntax highlighting #9510

Merged
merged 5 commits into from
Aug 18, 2023
Merged

feat(ai-help): use prism for syntax highlighting #9510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4270601
feat(ai-help): use prism for syntax highlighting
fiji-flo Aug 17, 2023
4916151
fix(ai-help): show cursor in highlighted code blocks
caugner Aug 18, 2023
ceeac30
Apply suggestions from code review
fiji-flo Aug 18, 2023
7631f7a
Update client/src/plus/ai-help/index.tsx
caugner Aug 18, 2023
e51d96b
style(ai-help): format with prettier
caugner Aug 18, 2023
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
9 changes: 7 additions & 2 deletions client/src/plus/ai-help/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,11 @@
&.status-pending .ai-help-message-content,
&.status-in-progress .ai-help-message-content {
&.empty::after,
> :not(ol):not(ul):not(pre):last-child:after,
> :not(ol):not(ul):not(pre):not(div.code-example):last-child:after,
> ol:last-child li:last-child:after,
> pre:last-child code:after,
> ul:last-child li:last-child:after {
> ul:last-child li:last-child:after,
> div.code-example:last-child pre:last-child code:after {
animation: blink 1s steps(5, start) infinite;
content: "▋";
margin-left: 0.25rem;
Expand Down Expand Up @@ -270,6 +271,10 @@
&:last-child {
margin-bottom: 0;
}

&.example-header {
margin-bottom: 0;
}
}

ul,
Expand Down
61 changes: 60 additions & 1 deletion client/src/plus/ai-help/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
import { MutableRefObject, useEffect, useRef, useState } from "react";
import Prism from "prismjs";
import {
Children,
MutableRefObject,
ReactElement,
useEffect,
useRef,
useState,
} from "react";
import ReactMarkdown from "react-markdown";
import remarkGfm from "remark-gfm";

Expand Down Expand Up @@ -219,6 +227,57 @@ export function AIHelpInner() {
// eslint-disable-next-line jsx-a11y/anchor-has-content
return <a {...props} />;
},
pre: ({ node, className, children, ...props }) => {
const code = Children.toArray(children)
.map(
(child) =>
/language-(\w+)/.exec(
(child as ReactElement)?.props?.className ||
""
)?.[1]
)
.find(Boolean);

if (!code) {
return (
<pre {...props} className={className}>
{children}
</pre>
);
}
return (
<div className="code-example">
<p className="example-header">
<span className="language-name">{code}</span>
</p>
<pre className={`brush: ${code}`}>
{children}
</pre>
</div>
);
},
code: ({ inline, className, children, ...props }) => {
const match = /language-(\w+)/.exec(
className || ""
);
const lang = Prism.languages[match?.[1]];
return !inline && lang ? (
<code
{...props}
className={className}
dangerouslySetInnerHTML={{
__html: Prism.highlight(
String(children),
lang
),
}}
/>
) : (
<code {...props} className={className}>
{children}
</code>
);
},
}}
>
{message.content.replace(SORRY_BACKEND, SORRY_FRONTEND)}
Expand Down