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

fix test

Browse Source
This commit is contained in:
irengrig
2011-07-13 14:51:01 +04:00
parent 64405fecd7
commit 12b0bf5df4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java
+8 -4
View File
@@ -114,8 +114,8 @@ public class TextPatchBuilder {
if (afterContent == null) {
throw new VcsException("Failed to fetch new content for changed file " + afterRevision.getPath().getPath());
}
String[] beforeLines = new LineTokenizer(beforeContent).execute();
String[] afterLines = new LineTokenizer(afterContent).execute();
String[] beforeLines = tokenize(beforeContent);
String[] afterLines = tokenize(afterContent);
DiffFragment[] woFormattingBlocks;
DiffFragment[] step1lineFragments;
@@ -181,6 +181,10 @@ public class TextPatchBuilder {
return result;
}
private static String[] tokenize(String text) {
return text.length() == 0 ? new String[]{text} : new LineTokenizer(text).execute();
}
private FilePatch buildBinaryPatch(final String basePath,
final AirContentRevision beforeRevision,
final AirContentRevision afterRevision) throws VcsException {
@@ -218,7 +222,7 @@ public class TextPatchBuilder {
if (content == null) {
throw new VcsException("Failed to fetch content for added file " + afterRevision.getPath().getPath());
}
String[] lines = new LineTokenizer(content).execute();
String[] lines = tokenize(content);
TextFilePatch result = buildPatchHeading(basePath, afterRevision, afterRevision);
PatchHunk hunk = new PatchHunk(-1, -1, 0, lines.length);
for(String line: lines) {
@@ -234,7 +238,7 @@ public class TextPatchBuilder {
if (content == null) {
throw new VcsException("Failed to fetch old content for deleted file " + beforeRevision.getPath().getPath());
}
String[] lines = new LineTokenizer(content).execute();
String[] lines = tokenize(content);
TextFilePatch result = buildPatchHeading(basePath, beforeRevision, beforeRevision);
PatchHunk hunk = new PatchHunk(0, lines.length, -1, -1);
for(String line: lines) {