Skip to content

fix highlight #41

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix highlight #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/org.standardnotes.advanced-markdown-editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
"copy-webpack-plugin": "*",
"css-loader": "^5.2.0",
"dompurify": "^2.2.9",
"easymde": "2.16.1",
"easymde": "2.18.0",
"eslint": "*",
"file-loader": "^6.2.0",
"font-awesome": "^4.7.0",
"highlightjs": "^9.16.2",
"highlight.js": "^11.10.0",
"html-webpack-plugin": "^5.3.1",
"marked": "^2.0.7",
"mini-css-extract-plugin": "^1.4.0",
Expand Down
14 changes: 10 additions & 4 deletions packages/org.standardnotes.advanced-markdown-editor/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ document.addEventListener('DOMContentLoaded', function () {
if (note.content.text !== lastValue) {
ignoreTextChange = true
window.easymde.value(note.content.text)
toggleHighlightByLength(note.content.text)
ignoreTextChange = false
}

Expand Down Expand Up @@ -113,10 +114,9 @@ document.addEventListener('DOMContentLoaded', function () {
shortcuts: {
toggleSideBySide: 'Cmd-Alt-P',
},
// Syntax highlighting is disabled until we figure out performance issue: https://github.com/sn-extensions/advanced-markdown-editor/pull/20#issuecomment-513811633
// renderingConfig: {
// codeSyntaxHighlighting: true
// },
renderingConfig: {
codeSyntaxHighlighting: true,
},
toolbar: [
{
className: 'fa fa-eye',
Expand Down Expand Up @@ -193,6 +193,7 @@ document.addEventListener('DOMContentLoaded', function () {

componentRelay.saveItemWithPresave(note, () => {
lastValue = window.easymde.value()
toggleHighlightByLength(lastValue)

let html = window.easymde.options.previewRender(window.easymde.value())
let strippedHtml = truncateString(strip(html))
Expand Down Expand Up @@ -368,4 +369,9 @@ document.addEventListener('DOMContentLoaded', function () {
const environment = componentRelay.environment ?? 'web'
return environment === 'mobile' ? 'textarea' : 'contenteditable'
}

function toggleHighlightByLength(text) {
const maxHighlightLength = 5000
window.easymde.options.renderingConfig.codeSyntaxHighlighting = (window.easymde && text.length < maxHighlightLength)
}
})
37 changes: 14 additions & 23 deletions packages/org.standardnotes.advanced-markdown-editor/src/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,17 +261,23 @@ body, html {
color: var(--sn-stylekit-neutral-color);
}

.hljs-keyword,
.hljs-selector-tag,
.hljs-subst {
font-weight: bold;
}

.hljs-attribute {
.hljs-title,
.hljs-section,
.hljs-selector-id
.hljs-template-tag,
.hljs-template-variable,
.hljs-number,
.hljs-built_in,
.hljs-builtin-name {
color: var(--sn-stylekit-warning-color);
}

.hljs-number,
.hljs-meta,
.hljs-keyword,
.hljs-selector-tag,
.hljs-subst,
.hljs-attr,
.hljs-attribute,
.hljs-literal {
color: var(--sn-stylekit-info-color);
}
Expand All @@ -282,12 +288,6 @@ body, html {
color: var(--sn-stylekit-success-color);
}

.hljs-title,
.hljs-section,
.hljs-selector-id {
font-weight: bold;
}

.hljs-subst {
font-weight: normal;
}
Expand All @@ -313,15 +313,6 @@ body, html {
color: var(--sn-stylekit-info-color);
}

.hljs-built_in,
.hljs-builtin-name {
text-decoration: underline;
}

.hljs-meta {
font-weight: bold;
}

.hljs-deletion {
color: var(--sn-stylekit-danger-color);
}
Expand Down