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

[groovy] fix NPE

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2016-01-29 22:19:00 +03:00
parent d81ecdc3b5
commit f362dac3ea
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/search/GrSourceFilterScope.java
+5 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,22 +21,23 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.search.DelegatingGlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.GroovyFileType;
/**
* @author ilyas
*/
public class GrSourceFilterScope extends DelegatingGlobalSearchScope {
private final ProjectFileIndex myIndex;
private @Nullable final ProjectFileIndex myIndex;
public GrSourceFilterScope(@NotNull final GlobalSearchScope delegate) {
super(delegate, "groovy.sourceFilter");
myIndex = ProjectRootManager.getInstance(getProject()).getFileIndex();
myIndex = getProject() == null ? null : ProjectRootManager.getInstance(getProject()).getFileIndex();
}
@Override
public boolean contains(@NotNull final VirtualFile file) {
return super.contains(file) && myIndex.isInSourceContent(file) && GroovyFileType.GROOVY_FILE_TYPE == file.getFileType();
return super.contains(file) && (myIndex == null || myIndex.isInSourceContent(file)) && GroovyFileType.GROOVY_FILE_TYPE == file.getFileType();
}
}