From 2930311adc48a9df29f15d66182f86a65b412aed Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 31 Aug 2015 13:01:00 +0300 Subject: [PATCH] IDEA-144511 patch: do not report "Unknown File Type" for new files --- .../openapi/vcs/changes/shelf/DiffShelvedChangesAction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java index 768e267dc2d0..766e2d6ee844 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java @@ -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()); }