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 1 commit
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
Prev Previous commit
fmt and remove unused imports
  • Loading branch information
@chillenberger
chillenberger committed Jan 4, 2024
commit b3f63b38d83831c02fb8cde0030dc65ff548301c
10 changes: 9 additions & 1 deletion pgml-dashboard/src/api/cms.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,14 @@ This is the end of the markdown

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

assert!(html.chars().filter(|c| !c.is_whitespace()).collect::<String>() == expected.chars().filter(|c| !c.is_whitespace()).collect::<String>())
assert!(
html.chars()
.filter(|c| !c.is_whitespace())
.collect::<String>()
== expected
.chars()
.filter(|c| !c.is_whitespace())
.collect::<String>()
)
}
}
40 changes: 26 additions & 14 deletions pgml-dashboard/src/utils/markdown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use std::sync::{
Arc,
};

use aho_corasick::{AhoCorasick, AhoCorasickBuilder, MatchKind};
use anyhow::Result;
use comrak::{
adapters::{HeadingAdapter, HeadingMeta, SyntaxHighlighterAdapter},
Expand All @@ -17,7 +16,6 @@ use comrak::{
parse_document, Arena, ComrakExtensionOptions, ComrakOptions, ComrakRenderOptions,
};
use itertools::Itertools;
use lazy_static::lazy_static;
use regex::Regex;
use tantivy::collector::TopDocs;
use tantivy::query::{QueryParser, RegexQuery};
Expand Down Expand Up @@ -201,7 +199,7 @@ impl<'a> From<&str> for CodeFence<'a> {
} else if options.starts_with("postgresql-line-nums") {
"postgresql-line-nums"
} else if options.starts_with("rust") {
"rust"
"rust"
} else if options.starts_with("json") {
"json"
} else {
Expand All @@ -224,7 +222,6 @@ impl<'a> From<&str> for CodeFence<'a> {
pub struct SyntaxHighlighter {}

impl SyntaxHighlighterAdapter for SyntaxHighlighter {

fn highlight(&self, options: Option<&str>, code: &str) -> String {
let code = if let Some(options) = options {
let code = code.to_string();
Expand Down Expand Up @@ -265,13 +262,21 @@ impl SyntaxHighlighterAdapter for SyntaxHighlighter {
fn build_code_tag(&self, attributes: &HashMap<String, String>) -> String {
let data = match attributes.get("class") {
Some(lang) => lang.replace("language-", ""),
_ => "".to_string()
_ => "".to_string(),
};

let parsed_data = CodeFence::from(data.as_str());

// code-block web component uses codemirror to add syntax highlighting
format!("<code {} language='{}' data-controller=\"code-block\">", if parsed_data.line_numbers { "class='line-numbers'"} else {""}, parsed_data.lang, )
format!(
"<code {} language='{}' data-controller=\"code-block\">",
if parsed_data.line_numbers {
"class='line-numbers'"
} else {
""
},
parsed_data.lang,
)
}
}

Expand Down Expand Up @@ -650,9 +655,9 @@ impl CodeBlock {
let line_numbers: bool = match &self.line_numbers {
Some(val) => match val.as_str() {
"true" => true,
_ => false
_ => false,
},
_ => false
_ => false,
};

match html_type {
Expand All @@ -675,16 +680,15 @@ impl CodeBlock {
{}
</div>
"#,
if line_numbers {"line-numbers" } else {""},
if line_numbers { "line-numbers" } else { "" },
title
)),
None => Some(format!(
r#"
<div class="code-block {}">
"#,
if line_numbers {"line-numbers" } else {""},
)
),
if line_numbers { "line-numbers" } else { "" },
)),
},
"results" => match &self.title {
Some(title) => Some(format!(
Expand Down Expand Up @@ -1020,7 +1024,11 @@ pub fn mkdocs<'a>(root: &'a AstNode<'a>, arena: &'a Arena<AstNode<'a>>) -> anyho
let title = parser(text.as_ref(), r#"title=""#);
let time = parser(text.as_ref(), r#"time=""#);
let line_numbers = parser(text.as_ref(), r#"lineNumbers=""#);
let code_block = CodeBlock { time, title, line_numbers };
let code_block = CodeBlock {
time,
title,
line_numbers,
};

if let Some(html) = code_block.html("code") {
let n = arena.alloc(Node::new(RefCell::new(Ast::new(
Expand All @@ -1036,7 +1044,11 @@ pub fn mkdocs<'a>(root: &'a AstNode<'a>, arena: &'a Arena<AstNode<'a>>) -> anyho
let parent = node.parent().unwrap();

let title = parser(text.as_ref(), r#"title=""#);
let code_block = CodeBlock { time: None, title, line_numbers: None };
let code_block = CodeBlock {
time: None,
title,
line_numbers: None,
};

if let Some(html) = code_block.html("results") {
let n = arena.alloc(Node::new(RefCell::new(Ast::new(
Expand Down