diff options
| author | Michael Valenta | 2007-02-22 21:15:59 +0000 |
|---|---|---|
| committer | Michael Valenta | 2007-02-22 21:15:59 +0000 |
| commit | c042ebd332478c58b01b2fb16a9231f2a5971246 (patch) | |
| tree | 859edfdcb30993e92be09fa59fc978982794dae4 /bundles | |
| parent | 9f56c3423adaba245a142ed645af7c060902be02 (diff) | |
| download | eclipse.platform.team-c042ebd332478c58b01b2fb16a9231f2a5971246.tar.gz eclipse.platform.team-c042ebd332478c58b01b2fb16a9231f2a5971246.tar.xz eclipse.platform.team-c042ebd332478c58b01b2fb16a9231f2a5971246.zip | |
Bug 171678 [Viewers] Token diff treats space as significant
Diffstat (limited to 'bundles')
2 files changed, 8 insertions, 8 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 1cf91b883..1942e4b98 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -162,7 +162,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { /** line width of change borders */ private static final int LW= 1; /** Selects between smartTokenDiff and mergingTokenDiff */ - private static final boolean USE_MERGING_TOKEN_DIFF= false; + private static final boolean USE_MERGING_TOKEN_DIFF= true; // determines whether a change between left and right is considered incoming or outgoing private boolean fLeftIsLocal; @@ -3422,9 +3422,9 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { int rightStart2= rightStart+sm.getTokenStart(first.rightStart()); int rightEnd2= rightStart+getTokenEnd(sm, last.rightStart(), last.rightLength()); Diff diff= new Diff(baseDiff, first.kind(), - ancestorDoc, null, ancestorStart2, ancestorEnd2+1, - leftDoc, null, leftStart2, leftEnd2+1, - rightDoc, null, rightStart2, rightEnd2+1); + ancestorDoc, null, ancestorStart2, ancestorEnd2, + leftDoc, null, leftStart2, leftEnd2, + rightDoc, null, rightStart2, rightEnd2); diff.fIsToken= true; baseDiff.add(diff); } diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 1cf91b883..1942e4b98 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -162,7 +162,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { /** line width of change borders */ private static final int LW= 1; /** Selects between smartTokenDiff and mergingTokenDiff */ - private static final boolean USE_MERGING_TOKEN_DIFF= false; + private static final boolean USE_MERGING_TOKEN_DIFF= true; // determines whether a change between left and right is considered incoming or outgoing private boolean fLeftIsLocal; @@ -3422,9 +3422,9 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { int rightStart2= rightStart+sm.getTokenStart(first.rightStart()); int rightEnd2= rightStart+getTokenEnd(sm, last.rightStart(), last.rightLength()); Diff diff= new Diff(baseDiff, first.kind(), - ancestorDoc, null, ancestorStart2, ancestorEnd2+1, - leftDoc, null, leftStart2, leftEnd2+1, - rightDoc, null, rightStart2, rightEnd2+1); + ancestorDoc, null, ancestorStart2, ancestorEnd2, + leftDoc, null, leftStart2, leftEnd2, + rightDoc, null, rightStart2, rightEnd2); diff.fIsToken= true; baseDiff.add(diff); } |