From 0f265919bf72d86cd3e1cc730dd3c4dd0d52ac66 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Mon, 15 Jan 2018 13:40:16 +0300 Subject: [PATCH] use project from method parameter in ProjectFilesScope to avoid NPE while batch code analysis (IDEA-184819) --- .../psi/search/scope/ProjectFilesScope.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectFilesScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectFilesScope.java index e55cd9d5cfbd..45a4ee0bd8ac 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectFilesScope.java +++ b/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectFilesScope.java @@ -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; }