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

correct Groovy script run configuration producer

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-02-22 15:16:27 +04:00
parent 49008522c7
commit fb5df5ad3e
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunnerUtil.java
+3 -14
View File
@@ -20,16 +20,12 @@ import com.intellij.psi.util.PsiMethodUtil;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GroovyScriptClass;
/**
* @author Max Medvedev
*/
public class GroovyRunnerUtil {
private static final String JAVA_LANG_RUNNABLE = "java.lang.Runnable";
@Nullable
public static PsiClass getRunningClass(PsiElement element) {
final PsiFile file = element.getContainingFile();
@@ -46,19 +42,12 @@ public class GroovyRunnerUtil {
}
public static boolean isRunnable(final PsiClass psiClass) {
if (!(psiClass instanceof GrTypeDefinition)) return false;
if (!(psiClass instanceof GrTypeDefinition) && !(psiClass instanceof GroovyScriptClass)) return false;
if (psiClass instanceof PsiAnonymousClass) return false;
if (psiClass.isInterface()) return false;
final PsiClass runnable = JavaPsiFacade.getInstance(psiClass.getProject()).findClass(JAVA_LANG_RUNNABLE, psiClass.getResolveScope());
final PsiClass runnable = JavaPsiFacade.getInstance(psiClass.getProject()).findClass(CommonClassNames.JAVA_LANG_RUNNABLE, psiClass.getResolveScope());
if (runnable == null) return false;
final PsiMethod runMethod = runnable.getMethods()[0];
final PsiMethod[] runImplementations = psiClass.findMethodsBySignature(runMethod, false);
if (runImplementations.length == 1 &&
runImplementations[0] instanceof GrMethod &&
((GrMethod)runImplementations[0]).getBlock() != null) {
return psiClass.getContainingClass() == null || psiClass.hasModifierProperty(PsiModifier.STATIC);
}
return false;
return psiClass.isInheritor(runnable, true);
}
public static boolean canBeRunByGroovy(final PsiClass psiClass) {
plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr
GroovyFile groovyFile = (GroovyFile)file;
final PsiClass aClass = GroovyRunnerUtil.getRunningClass(location.getPsiElement());
if (aClass != null && GroovyRunnerUtil.canBeRunByGroovy(aClass)) {
if (GroovyRunnerUtil.isRunnable(aClass)) {
final RunnerAndConfigurationSettings settings = createConfiguration(aClass);
if (settings != null) {
mySourceElement = element;