Skip to content

Commit

Permalink
GroovyEngine: checkSyntax() ignore NullPointerException
Browse files Browse the repository at this point in the history
  • Loading branch information
mattirn committed Jul 11, 2020
1 parent 8042365 commit ef81ae7
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions groovy/src/main/java/org/jline/script/GroovyEngine.java
Original file line number Diff line number Diff line change
Expand Up @@ -1083,23 +1083,26 @@ private CmdDesc checkSyntax(CmdLine line) {
if (idx >= 0) {
out.setErrorIndex(idx + e.getIndex());
}
} catch (org.codehaus.groovy.control.MultipleCompilationErrorsException e){
} catch (org.codehaus.groovy.control.MultipleCompilationErrorsException e) {
if (e.getErrorCollector().getErrors() != null) {
for (Object o: e.getErrorCollector().getErrors()) {
for (Object o : e.getErrorCollector().getErrors()) {
if (o instanceof SyntaxErrorMessage) {
SyntaxErrorMessage sem = (SyntaxErrorMessage)o;
SyntaxErrorMessage sem = (SyntaxErrorMessage) o;
out.setErrorIndex(errorIndex(e.getMessage(), sem.getCause()));
} }
}
}
}
if (e.getErrorCollector().getWarnings() != null) {
for (Object o: e.getErrorCollector().getWarnings()) {
for (Object o : e.getErrorCollector().getWarnings()) {
if (o instanceof SyntaxErrorMessage) {
SyntaxErrorMessage sem = (SyntaxErrorMessage)o;
SyntaxErrorMessage sem = (SyntaxErrorMessage) o;
out.setErrorIndex(errorIndex(e.getMessage(), sem.getCause()));
}
}
}
mainDesc.addAll(doExceptionMessage(e));
} catch (NullPointerException e) {
// do nothing
} catch (Exception e) {
mainDesc.addAll(doExceptionMessage(e));
}
Expand Down

0 comments on commit ef81ae7

Please sign in to comment.