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

Jump to bottom

Highlighting multi-line comments #2150

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
+66 −5
Open

Highlighting multi-line comments #2150

Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
90bc370
Highlighting multi-line comments
KesterTan Apr 22, 2024
a5461f2
Stray multi line comments
KesterTan Apr 22, 2024
35d99db
Script stray comments fix
KesterTan Apr 22, 2024
2eb9da8
Use innerHtml and textContent to get data instead of stripping
KesterTan Apr 22, 2024
6dc7c51
Fix HTMl warning
KesterTan Apr 22, 2024
93babc2
Removed highlighting within comments
KesterTan Apr 25, 2024
c78a2aa
Merge branch 'master' into highlighting
KesterTan Apr 25, 2024
689dc4f
highlighting for multiple files and nested span
KesterTan Apr 27, 2024
0ced379
added comments and fixed indentation
KesterTan Apr 27, 2024
aa313e4
newline
KesterTan Apr 27, 2024
507e904
fixes indentation
KesterTan Apr 27, 2024
4c3cbb6
indentation
KesterTan Apr 27, 2024
0fd4684
Fixed keyword comment highlighting
KesterTan May 15, 2024
54ea9c9
newline
KesterTan Jun 3, 2024
4076cc9
Merge branch 'master' into highlighting
KesterTan Jun 3, 2024
1eeae38
highlights multi line strings and # is excluded
KesterTan Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions app/views/submissions/view.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,23 @@
var headerPositionStr = null;
<% end %>
hljs.initHighlightingOnLoad();
document.addEventListener('DOMContentLoaded', (event) => {
KesterTan marked this conversation as resolved.
Show resolved Hide resolved
let combinedCode = '';
document.querySelectorAll('pre code').forEach((block) => {
combinedCode += block.textContent + '\n';
});

let highlightedCode = hljs.highlightAuto(combinedCode).value;
let commentSpans = highlightedCode.match(/<span class="hljs-comment">([^<]*)<\/span>/g);
let commentContents = commentSpans.map(span => span.replace(/<[^>]+>/g, '').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/<!--|--!?>/g, ""));
Fixed Show fixed Hide fixed
let splitContent = commentContents.flatMap(str => str.split('\n'));

document.querySelectorAll('pre code').forEach((block, index) => {
if (block.textContent !== null && block.textContent !== "" && splitContent.includes(block.textContent.replace(/\n/g, ''))) {
block.innerHTML = `<code class='hljs-comment'>${block.textContent}</code>`;
Fixed Show fixed Hide fixed
KesterTan marked this conversation as resolved.
Show resolved Hide resolved
}
});
});
PDFJS.workerSrc = "<%= asset_url 'pdf.worker.js' %>";
</script>
<%= render partial: "golden-layout" %>
Expand Down