htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable HTML links in Linter output and augmented trace

Browse Source
This commit is contained in:
Sebastian Serth
2021-02-08 22:46:39 +01:00
parent c03d90dd7a
commit 6db37f0360
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/editor/editor.js.erb
View File

@ -509,7 +509,7 @@ var CodeOceanEditor = {
const context = `${check_run.file_name}: ${check_run.line}${scope}`; const context = `${check_run.file_name}: ${check_run.line}${scope}`;
const line_link = `<a href='#' data-file='${check_run.file_name}' data-line='${check_run.line}'>${context}</a>`; const line_link = `<a href='#' data-file='${check_run.file_name}' data-line='${check_run.line}'>${context}</a>`;
const message = `${check_run.name}: ${check_run.result} (${line_link})`; const message = `${check_run.name}: ${check_run.result} (${line_link})`;
const sub_text = document.createTextNode(message); const sub_text = $.parseHTML(message);
$(sub_li).append(sub_text).on("click", "a", this.jumpToSourceLine.bind(this)); $(sub_li).append(sub_text).on("click", "a", this.jumpToSourceLine.bind(this));
sub_ul.append(sub_li); sub_ul.append(sub_li);
} }
@ -606,20 +606,21 @@ var CodeOceanEditor = {
if (this.tracepositions_regex) { if (this.tracepositions_regex) {
$('#output>pre').each($.proxy(function(index, element) { $('#output>pre').each($.proxy(function(index, element) {
element = $(element) element = $(element)
debugger;
const text = _.escape(element.text()); const text = _.escape(element.text());
element.on("click", "a", this.jumpToSourceLine.bind(this)); element.on("click", "a", this.jumpToSourceLine.bind(this));
let matches; let matches;
let augmented_text = text;
while (matches = this.tracepositions_regex.exec(text)) { while (matches = this.tracepositions_regex.exec(text)) {
const frame = $('div.frame[data-filename="' + matches[1] + '"]') const frame = $('div.frame[data-filename="' + matches[1] + '"]')
if (frame.length > 0) { if (frame.length > 0) {
element.html(text.replace(new RegExp(matches[0], 'g'), "<a href='#' data-file='" + matches[1] + "' data-line='" + matches[2] + "'>" + matches[0] + "</a>")); augmented_text = augmented_text.replace(new RegExp(matches[0], 'g'), "<a href='#' data-file='" + matches[1] + "' data-line='" + matches[2] + "'>" + matches[0] + "</a>");
} }
} }
element.html(augmented_text);
}, this)); }, this));
} }
}, },