From fafb0e959d2fbd2bc6dc0d0d3952c1a721c72398 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Wed, 26 Oct 2016 16:46:41 +0300 Subject: [PATCH] [groovy] search for groovy SDK class instead of checking libraries structure and jar names. --- .../config/DefaultGroovyFrameworkConfigNotification.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/DefaultGroovyFrameworkConfigNotification.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/DefaultGroovyFrameworkConfigNotification.java index 6e4f33de4c44..4cc8e6c0ab6f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/DefaultGroovyFrameworkConfigNotification.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/DefaultGroovyFrameworkConfigNotification.java @@ -16,12 +16,13 @@ package org.jetbrains.plugins.groovy.config; import com.intellij.openapi.module.Module; -import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.ui.configuration.libraries.AddCustomLibraryDialog; +import com.intellij.psi.JavaPsiFacade; import com.intellij.ui.EditorNotificationPanel; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.GroovyBundle; import org.jetbrains.plugins.groovy.annotator.GroovyFrameworkConfigNotification; +import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames; /** * @author sergey.evdokimov @@ -35,8 +36,9 @@ public class DefaultGroovyFrameworkConfigNotification extends GroovyFrameworkCon @Override public boolean hasFrameworkLibrary(@NotNull Module module) { - final Library[] libraries = GroovyConfigUtils.getInstance().getSDKLibrariesByModule(module); - return libraries.length > 0; + return JavaPsiFacade.getInstance(module.getProject()).findClass( + GroovyCommonClassNames.GROOVY_OBJECT, module.getModuleWithDependenciesAndLibrariesScope(true) + ) != null; } @Override