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

IDEA-136812 Groovy script icon detector invoked even if file is outside of source root

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2015-03-25 19:59:03 +03:00
parent a383a6b4b1
commit 6c405691f8
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyFileIconProvider.java
+8 -13
View File
@@ -32,9 +32,6 @@ import org.jetbrains.plugins.groovy.util.GrFileIndexUtil;
import javax.swing.*;
/**
* @author peter
*/
public class GroovyFileIconProvider implements FileIconProvider {
@Nullable
@@ -45,16 +42,14 @@ public class GroovyFileIconProvider implements FileIconProvider {
if (!(psiFile instanceof GroovyFile)) return null;
final GroovyFile file = (GroovyFile)psiFile;
final Icon icon;
if (GrFileIndexUtil.isGroovySourceFile(file)) {
if (file.isScript()) {
icon = GroovyScriptTypeDetector.getIcon(file);
}
else {
final GrTypeDefinition[] typeDefinitions = file.getTypeDefinitions();
icon = typeDefinitions.length > 0
? typeDefinitions[0].getIcon(flags)
: JetgroovyIcons.Groovy.Groovy_16x16;
}
if (file.isScript()) {
icon = GroovyScriptTypeDetector.getIcon(file);
}
else if (GrFileIndexUtil.isGroovySourceFile(file)) {
final GrTypeDefinition[] typeDefinitions = file.getTypeDefinitions();
icon = typeDefinitions.length > 0
? typeDefinitions[0].getIcon(flags)
: JetgroovyIcons.Groovy.Groovy_16x16;
}
else {
icon = JetgroovyIcons.Groovy.Groovy_outsideSources;