Skip to content

Dan Codemirror docs #1271

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
Jan 4, 2024
Merged

Dan Codemirror docs #1271

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
e2502ef
use code mirror for syntax highlighting, fix code block spacing
chillenberger Jan 3, 2024
960412d
Merge branch 'master' into dan-codemirror-docs
chillenberger Jan 3, 2024
9d05844
remove direct import of node module
chillenberger Jan 4, 2024
b3f63b3
fmt and remove unused imports
chillenberger Jan 4, 2024
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
240 changes: 234 additions & 6 deletions pgml-dashboard/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions pgml-dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{
"dependencies": {
"@codemirror/lang-javascript": "^6.2.1",
"@codemirror/lang-python": "^6.1.3",
"@codemirror/lang-rust": "^6.0.1",
"@codemirror/lang-sql": "^6.5.4",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/state": "^6.2.1",
"@codemirror/view": "^6.21.0",
"codemirror": "^6.0.1",
"autosize": "^6.0.1",
"dompurify": "^3.0.6",
"marked": "^9.1.0"
Expand Down
99 changes: 73 additions & 26 deletions pgml-dashboard/src/api/cms.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,32 +406,6 @@ mod test {
use rocket::local::asynchronous::Client;
use rocket::{Build, Rocket};

#[test]
fn test_syntax_highlighting() {
let code = r#"
# Hello

```postgresql
SELECT * FROM test;
```
"#;

let arena = Arena::new();
let root = parse_document(&arena, code, &options());

// Style headings like we like them
let mut plugins = ComrakPlugins::default();
let binding = MarkdownHeadings::new();
plugins.render.heading_adapter = Some(&binding);
plugins.render.codefence_syntax_highlighter = Some(&SyntaxHighlighter {});

let mut html = vec![];
format_html_with_plugins(root, &options(), &mut html, &plugins).unwrap();
let html = String::from_utf8(html).unwrap();

assert!(html.contains("<span class=\"syntax-highlight\">SELECT</span>"));
}

#[test]
fn test_wrapping_tables() {
let markdown = r#"
Expand Down Expand Up @@ -574,4 +548,77 @@ This is the end of the markdown
rsp.status()
);
}

// Test backend for line highlights and line numbers added
#[test]
fn gitbook_codeblock_test() {
let contents = r#"
{% code title="Test name for html" lineNumbers="true" %}
```javascript-highlightGreen="1"
import something
let a = 1
```
{% endcode %}
"#;

let expected = r#"
<div class="code-block with-title line-numbers">
<div class="title">
Test name for html
</div>
<pre data-controller="copy">
<div class="code-toolbar">
<span data-action="click->copy#codeCopy" class="material-symbols-outlined btn-code-toolbar">content_copy</span>
<span class="material-symbols-outlined btn-code-toolbar" disabled>link</span>
<span class="material-symbols-outlined btn-code-toolbar" disabled>edit</span>
</div>
<code language='javascript' data-controller="code-block">
<div class="highlight code-line-highlight-green">importsomething</div>
<div class="highlight code-line-highlight-none">leta=1</div>
<div class="highlight code-line-highlight-none"></div>
</code>
</pre>
</div>"#;

// Parse Markdown
let arena = Arena::new();
let spaced_contents = crate::utils::markdown::gitbook_preprocess(contents);
let root = parse_document(&arena, &spaced_contents, &crate::utils::markdown::options());

crate::utils::markdown::wrap_tables(root, &arena).unwrap();

// MkDocs, gitbook syntax support, e.g. tabs, notes, alerts, etc.
crate::utils::markdown::mkdocs(root, &arena).unwrap();

// Style headings like we like them
let mut plugins = ComrakPlugins::default();
let headings = crate::utils::markdown::MarkdownHeadings::new();
plugins.render.heading_adapter = Some(&headings);
plugins.render.codefence_syntax_highlighter =
Some(&crate::utils::markdown::SyntaxHighlighter {});

let mut html = vec![];
format_html_with_plugins(
root,
&crate::utils::markdown::options(),
&mut html,
&plugins,
)
.unwrap();
let html = String::from_utf8(html).unwrap();

println!("expected: {}", expected);

println!("response: {}", html);

assert!(
html.chars()
.filter(|c| !c.is_whitespace())
.collect::<String>()
== expected
.chars()
.filter(|c| !c.is_whitespace())
.collect::<String>()
)
}
}
Loading