Revert "Corrected TextLayout to produce right number of lines when '\r\n'"

This reverts commit 6104592.

Author: jukzi

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java

@@ -42,7 +42,7 @@
  */
 public final class TextLayout extends Resource {
 	Font font;
-	String text, segmentsText, originalText;
+	String text, segmentsText;
 	int lineSpacingInPoints;
 	int ascent, descent;
 	int alignment;
@@ -309,7 +309,7 @@ public TextLayout (Device device) {
 	styles[0] = new StyleItem();
 	styles[1] = new StyleItem();
 	stylesCount = 2;
-	text = originalText = ""; //$NON-NLS-1$
+	text = ""; //$NON-NLS-1$
 	long[] ppv = new long[1];
 	OS.OleInitialize(0);
 	if (COM.CoCreateInstance(COM.CLSID_CMultiLanguage, 0, COM.CLSCTX_INPROC_SERVER, COM.IID_IMLangFontLink2, ppv) == OS.S_OK) {
@@ -2724,16 +2724,8 @@ private int getScaledVerticalIndent() {
  */
 public TextStyle getStyle (int offset) {
 	checkLayout();
-	int length = originalText.length();
+	int length = text.length();
 	if (!(0 <= offset && offset < length)) SWT.error(SWT.ERROR_INVALID_RANGE);
-	int crCount = 0, subStringLength = originalText.subSequence(0, offset+1).length();
-	for (int crIndex = 0; crIndex < subStringLength; crIndex++) {
-		if (originalText.charAt(crIndex) == '\r') {
-			crCount++;
-		}
-	}
-	offset = offset - crCount;
-
 	for (int i=1; i<stylesCount; i++) {
 		if (styles[i].start > offset) {
 			return styles[i - 1].style;
@@ -2964,11 +2956,15 @@ StyleItem[] merge (long items, int itemCount) {
 			linkBefore = false;
 		}
 		char ch = segmentsText.charAt(start);
-		if (ch == '\r' && start + 1 < end) {
-			ch = segmentsText.charAt(start + 1);
+		switch (ch) {
+			case '\r':
+			case '\n':
+				item.lineBreak = true;
+				break;
+			case '\t':
+				item.tab = true;
+				break;
 		}
-		item.lineBreak = ch == '\n';
-		item.tab = ch == '\t';
 		if (itemLimit == -1) {
 			nextItemIndex = itemIndex + 1;
 			OS.MoveMemory(scriptItem, items + nextItemIndex * SCRIPT_ITEM.sizeof, SCRIPT_ITEM.sizeof);
@@ -3459,22 +3455,6 @@ public void setStyle (TextStyle style, int start, int end) {
 	int length = text.length();
 	if (length == 0) return;
 	if (start > end) return;
-
-	int startCount = 0;
-	int endCount = 0;
-	for (int crIndex = originalText.indexOf('\r', 0); crIndex >= 0; crIndex = originalText.indexOf('\r', crIndex + 1)) {
-		if (crIndex < start) {
-			++startCount;
-		} else if (crIndex <= end) {
-			++endCount;
-		} else {
-			break;
-		}
-	}
-	endCount = endCount + startCount;
-	start -= startCount;
-	end -= endCount;
-
 	start = Math.min(Math.max(0, start), length - 1);
 	end = Math.min(Math.max(0, end), length - 1);
 	int low = -1;
@@ -3588,8 +3568,6 @@ public void setTabs (int[] tabs) {
  */
 public void setText (String text) {
 	checkLayout();
-	this.originalText = text;
-	text = text.replace("\r", "");
 	if (text == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	if (text.equals(this.text)) return;
 	freeRuns();

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java

@@ -547,60 +547,6 @@ public void test_setStyle() {
 	assertNull(layout.getStyle(4));
 	assertNull(layout.getStyle(5));
 	layout.dispose();
-
-	layout = new TextLayout (display);
-	layout.setText("\rabc\ndef\r\rghi\n\njkl\r\nmno\r\n\r\npqr\r");
-	layout.setStyle(s1, 0, 5);//abcd
-	layout.setStyle (s2, 7, 10);//fg
-	layout.setStyle (s3, 11, 18);//hijkl
-	layout.setStyle (s4, 19, 24);//mno
-	assertEquals(s1, layout.getStyle(0));
-	assertEquals(s1, layout.getStyle(1));
-	assertEquals(s1, layout.getStyle(3));
-	assertEquals(s1, layout.getStyle(4));
-	assertEquals(s1, layout.getStyle(5));
-
-	assertEquals(s2, layout.getStyle(7));
-	assertEquals(s2, layout.getStyle(8));
-	assertEquals(s2, layout.getStyle(9));
-	assertEquals(s2, layout.getStyle(10));
-
-	assertEquals(s3, layout.getStyle(12));
-	assertEquals(s3, layout.getStyle(13));
-	assertEquals(s3, layout.getStyle(14));
-	assertEquals(s3, layout.getStyle(15));
-
-	assertEquals(s4, layout.getStyle(19));
-	assertEquals(s4, layout.getStyle(20));
-	assertEquals(s4, layout.getStyle(22));
-	assertEquals(s4, layout.getStyle(23));
-	assertEquals(s4, layout.getStyle(24));
-
-	layout.setStyle (null, 0, 3);//abc
-	assertNull(layout.getStyle(0));
-
-	layout.setStyle(s1, 0, 9);//abcdef
-	assertEquals(s1, layout.getStyle(8));
-
-	layout.setStyle (s2, 1, 24);//abcdefghijklmno
-	assertEquals(s2, layout.getStyle(7));
-	assertEquals(s2, layout.getStyle(8));
-	assertEquals(s2, layout.getStyle(14));
-	assertEquals(s2, layout.getStyle(18));
-	assertEquals(s2, layout.getStyle(22));
-	assertEquals(s2, layout.getStyle(23));
-	assertEquals(s2, layout.getStyle(24));
-
-	layout.setStyle (s3, 0, 30);//abcdefghijklmnopqr
-	assertEquals(s3, layout.getStyle(0));
-	assertEquals(s3, layout.getStyle(1));
-	assertEquals(s3, layout.getStyle(30));
-
-	layout.setStyle (s4, 1, 30);//abcdefghijklmnopqr
-	assertEquals(s4, layout.getStyle(1));
-	assertEquals(s4, layout.getStyle(29));
-	assertEquals(s4, layout.getStyle(30));
-	layout.dispose();
 }
 
 @Test
@@ -1273,31 +1219,4 @@ public void test_Bug579335_win32_StyledText_LongLine() {
 			font.dispose();
 	}
 }
-
-@Test
-public void test_getLineCount() {
-	// Skipping this test for GTK and Cocoa as this pr #1320 applies only for
-	// windows platform.
-	// Without pr #1320(master) : Number of lines: 11 (for Cocoa it is : 10)
-	// Expected : Number of lines: 7 (for Cocoa it is : 10)
-	TextLayout layout = new TextLayout(display);
-	try {
-		String text = "\rabc\ndef\r\rghi\n\njkl\r\nmno\r\n\r\npqr\r";
-		layout.setText(text);
-		int lineCount = layout.getLineCount();
-
-		int expected = 0;
-		if (SwtTestUtil.isWindows) {
-			expected = 7;
-		} else if (SwtTestUtil.isCocoa) {
-			expected = 10;
-		} else if (SwtTestUtil.isGTK) {
-			expected = 11;
-		}
-
-		assertEquals(expected, lineCount);
-	} finally {
-		layout.dispose();
-	}
-}
 }