"#,
+ if line_numbers {"line-numbers" } else {""},
title
)),
- None => Some(
+ None => Some(format!(
r#"
-
- "#
- .to_string(),
+
+ "#,
+ if line_numbers {"line-numbers" } else {""},
+ )
),
},
"results" => match &self.title {
@@ -940,7 +746,7 @@ pub fn gitbook_preprocess(item: &str) -> String {
pub fn mkdocs<'a>(root: &'a AstNode<'a>, arena: &'a Arena
>) -> anyhow::Result<()> {
let mut tabs = Vec::new();
- // tracks open !!! blocks and holds items to apppend prior to closing
+ // tracks openning tags and holds items to apppend prior to closing
let mut info_block_close_items: Vec> = vec![];
iter_nodes(root, &mut |node| {
@@ -1213,7 +1019,8 @@ pub fn mkdocs<'a>(root: &'a AstNode<'a>, arena: &'a Arena>) -> anyho
let title = parser(text.as_ref(), r#"title=""#);
let time = parser(text.as_ref(), r#"time=""#);
- let code_block = CodeBlock { time, title };
+ let line_numbers = parser(text.as_ref(), r#"lineNumbers=""#);
+ 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(
@@ -1229,7 +1036,7 @@ pub fn mkdocs<'a>(root: &'a AstNode<'a>, arena: &'a Arena>) -> anyho
let parent = node.parent().unwrap();
let title = parser(text.as_ref(), r#"title=""#);
- let code_block = CodeBlock { time: None, title };
+ 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(
diff --git a/pgml-dashboard/static/css/scss/components/_admonitions.scss b/pgml-dashboard/static/css/scss/components/_admonitions.scss
index e145e7dc8..6e3dde527 100644
--- a/pgml-dashboard/static/css/scss/components/_admonitions.scss
+++ b/pgml-dashboard/static/css/scss/components/_admonitions.scss
@@ -69,6 +69,9 @@
pre {
margin: 0px;
}
+ pre[data-controller="copy"] {
+ padding-top: 2rem !important;
+ }
div.code-block {
border: none !important;
diff --git a/pgml-dashboard/static/css/scss/components/_code.scss b/pgml-dashboard/static/css/scss/components/_code.scss
index 0545363cd..f7c97f2a0 100644
--- a/pgml-dashboard/static/css/scss/components/_code.scss
+++ b/pgml-dashboard/static/css/scss/components/_code.scss
@@ -64,7 +64,7 @@ pre {
display: inline-block;
width: 100%;
@if $color {
- background-color: $color;
+ background-color: $color !important;
}
}
@@ -110,7 +110,7 @@ pre {
}
.code-line-highlight-none {
@include code-line-highlight(null);
- }
+ }
.code-line-numbers {
@extend .noselect;
diff --git a/pgml-dashboard/static/css/scss/pages/_docs.scss b/pgml-dashboard/static/css/scss/pages/_docs.scss
index ad71f1564..4fca4c7ae 100644
--- a/pgml-dashboard/static/css/scss/pages/_docs.scss
+++ b/pgml-dashboard/static/css/scss/pages/_docs.scss
@@ -178,5 +178,33 @@
margin-right: auto;
}
}
+
+ // Codemirror overrideds
+ .cm-editor {
+ background: inherit;
+
+ // default no line numbers.
+ .cm-gutters {
+ display: none;
+ }
+ }
+
+ .cm-gutters {
+ background: inherit;
+ }
+
+ .code-highlight {
+ background: blue;
+ }
+
+ .cm-activeLine {
+ background-color: transparent;
+ }
+
+ .line-numbers {
+ .cm-gutters {
+ display: contents !important;
+ }
+ }
}
diff --git a/pgml-dashboard/static/js/copy.js b/pgml-dashboard/static/js/copy.js
index a7b45eda5..a5c9ba343 100644
--- a/pgml-dashboard/static/js/copy.js
+++ b/pgml-dashboard/static/js/copy.js
@@ -9,10 +9,19 @@ import {
export default class extends Controller {
codeCopy() {
+
+ // mkdocs / original style code
let text = [...this.element.querySelectorAll('span.code-content')]
.map((copied) => copied.innerText)
.join('\n')
+ // codemirror style code
+ if (text.length === 0 ) {
+ text = [...this.element.querySelectorAll('div.cm-line')]
+ .map((copied) => copied.innerText)
+ .join('\n')
+ }
+
if (text.length === 0) {
text = this.element.innerText.replace('content_copy', '')
}
diff --git a/pgml-dashboard/static/js/utilities/code_mirror_theme.js b/pgml-dashboard/static/js/utilities/code_mirror_theme.js
new file mode 100644
index 000000000..8272f415a
--- /dev/null
+++ b/pgml-dashboard/static/js/utilities/code_mirror_theme.js
@@ -0,0 +1,143 @@
+import { EditorView } from "@codemirror/view";
+import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
+import { tags as t } from "@lezer/highlight";
+
+// Theme builder is taken from: https://github.com/codemirror/theme-one-dark#readme
+const buildCustomTheme = () => {
+ const chalky = "#FF0"; // Set
+ const coral = "#F5708B"; // Set
+ const salmon = "#e9467a";
+ const blue = "#00e0ff";
+ const cyan = "#56b6c2";
+ const invalid = "#ffffff";
+ const ivory = "#abb2bf";
+ const stone = "#7d8799";
+ const malibu = "#61afef";
+ const sage = "#0F0"; // Set
+ const whiskey = "#d19a66";
+ const violet = "#F3F"; // Set
+ const darkBackground = "#17181A"; // Set
+ const highlightBackground = "#2c313a";
+ const background = "#17181A"; // Set
+ const tooltipBackground = "#353a42";
+ const selection = "#3E4451";
+ const cursor = "#528bff";
+
+ const customTheme = EditorView.theme({
+ "&": {
+ color: ivory,
+ backgroundColor: background,
+ },
+
+ ".cm-content": {
+ caretColor: cursor,
+ },
+
+ ".cm-cursor, .cm-dropCursor": { borderLeftColor: cursor },
+ "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":
+ { backgroundColor: selection },
+
+ ".cm-panels": { backgroundColor: darkBackground, color: ivory },
+ ".cm-panels.cm-panels-top": { borderBottom: "2px solid black" },
+ ".cm-panels.cm-panels-bottom": { borderTop: "2px solid black" },
+
+ ".cm-searchMatch": {
+ backgroundColor: "#72a1ff59",
+ outline: "1px solid #457dff",
+ },
+ ".cm-searchMatch.cm-searchMatch-selected": {
+ backgroundColor: "#6199ff2f",
+ },
+
+ ".cm-activeLine": { backgroundColor: "#6699ff0b" },
+ ".cm-selectionMatch": { backgroundColor: "#aafe661a" },
+
+ "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {
+ backgroundColor: "#bad0f847",
+ },
+
+ ".cm-gutters": {
+ backgroundColor: background,
+ color: stone,
+ border: "none",
+ },
+
+ ".cm-activeLineGutter": {
+ backgroundColor: highlightBackground,
+ },
+
+ ".cm-foldPlaceholder": {
+ backgroundColor: "transparent",
+ border: "none",
+ color: "#ddd",
+ },
+
+ ".cm-tooltip": {
+ border: "none",
+ backgroundColor: tooltipBackground,
+ },
+ ".cm-tooltip .cm-tooltip-arrow:before": {
+ borderTopColor: "transparent",
+ borderBottomColor: "transparent",
+ },
+ ".cm-tooltip .cm-tooltip-arrow:after": {
+ borderTopColor: tooltipBackground,
+ borderBottomColor: tooltipBackground,
+ },
+ ".cm-tooltip-autocomplete": {
+ "& > ul > li[aria-selected]": {
+ backgroundColor: highlightBackground,
+ color: ivory,
+ },
+ },
+ });
+
+ /// The highlighting style for code in the One Dark theme.
+ const customHighlightStyle = HighlightStyle.define([
+ { tag: t.keyword, color: violet },
+ {
+ tag: [t.name, t.deleted, t.character, t.propertyName, t.macroName],
+ color: salmon,
+ },
+ { tag: [t.function(t.variableName), t.labelName], color: malibu },
+ { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: whiskey },
+ { tag: [t.definition(t.name), t.separator], color: ivory },
+ {
+ tag: [
+ t.typeName,
+ t.className,
+ t.number,
+ t.changed,
+ t.annotation,
+ t.modifier,
+ t.self,
+ t.namespace,
+ ],
+ color: chalky,
+ },
+ {
+ tag: [
+ t.operator,
+ t.operatorKeyword,
+ t.url,
+ t.escape,
+ t.regexp,
+ t.link,
+ t.special(t.string),
+ ],
+ color: blue,
+ },
+ { tag: [t.meta, t.comment], color: stone },
+ { tag: t.strong, fontWeight: "bold" },
+ { tag: t.emphasis, fontStyle: "italic" },
+ { tag: t.strikethrough, textDecoration: "line-through" },
+ { tag: t.link, color: stone, textDecoration: "underline" },
+ { tag: t.heading, fontWeight: "bold", color: salmon },
+ { tag: [t.atom, t.bool, t.special(t.variableName)], color: whiskey },
+ { tag: [t.processingInstruction, t.string, t.inserted], color: sage },
+ { tag: t.invalid, color: invalid },
+ ]);
+ return [customTheme, syntaxHighlighting(customHighlightStyle)];
+};
+
+export default buildCustomTheme;
From 9d058441306a3e947b501dc8ce6aca0759955031 Mon Sep 17 00:00:00 2001
From: Dan <39170265+chillenberger@users.noreply.github.com>
Date: Thu, 4 Jan 2024 14:37:27 -0700
Subject: [PATCH 2/3] remove direct import of node module
---
pgml-dashboard/package-lock.json | 12 +-
.../code_block/code_block_controller.js | 6 +-
.../static/js/utilities/code_mirror_theme.js | 252 +++++++++---------
3 files changed, 134 insertions(+), 136 deletions(-)
diff --git a/pgml-dashboard/package-lock.json b/pgml-dashboard/package-lock.json
index 40c5a3e84..c7f315dec 100644
--- a/pgml-dashboard/package-lock.json
+++ b/pgml-dashboard/package-lock.json
@@ -163,9 +163,9 @@
}
},
"node_modules/@lezer/javascript": {
- "version": "1.4.11",
- "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.11.tgz",
- "integrity": "sha512-B5Y9EJF4BWiMgj4ufxUo2hrORnmMBDrMtR+L7dwIO5pocuSAahG6QBwXR6PbKJOjRywJczU2r2LJPg79ER91TQ==",
+ "version": "1.4.12",
+ "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.12.tgz",
+ "integrity": "sha512-kwO5MftUiyfKBcECMEDc4HYnc10JME9kTJNPVoCXqJj/Y+ASWF0rgstORi3BThlQI6SoPSshrK5TjuiLFnr29A==",
"dependencies": {
"@lezer/highlight": "^1.1.3",
"@lezer/lr": "^1.3.0"
@@ -234,9 +234,9 @@
"integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
},
"node_modules/dompurify": {
- "version": "3.0.6",
- "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz",
- "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w=="
+ "version": "3.0.7",
+ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.7.tgz",
+ "integrity": "sha512-BViYTZoqP3ak/ULKOc101y+CtHDUvBsVgSxIF1ku0HmK6BRf+C03MC+tArMvOPtVtZp83DDh5puywKDu4sbVjQ=="
},
"node_modules/marked": {
"version": "9.1.6",
diff --git a/pgml-dashboard/src/components/code_block/code_block_controller.js b/pgml-dashboard/src/components/code_block/code_block_controller.js
index 0ecfda207..3a4f92483 100644
--- a/pgml-dashboard/src/components/code_block/code_block_controller.js
+++ b/pgml-dashboard/src/components/code_block/code_block_controller.js
@@ -7,8 +7,9 @@ import { rust } from "@codemirror/lang-rust";
import { json } from "@codemirror/lang-json";
import { EditorView, ViewPlugin, Decoration } from "@codemirror/view";
import { RangeSetBuilder, Facet} from "@codemirror/state";
+import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
-import buildCustomTheme from "../../../static/js/utilities/code_mirror_theme";
+import { highlightStyle, editorTheme } from "../../../static/js/utilities/code_mirror_theme";
const buildEditorView = (target, content, languageExtension, classes) => {
let editorView = new EditorView({
@@ -16,7 +17,8 @@ const buildEditorView = (target, content, languageExtension, classes) => {
extensions: [
basicSetup,
languageExtension !== null ? languageExtension() : [], // if no language chosen do not highlight syntax
- buildCustomTheme(),
+ EditorView.theme(editorTheme),
+ syntaxHighlighting(HighlightStyle.define(highlightStyle)),
EditorView.contentAttributes.of({ contenteditable: false }),
addClasses.of(classes),
highlight
diff --git a/pgml-dashboard/static/js/utilities/code_mirror_theme.js b/pgml-dashboard/static/js/utilities/code_mirror_theme.js
index 8272f415a..4ec9ca39e 100644
--- a/pgml-dashboard/static/js/utilities/code_mirror_theme.js
+++ b/pgml-dashboard/static/js/utilities/code_mirror_theme.js
@@ -1,143 +1,139 @@
-import { EditorView } from "@codemirror/view";
-import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
import { tags as t } from "@lezer/highlight";
// Theme builder is taken from: https://github.com/codemirror/theme-one-dark#readme
-const buildCustomTheme = () => {
- const chalky = "#FF0"; // Set
- const coral = "#F5708B"; // Set
- const salmon = "#e9467a";
- const blue = "#00e0ff";
- const cyan = "#56b6c2";
- const invalid = "#ffffff";
- const ivory = "#abb2bf";
- const stone = "#7d8799";
- const malibu = "#61afef";
- const sage = "#0F0"; // Set
- const whiskey = "#d19a66";
- const violet = "#F3F"; // Set
- const darkBackground = "#17181A"; // Set
- const highlightBackground = "#2c313a";
- const background = "#17181A"; // Set
- const tooltipBackground = "#353a42";
- const selection = "#3E4451";
- const cursor = "#528bff";
-
- const customTheme = EditorView.theme({
- "&": {
- color: ivory,
- backgroundColor: background,
- },
- ".cm-content": {
- caretColor: cursor,
- },
+const chalky = "#FF0"; // Set
+const coral = "#F5708B"; // Set
+const salmon = "#e9467a";
+const blue = "#00e0ff";
+const cyan = "#56b6c2";
+const invalid = "#ffffff";
+const ivory = "#abb2bf";
+const stone = "#7d8799";
+const malibu = "#61afef";
+const sage = "#0F0"; // Set
+const whiskey = "#d19a66";
+const violet = "#F3F"; // Set
+const darkBackground = "#17181A"; // Set
+const highlightBackground = "#2c313a";
+const background = "#17181A"; // Set
+const tooltipBackground = "#353a42";
+const selection = "#3E4451";
+const cursor = "#528bff";
- ".cm-cursor, .cm-dropCursor": { borderLeftColor: cursor },
- "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":
- { backgroundColor: selection },
+const editorTheme = {
+ "&": {
+ color: ivory,
+ backgroundColor: background,
+ },
- ".cm-panels": { backgroundColor: darkBackground, color: ivory },
- ".cm-panels.cm-panels-top": { borderBottom: "2px solid black" },
- ".cm-panels.cm-panels-bottom": { borderTop: "2px solid black" },
+ ".cm-content": {
+ caretColor: cursor,
+ },
- ".cm-searchMatch": {
- backgroundColor: "#72a1ff59",
- outline: "1px solid #457dff",
- },
- ".cm-searchMatch.cm-searchMatch-selected": {
- backgroundColor: "#6199ff2f",
- },
+ ".cm-cursor, .cm-dropCursor": { borderLeftColor: cursor },
+ "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":
+ { backgroundColor: selection },
- ".cm-activeLine": { backgroundColor: "#6699ff0b" },
- ".cm-selectionMatch": { backgroundColor: "#aafe661a" },
+ ".cm-panels": { backgroundColor: darkBackground, color: ivory },
+ ".cm-panels.cm-panels-top": { borderBottom: "2px solid black" },
+ ".cm-panels.cm-panels-bottom": { borderTop: "2px solid black" },
- "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {
- backgroundColor: "#bad0f847",
- },
+ ".cm-searchMatch": {
+ backgroundColor: "#72a1ff59",
+ outline: "1px solid #457dff",
+ },
+ ".cm-searchMatch.cm-searchMatch-selected": {
+ backgroundColor: "#6199ff2f",
+ },
- ".cm-gutters": {
- backgroundColor: background,
- color: stone,
- border: "none",
- },
+ ".cm-activeLine": { backgroundColor: "#6699ff0b" },
+ ".cm-selectionMatch": { backgroundColor: "#aafe661a" },
+
+ "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {
+ backgroundColor: "#bad0f847",
+ },
+
+ ".cm-gutters": {
+ backgroundColor: background,
+ color: stone,
+ border: "none",
+ },
+
+ ".cm-activeLineGutter": {
+ backgroundColor: highlightBackground,
+ },
+
+ ".cm-foldPlaceholder": {
+ backgroundColor: "transparent",
+ border: "none",
+ color: "#ddd",
+ },
- ".cm-activeLineGutter": {
+ ".cm-tooltip": {
+ border: "none",
+ backgroundColor: tooltipBackground,
+ },
+ ".cm-tooltip .cm-tooltip-arrow:before": {
+ borderTopColor: "transparent",
+ borderBottomColor: "transparent",
+ },
+ ".cm-tooltip .cm-tooltip-arrow:after": {
+ borderTopColor: tooltipBackground,
+ borderBottomColor: tooltipBackground,
+ },
+ ".cm-tooltip-autocomplete": {
+ "& > ul > li[aria-selected]": {
backgroundColor: highlightBackground,
+ color: ivory,
},
+ },
+}
- ".cm-foldPlaceholder": {
- backgroundColor: "transparent",
- border: "none",
- color: "#ddd",
- },
+const highlightStyle = [
+ { tag: t.keyword, color: violet },
+ {
+ tag: [t.name, t.deleted, t.character, t.propertyName, t.macroName],
+ color: salmon,
+ },
+ { tag: [t.function(t.variableName), t.labelName], color: malibu },
+ { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: whiskey },
+ { tag: [t.definition(t.name), t.separator], color: ivory },
+ {
+ tag: [
+ t.typeName,
+ t.className,
+ t.number,
+ t.changed,
+ t.annotation,
+ t.modifier,
+ t.self,
+ t.namespace,
+ ],
+ color: chalky,
+ },
+ {
+ tag: [
+ t.operator,
+ t.operatorKeyword,
+ t.url,
+ t.escape,
+ t.regexp,
+ t.link,
+ t.special(t.string),
+ ],
+ color: blue,
+ },
+ { tag: [t.meta, t.comment], color: stone },
+ { tag: t.strong, fontWeight: "bold" },
+ { tag: t.emphasis, fontStyle: "italic" },
+ { tag: t.strikethrough, textDecoration: "line-through" },
+ { tag: t.link, color: stone, textDecoration: "underline" },
+ { tag: t.heading, fontWeight: "bold", color: salmon },
+ { tag: [t.atom, t.bool, t.special(t.variableName)], color: whiskey },
+ { tag: [t.processingInstruction, t.string, t.inserted], color: sage },
+ { tag: t.invalid, color: invalid },
+]
- ".cm-tooltip": {
- border: "none",
- backgroundColor: tooltipBackground,
- },
- ".cm-tooltip .cm-tooltip-arrow:before": {
- borderTopColor: "transparent",
- borderBottomColor: "transparent",
- },
- ".cm-tooltip .cm-tooltip-arrow:after": {
- borderTopColor: tooltipBackground,
- borderBottomColor: tooltipBackground,
- },
- ".cm-tooltip-autocomplete": {
- "& > ul > li[aria-selected]": {
- backgroundColor: highlightBackground,
- color: ivory,
- },
- },
- });
-
- /// The highlighting style for code in the One Dark theme.
- const customHighlightStyle = HighlightStyle.define([
- { tag: t.keyword, color: violet },
- {
- tag: [t.name, t.deleted, t.character, t.propertyName, t.macroName],
- color: salmon,
- },
- { tag: [t.function(t.variableName), t.labelName], color: malibu },
- { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: whiskey },
- { tag: [t.definition(t.name), t.separator], color: ivory },
- {
- tag: [
- t.typeName,
- t.className,
- t.number,
- t.changed,
- t.annotation,
- t.modifier,
- t.self,
- t.namespace,
- ],
- color: chalky,
- },
- {
- tag: [
- t.operator,
- t.operatorKeyword,
- t.url,
- t.escape,
- t.regexp,
- t.link,
- t.special(t.string),
- ],
- color: blue,
- },
- { tag: [t.meta, t.comment], color: stone },
- { tag: t.strong, fontWeight: "bold" },
- { tag: t.emphasis, fontStyle: "italic" },
- { tag: t.strikethrough, textDecoration: "line-through" },
- { tag: t.link, color: stone, textDecoration: "underline" },
- { tag: t.heading, fontWeight: "bold", color: salmon },
- { tag: [t.atom, t.bool, t.special(t.variableName)], color: whiskey },
- { tag: [t.processingInstruction, t.string, t.inserted], color: sage },
- { tag: t.invalid, color: invalid },
- ]);
- return [customTheme, syntaxHighlighting(customHighlightStyle)];
-};
-
-export default buildCustomTheme;
+
+export {highlightStyle, editorTheme};
From b3f63b38d83831c02fb8cde0030dc65ff548301c Mon Sep 17 00:00:00 2001
From: Dan <39170265+chillenberger@users.noreply.github.com>
Date: Thu, 4 Jan 2024 15:04:45 -0700
Subject: [PATCH 3/3] fmt and remove unused imports
---
pgml-dashboard/src/api/cms.rs | 10 ++++++-
pgml-dashboard/src/utils/markdown.rs | 40 ++++++++++++++++++----------
2 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/pgml-dashboard/src/api/cms.rs b/pgml-dashboard/src/api/cms.rs
index bdecd4996..1f606b9f9 100644
--- a/pgml-dashboard/src/api/cms.rs
+++ b/pgml-dashboard/src/api/cms.rs
@@ -611,6 +611,14 @@ This is the end of the markdown
println!("response: {}", html);
- assert!(html.chars().filter(|c| !c.is_whitespace()).collect::() == expected.chars().filter(|c| !c.is_whitespace()).collect::())
+ assert!(
+ html.chars()
+ .filter(|c| !c.is_whitespace())
+ .collect::()
+ == expected
+ .chars()
+ .filter(|c| !c.is_whitespace())
+ .collect::()
+ )
}
}
diff --git a/pgml-dashboard/src/utils/markdown.rs b/pgml-dashboard/src/utils/markdown.rs
index 53f6cb332..fb0557aa2 100644
--- a/pgml-dashboard/src/utils/markdown.rs
+++ b/pgml-dashboard/src/utils/markdown.rs
@@ -8,7 +8,6 @@ use std::sync::{
Arc,
};
-use aho_corasick::{AhoCorasick, AhoCorasickBuilder, MatchKind};
use anyhow::Result;
use comrak::{
adapters::{HeadingAdapter, HeadingMeta, SyntaxHighlighterAdapter},
@@ -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};
@@ -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 {
@@ -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();
@@ -265,13 +262,21 @@ impl SyntaxHighlighterAdapter for SyntaxHighlighter {
fn build_code_tag(&self, attributes: &HashMap) -> 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!("", if parsed_data.line_numbers { "class='line-numbers'"} else {""}, parsed_data.lang, )
+ format!(
+ "",
+ if parsed_data.line_numbers {
+ "class='line-numbers'"
+ } else {
+ ""
+ },
+ parsed_data.lang,
+ )
}
}
@@ -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 {
@@ -675,16 +680,15 @@ impl CodeBlock {
{}
"#,
- if line_numbers {"line-numbers" } else {""},
+ if line_numbers { "line-numbers" } else { "" },
title
)),
None => Some(format!(
r#"
"#,
- if line_numbers {"line-numbers" } else {""},
- )
- ),
+ if line_numbers { "line-numbers" } else { "" },
+ )),
},
"results" => match &self.title {
Some(title) => Some(format!(
@@ -1020,7 +1024,11 @@ pub fn mkdocs<'a>(root: &'a AstNode<'a>, arena: &'a Arena
>) -> 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(
@@ -1036,7 +1044,11 @@ pub fn mkdocs<'a>(root: &'a AstNode<'a>, arena: &'a Arena>) -> 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(