version obeying exact input regions

1 files changed, 21 insertions, 5 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java
index 97239ac81..5d64f1f83 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java
@@ -24,6 +24,7 @@ public class DocLineComparator implements ITokenComparator {
 	private int fLineCount;

 	private int fLength;

 	private boolean fIgnoreWhiteSpace;

+	private IRegion fRegion;

 

 	/**

 	 * Creates a <code>DocLineComparator</code> for the given document range.

@@ -40,6 +41,7 @@ public class DocLineComparator implements ITokenComparator {
 		fIgnoreWhiteSpace= ignoreWhiteSpace;

 

 		fLineOffset= 0;

+		fRegion= region;

 		if (region != null) {

 			fLength= region.getLength();

 			int start= region.getOffset();

@@ -91,7 +93,13 @@ public class DocLineComparator implements ITokenComparator {
 	 * see ITokenComparator.getTokenLength

 	 */

 	public int getTokenLength(int line) {

-		return getTokenStart(line+1) - getTokenStart(line);

+		int s= getTokenStart(line);

+		int e= getTokenStart(line+1);

+		if (fRegion != null) {

+			if (e > fRegion.getOffset()+fRegion.getLength())

+				e= fRegion.getOffset()+fRegion.getLength();

+		}

+		return e - s;

 //		try {

 //			IRegion r= fDocument.getLineInformation(fLineOffset + line);

 //			return r.getLength();

@@ -137,9 +145,6 @@ public class DocLineComparator implements ITokenComparator {
 	 * @return <code>true</code> to abort a token comparison

 	 */

 	public boolean skipRangeComparison(int length, int max, IRangeComparator other) {

-		

-//		if (max > 10000)

-//			return true;

 		return false;

 	}

 		

@@ -155,7 +160,18 @@ public class DocLineComparator implements ITokenComparator {
 		if (line < fLineCount) {

 			try {

 				IRegion r= fDocument.getLineInformation(fLineOffset + line);

-				return fDocument.get(r.getOffset(), r.getLength());

+				int s= r.getOffset();

+				int l= r.getLength();

+				if (fRegion != null) {

+					int e= s+l;

+					int ee= fRegion.getOffset()+fRegion.getLength();

+					if (e > ee) {

+						System.out.println("********** extract");

+						e= ee;

+						l= e-s;

+					}

+				}

+				return fDocument.get(s, l);

 			} catch(BadLocationException e) {

 			}

 		}