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

Fix Java RegEx for relative files

Browse Source
This commit is contained in:
Sebastian Serth
2021-12-15 00:42:08 +01:00
parent 88fb04080f
commit d543ac76ae
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,7 +407,7 @@ var CodeOceanEditor = {
initializeRegexes: function () { initializeRegexes: function () {
// These RegEx are run on the HTML escaped output! // These RegEx are run on the HTML escaped output!
this.regex_for_language.set("ace/mode/python", /File "(.+?)", line (\d+)/g); this.regex_for_language.set("ace/mode/python", /File "(.+?)", line (\d+)/g);
this.regex_for_language.set("ace/mode/java", /(.*\.java):(\d+):/g); this.regex_for_language.set("ace/mode/java", /(?:\.\/)?(.*\.java):(\d+):/g);
}, },
initializeTooltips: function () { initializeTooltips: function () {
@ -626,15 +626,17 @@ var CodeOceanEditor = {
}, },
jumpToSourceLine: function (event) { jumpToSourceLine: function (event) {
var file = $(event.target).data('file'); const file = $(event.target).data('file');
var line = $(event.target).data('line'); const line = $(event.target).data('line');
// set active file, only needed for codepilot, so skipped for now const frame = $('div.frame[data-filename="' + file + '"]');
var frame = $('div.frame[data-filename="' + file + '"]');
this.showFrame(frame); this.showFrame(frame);
var editor = this.editor_for_file.get(file); const file_id = frame.find('.editor').data('file-id');
this.setActiveFile(frame.data('filename'), file_id);
this.selectFileInJsTree($('#files'), file_id);
const editor = this.editor_for_file.get(file);
editor.gotoLine(line, 0); editor.gotoLine(line, 0);
event.preventDefault(); event.preventDefault();
}, },