From 96999f75d40b3022d2fca6dd8679598b8fd6c4cd Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 6 Oct 2010 15:46:39 +0400 Subject: [PATCH] ProjectLocator.guessProjectForFile() behavior restored --- .../intellij/openapi/project/ProjectLocatorImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/lang-api/src/com/intellij/openapi/project/ProjectLocatorImpl.java b/platform/lang-api/src/com/intellij/openapi/project/ProjectLocatorImpl.java index 4b4c86e1d670..d4124635bcd9 100644 --- a/platform/lang-api/src/com/intellij/openapi/project/ProjectLocatorImpl.java +++ b/platform/lang-api/src/com/intellij/openapi/project/ProjectLocatorImpl.java @@ -33,14 +33,16 @@ public class ProjectLocatorImpl extends ProjectLocator { @Nullable public Project guessProjectForFile(final VirtualFile file) { ProjectManager projectManager = ProjectManager.getInstance(); - if (projectManager == null || file == null) return null; + if (projectManager == null) return null; final Project[] projects = projectManager.getOpenProjects(); if (projects.length == 0) return null; if (projects.length == 1 && !projects[0].isDisposed()) return projects[0]; - for (Project project : projects) { - if (project.isInitialized() && !project.isDisposed() && ProjectRootManager.getInstance(project).getFileIndex().isInContent(file)) { - return project; + if (file != null) { + for (Project project : projects) { + if (project.isInitialized() && !project.isDisposed() && ProjectRootManager.getInstance(project).getFileIndex().isInContent(file)) { + return project; + } } }