use project from method parameter in ProjectFilesScope to avoid NPE while batch code analysis (IDEA-184819)

This commit is contained in:
Dmitry Batkovich
2018-01-15 13:40:16 +03:00
parent d8d24ab2fe
commit 0f265919bf
@@ -1,17 +1,5 @@
/*
* Copyright 2000-2010 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
package com.intellij.psi.search.scope;
@@ -41,7 +29,7 @@ public class ProjectFilesScope extends NamedScope {
public boolean contains(VirtualFile file, @NotNull Project project, @Nullable NamedScopesHolder holder) {
if (file == null) return false;
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
return holder.getProject().isInitialized()
return project.isInitialized()
&& !fileIndex.isExcluded(file)
&& fileIndex.getContentRootForFile(file) != null;
}