From 35e1ffb39eb77f6afa3a970b439d4a1fe131eb8c Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 4 Aug 2016 11:01:12 +0200 Subject: [PATCH] don't call groovy position manager helpers on files they don't handle (fix(?) IDEA-159345) --- .../groovy/debugger/GroovyPositionManager.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java index 3b38c5d6f534..1f31ab5b7b37 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java @@ -197,10 +197,13 @@ public class GroovyPositionManager implements PositionManager { return parent == null ? null : parent + "$" + typeDefinition.getName() + suffix; } - for (ScriptPositionManagerHelper helper : ScriptPositionManagerHelper.EP_NAME.getExtensions()) { - final String s = helper.customizeClassName(typeDefinition); - if (s != null) { - return s; + PsiFile file = typeDefinition.getContainingFile(); + if (file instanceof GroovyFile) { + for (ScriptPositionManagerHelper helper : ScriptPositionManagerHelper.EP_NAME.getExtensions()) { + String s = helper.isAppropriateScriptFile((GroovyFile)file) ? helper.customizeClassName(typeDefinition) : null; + if (s != null) { + return s; + } } }