MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-144511 patch: do not report "Unknown File Type" for new files

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-08-31 13:07:17 +03:00
parent c4ddddb47f
commit 2930311adc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java
+3 -3
View File
@@ -170,10 +170,10 @@ public class DiffShelvedChangesAction extends AnAction implements DumbAware {
for (final ShelvedChange shelvedChange : changesFromFirstList) {
final String beforePath = shelvedChange.getBeforePath();
final String afterPath = shelvedChange.getAfterPath();
final boolean isNewFile = FileStatus.ADDED.equals(shelvedChange.getFileStatus());
final VirtualFile file;
final VirtualFile file; // isNewFile -> parent directory, !isNewFile -> file
try {
boolean isNewFile = FileStatus.ADDED.equals(shelvedChange.getFileStatus());
file = ApplyFilePatchBase.findPatchTarget(patchContext, beforePath, afterPath, isNewFile);
if (!isNewFile && (file == null || !file.exists())) throw new FileNotFoundException(beforePath);
}
@@ -194,7 +194,7 @@ public class DiffShelvedChangesAction extends AnAction implements DumbAware {
@Override
public DiffRequest process(@NotNull UserDataHolder context, @NotNull ProgressIndicator indicator)
throws DiffRequestProducerException, ProcessCanceledException {
if (file != null && file.getFileType() == UnknownFileType.INSTANCE) {
if (!isNewFile && file.getFileType() == UnknownFileType.INSTANCE) {
return new UnknownFileTypeDiffRequest(file, getName());
}