diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffContentFactory.java b/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffContentFactory.java index 626e615d33f1..d72fc61bd5fe 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffContentFactory.java +++ b/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffContentFactory.java @@ -12,6 +12,7 @@ import com.intellij.openapi.util.diff.contents.*; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.testFramework.BinaryLightVirtualFile; import com.intellij.util.LineSeparator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -63,10 +64,9 @@ public class DiffContentFactory { @NotNull public static BinaryFileContentImpl createBinary(@Nullable Project project, @NotNull String name, - @NotNull String path, + @NotNull FileType type, @NotNull byte[] content) throws IOException { - // TODO: create mock VirtualFile - return createTemporalFile(project, "tmp", name, content); + return new BinaryFileContentImpl(project, new BinaryLightVirtualFile(name, type, content)); } @NotNull diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestPresentable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestPresentable.java index 372f7c2fd0d1..f2cd12cd3e1b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestPresentable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestPresentable.java @@ -274,7 +274,7 @@ public class ChangeDiffRequestPresentable implements DiffRequestPresentable { if (content == null) { throw new DiffRequestPresentableException("Can't get binary revision content"); } - return DiffContentFactory.createBinary(project, filePath.getName(), filePath.getPath(), content); + return DiffContentFactory.createBinary(project, filePath.getName(), filePath.getFileType(), content); } String revisionContent = revision.getContent();