adbrucker
/
lh-l4v
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: goto-error jEdit macro: handle errors, fix string compare 

When updating to Isabelle 2017 the non-error case was neglected and gave
a stack dump rather than a sane message. This has now been addressed.

Apparently the Beanshell scripting environment in jEdit prior to 5.5.0
accepted '==' as string comparison. In 5.5.0 it is no longer accepted,
and requires .equals() as in normal Java.
This commit is contained in:
Rafal Kolanski 2018-05-29 16:20:56 +10:00
parent 6d0a9a78aa
commit 6961bf6648
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/jedit/macros/goto-error.bsh
View File

@ -37,7 +37,7 @@ class FirstError {
boolean handle(cmd, offset, markup) { boolean handle(cmd, offset, markup) {
if (markup.name() == "error_message") { if (markup.name().equals("error_message")) {
first_error_pos = offset; first_error_pos = offset;
return false; return false;
} }
@ -47,14 +47,14 @@ class FirstError {
if (first_error_pos >= 0) { if (first_error_pos >= 0) {
textArea.setCaretPosition(first_error_pos); textArea.setCaretPosition(first_error_pos);
} else { } else {
msg("No errors detected in theory " + model.node_name() + " (at present)."); msg("No errors detected in theory " + model.get().node_name() + " (at present).");
} }
} }
} }
class MsgError { class MsgError {
boolean handle(cmd, offset, markup) { boolean handle(cmd, offset, markup) {
if (markup.name() == "error_message") { if (markup.name().equals("error_message")) {
int line = textArea.getLineOfOffset(offset); int line = textArea.getLineOfOffset(offset);
int col = offset - textArea.getLineStartOffset(line); int col = offset - textArea.getLineStartOffset(line);
msg(markup.name() + "\n" + offset + "(l " + line + ", c " + col + msg(markup.name() + "\n" + offset + "(l " + line + ", c " + col +
@ -67,7 +67,6 @@ class MsgError {
} }
} }
// TODO: end when past a specific line
command_markup_scanner(int startLine, handler) { command_markup_scanner(int startLine, handler) {
boolean keep_going = true; boolean keep_going = true;