Skip to content

Allow - and . in log filenames. #347

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: master
Choose a base branch
from
Open

Allow - and . in log filenames. #347

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 ide/static/ide/js/compile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ CloudPebble.Compile = (function() {
log = log.replace(/^(src\/js\/.*)$/gm, '<span class="log-error">$1</span>');
log = log.replace(/^(JavaScript linting failed.*)$/gm, '<span class="log-note">$1</span>');
// Link the thingies.
log = log.replace(/([\/a-zA-Z0-9_]+\.[ch]):([0-9+]+)/g, '<span class="filename-link" data-filename="$1" data-line="$2">$1:$2</span>');
log = log.replace(/([\/.]*)([\/a-zA-Z0-9_.-]+\.[ch]):([0-9+]+)/g, '<span class="filename-link" data-filename="$2" data-line="$3">$1$2:$3</span>');
log = '<pre class="build-log">' + log + '</pre>';
log = $(log).css({'height': '100%', 'overflow': 'auto'});
// Make the links do something.
Expand Down Expand Up @@ -366,7 +366,7 @@ CloudPebble.Compile = (function() {
append_log_html($('<hr>'));
} else {
var display = _.escape(get_log_label(log.priority) + ' ' + log.filename + ':' + log.line_number + ': ' + log.message);
display = display.replace(/([\/a-zA-Z0-9_]+\.[ch]):([0-9+]+)/, '<span class="filename-link" data-filename="$1" data-line="$2">$1:$2</span>');
display = display.replace(/([\/.]*)([\/a-zA-Z0-9_.-]+\.[ch]):([0-9+]+)/, '<span class="filename-link" data-filename="$2" data-line="$3">$1$2:$3</span>');
var span = $('<span>').addClass(get_log_class(log.priority)).addClass('log').html(display);
span.find('.filename-link').click(function() {
var thing = $(this);
Expand Down