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: calculate diff after newlines converting

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-02-12 20:31:59 +03:00
parent 761432795c
commit 08e3f74fd1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java
+4 -4
View File
@@ -126,6 +126,10 @@ public class SvnPropertiesDiffViewer implements DiffViewer {
String text1 = value1 != null ? value1.toString() : null;
String text2 = value2 != null ? value2.toString() : null;
// TODO: show differences in line separators ?
if (text1 != null) text1 = StringUtil.convertLineSeparators(text1);
if (text2 != null) text2 = StringUtil.convertLineSeparators(text2);
List<? extends LineFragment> fragments = compareValues(text1, text2);
return new PropertyDiffRecord(name, text1, text2, fragments);
@@ -236,10 +240,6 @@ public class SvnPropertiesDiffViewer implements DiffViewer {
@NotNull List<? extends LineFragment> fragments) {
assert before != null || after != null;
// TODO: show differences in line separators ?
if (before != null) before = StringUtil.convertLineSeparators(before);
if (after != null) after = StringUtil.convertLineSeparators(after);
myName = name;
myBefore = before;
myAfter = after;