diff: EA-77154 - IAE: FileEditorManagerImpl.openFileWithProviders

do not create OpenFileDescriptor from invalid VirtualFile
This commit is contained in:
Aleksey Pivovarov
2015-12-23 18:58:59 +03:00
parent a2c9e2aca0
commit ba99b88737
5 changed files with 5 additions and 5 deletions
@@ -35,7 +35,7 @@ public class DirectoryContentImpl extends DiffContentBase implements DirectoryCo
@Nullable
@Override
public OpenFileDescriptor getOpenFileDescriptor() {
if (myProject == null || myProject.isDefault()) return null;
if (myProject == null || myProject.isDefault() || !myFile.isValid()) return null;
return new OpenFileDescriptor(myProject, myFile);
}
@@ -39,7 +39,7 @@ public class FileAwareDocumentContent extends DocumentContentImpl {
@Override
public OpenFileDescriptor getOpenFileDescriptor(int offset) {
if (myProject == null || getHighlightFile() == null) return null;
if (myProject == null || getHighlightFile() == null || !getHighlightFile().isValid()) return null;
return new OpenFileDescriptor(myProject, getHighlightFile(), offset);
}
@@ -40,7 +40,7 @@ public class FileContentImpl extends DiffContentBase implements FileContent {
@Nullable
@Override
public OpenFileDescriptor getOpenFileDescriptor() {
if (myProject == null || myProject.isDefault()) return null;
if (myProject == null || myProject.isDefault() || !myFile.isValid()) return null;
return new OpenFileDescriptor(myProject, myFile);
}
@@ -39,7 +39,7 @@ public class FileDocumentContentImpl extends DocumentContentImpl implements File
@Nullable
@Override
public OpenFileDescriptor getOpenFileDescriptor(int offset) {
if (myProject == null || myProject.isDefault()) return null;
if (myProject == null || myProject.isDefault() || !myFile.isValid()) return null;
return new OpenFileDescriptor(myProject, myFile, offset);
}
@@ -87,7 +87,7 @@ public class VirtualFileDiffElement extends DiffElement<VirtualFile> {
@Override
@Nullable
public OpenFileDescriptor getOpenFileDescriptor(@Nullable Project project) {
if (project == null || project.isDefault()) return null;
if (project == null || project.isDefault() || !myFile.isValid()) return null;
return new OpenFileDescriptor(project, myFile);
}