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

diff: use mock binary VirtualFile instead of temporal one

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-02-03 19:47:03 +03:00
parent 46feb10028
commit 289a8306f2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffContentFactory.java
+3 -3
View File
@@ -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
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestPresentable.java
+1 -1
View File
@@ -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();