sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #556 from FStolte/issue555

Browse source 
Fix for issue [#555]
This commit is contained in:
Karsten Thoms 2017-11-22 16:58:59 +01:00 committed by GitHub
commit 98dd193d8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 94 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/debug/TextRegionsToStringTest.xtend Normal file
View file

@ -0,0 +1,49 @@
/*******************************************************************************
* Copyright (c) 2017 itemis AG (http://www.itemis.eu) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.eclipse.xtext.formatting2.debug
import org.junit.Before
import org.junit.Test
import static org.junit.Assert.*;
/**
* @author Florian Stolte - Initial contribution and API
*/
class TextRegionsToStringTest {
TextRegionsToString textRegionsToString;
@Before
def void init() {
textRegionsToString = new TextRegionsToString
textRegionsToString.ignoreCarriageReturnInQuotes = true
}
@Test
def testQuote() {
// insert quotes
assertEquals("\"import some.thing\"", textRegionsToString.quote("import some.thing", 30))
assertEquals("\"import some.thing\"", textRegionsToString.quote("import some.thing", 17))
// shorten result
assertEquals("\"import ...\"", textRegionsToString.quote("import some.thing", 10))
assertEquals("\"import some.t...\"", textRegionsToString.quote("import some.thing", 16))
// remove windows line endings
assertEquals("\"\\nimport some.thing\\n\"", textRegionsToString.quote("\r\nimport some.thing\r\n", 30))
assertEquals("\"\\nimport some.thing\\n\"", textRegionsToString.quote("\r\nimport some.thing\r\n", 19))
// remove windows line endings and shorten
assertEquals("\"\\nimport...\"", textRegionsToString.quote("\r\nimport some.thing\r\n", 10))
assertEquals("\"\\nimport some.th...\"", textRegionsToString.quote("\r\nimport some.thing\r\n", 18))
// keep windows line endings
textRegionsToString.ignoreCarriageReturnInQuotes = false
assertEquals("\"\\r\\nimport some.thing\\r\\n\"", textRegionsToString.quote("\r\nimport some.thing\r\n", 30))
}
}

42
org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/formatting2/debug/TextRegionsToStringTest.java Normal file
View file

@ -0,0 +1,42 @@
/**
* Copyright (c) 2017 itemis AG (http://www.itemis.eu) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.eclipse.xtext.formatting2.debug;
import org.eclipse.xtext.formatting2.debug.TextRegionsToString;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
/**
* @author Florian Stolte - Initial contribution and API
*/
@SuppressWarnings("all")
public class TextRegionsToStringTest {
private TextRegionsToString textRegionsToString;
@Before
public void init() {
TextRegionsToString _textRegionsToString = new TextRegionsToString();
this.textRegionsToString = _textRegionsToString;
this.textRegionsToString.setIgnoreCarriageReturnInQuotes(true);
}
@Test
public void testQuote() {
Assert.assertEquals("\"import some.thing\"", this.textRegionsToString.quote("import some.thing", 30));
Assert.assertEquals("\"import some.thing\"", this.textRegionsToString.quote("import some.thing", 17));
Assert.assertEquals("\"import ...\"", this.textRegionsToString.quote("import some.thing", 10));
Assert.assertEquals("\"import some.t...\"", this.textRegionsToString.quote("import some.thing", 16));
Assert.assertEquals("\"\\nimport some.thing\\n\"", this.textRegionsToString.quote("\r\nimport some.thing\r\n", 30));
Assert.assertEquals("\"\\nimport some.thing\\n\"", this.textRegionsToString.quote("\r\nimport some.thing\r\n", 19));
Assert.assertEquals("\"\\nimport...\"", this.textRegionsToString.quote("\r\nimport some.thing\r\n", 10));
Assert.assertEquals("\"\\nimport some.th...\"", this.textRegionsToString.quote("\r\nimport some.thing\r\n", 18));
this.textRegionsToString.setIgnoreCarriageReturnInQuotes(false);
Assert.assertEquals("\"\\r\\nimport some.thing\\r\\n\"", this.textRegionsToString.quote("\r\nimport some.thing\r\n", 30));
}
}

4
org.eclipse.xtext/src/org/eclipse/xtext/formatting2/debug/TextRegionsToString.java
View file

@ -86,7 +86,9 @@ public class TextRegionsToString {
result.add("\\n");
break;
case '\r':
if (!ignoreCarriageReturnInQuotes) {
if (ignoreCarriageReturnInQuotes) {
max = Math.min(max+1, string.length());
} else {
result.add("\\r");
}
break;