MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SSR: catch runtime exceptions from Groovy shell (IDEA-187725)

Browse Source
This commit is contained in:
Bas Leijdekkers
2018-03-05 16:15:28 +01:00
parent ba9689ca32
commit 560d79c537
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java
+1 -2
View File
@@ -11,7 +11,6 @@ import com.intellij.structuralsearch.StructuralSearchException;
import com.intellij.structuralsearch.StructuralSearchUtil;
import com.intellij.structuralsearch.plugin.ui.Configuration;
import groovy.lang.Binding;
import groovy.lang.GroovyRuntimeException;
import groovy.lang.GroovyShell;
import groovy.lang.Script;
import org.codehaus.groovy.control.CompilationFailedException;
@@ -105,7 +104,7 @@ public class ScriptSupport {
final Object o = script.run();
return String.valueOf(o);
} catch (GroovyRuntimeException ex) {
} catch (RuntimeException ex) {
throw new StructuralSearchException(SSRBundle.message("groovy.script.error", StringUtil.replace(ex.getMessage(), UUID, "")));
} finally {
script.setBinding(null);
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+10
View File
@@ -905,6 +905,16 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
"import static com.intellij.psi.util.PsiUtil.*\n" +
"Symbol instanceof PsiExpression && isAccessedForWriting(Symbol) ||\n" +
" Symbol instanceof PsiVariable && Symbol.getInitializer() != null\")]"));
try {
findMatchesCount(in, "[script( com.intellij.psi.PsiField field = __context__; true; )]" +
"int i;");
fail("Catch RuntimeExceptions from Groovy runtime");
} catch (StructuralSearchException ignore) {
} catch (Throwable t) {
fail("Catch RuntimeExceptions from Groovy runtime");
}
}
public void testCheckScriptValidation() {