From f362dac3ea5d0331b3949412d612910f20ee1b94 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Fri, 29 Jan 2016 22:15:54 +0300 Subject: [PATCH] [groovy] fix NPE --- .../groovy/lang/psi/impl/search/GrSourceFilterScope.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/search/GrSourceFilterScope.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/search/GrSourceFilterScope.java index 4b0b5c120ce4..51b721878bbd 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/search/GrSourceFilterScope.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/search/GrSourceFilterScope.java @@ -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(); } }