commit 1e28d395eeadbf6dd23afca65dbd2c947148afb7
author Eric Milles <eric.milles@thomsonreuters.com> Fri Jan 10 14:56:19 2020 -0600
committer Eric Milles <eric.milles@thomsonreuters.com> Fri Jan 10 15:03:55 2020 -0600
tree 43a5fa111e1b7ba255d0372d54832371d92d7dc2
parent 55b8bd1773a9380cd602952fb6735676d1e93319

get source context from GroovyRuntimeException and SyntaxException

src/main/java/org/codehaus/groovy/control/CompilationUnit.java

diff --git a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
index eb915ef..bd21641 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
@@ -19,6 +19,7 @@
 package org.codehaus.groovy.control;
 
 import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyRuntimeException;
 import groovy.transform.CompilationUnitAware;
 import org.codehaus.groovy.GroovyBugError;
 import org.codehaus.groovy.ast.ClassCodeExpressionTransformer;
@@ -942,10 +943,22 @@
 
                     if (errorCollector != null) {
                         unit.getErrorCollector().addCollectorContents(errorCollector);
-                    } else if (context != null) {
-                        unit.getErrorCollector().addException(e instanceof Exception ? (Exception) e : new RuntimeException(e), context);
                     } else {
-                        unit.getErrorCollector().addError(new ExceptionMessage(e instanceof Exception ? (Exception) e : new RuntimeException(e), unit.debug, unit));
+                        if (e instanceof GroovyRuntimeException) {
+                            GroovyRuntimeException gre = (GroovyRuntimeException) e;
+                            context = Optional.ofNullable(gre.getModule()).map(ModuleNode::getContext).orElse(context);
+                        }
+                        if (context != null) {
+                            if (e instanceof SyntaxException) {
+                                unit.getErrorCollector().addError((SyntaxException) e, context);
+                            } else if (e.getCause() instanceof SyntaxException) {
+                                unit.getErrorCollector().addError((SyntaxException) e.getCause(), context);
+                            } else {
+                                unit.getErrorCollector().addException(e instanceof Exception ? (Exception) e : new RuntimeException(e), context);
+                            }
+                        } else {
+                            unit.getErrorCollector().addError(new ExceptionMessage(e instanceof Exception ? (Exception) e : new RuntimeException(e), unit.debug, unit));
+                        }
                     }
                 }
             }
@@ -1079,13 +1092,13 @@
         addNewPhaseOperation((ISourceUnitOperation) op, phase);
     }
 
-    @Deprecated // IntelliJ IDEA depends on the API
-    public void applyToPrimaryClassNodes(final PrimaryClassNodeOperation op) throws CompilationFailedException {
+    @Deprecated
+    public void applyToSourceUnits(final SourceUnitOperation op) throws CompilationFailedException {
         op.doPhaseOperation(this);
     }
 
     @Deprecated
-    public void applyToSourceUnits(final SourceUnitOperation op) throws CompilationFailedException {
+    public void applyToPrimaryClassNodes(final PrimaryClassNodeOperation op) throws CompilationFailedException {
         op.doPhaseOperation(this);
     }