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

fixed FormatterTest.testLinewrapDatatypeRuleRef1 (see bug 347782)

Browse source
This commit is contained in:
Moritz Eysholdt 2012-03-06 14:56:06 +01:00
parent 915e9dead8
commit 644bb665d2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/tokens/CrossReferenceSerializer.java
View file

@ -108,6 +108,8 @@ public class CrossReferenceSerializer implements ICrossReferenceSerializer {
String text = linkingHelper.getCrossRefNodeAsString(node, true);
QualifiedName qn = qualifiedNameConverter.toQualifiedName(text);
URI targetURI = EcoreUtil.getURI(target);
if (target.eResource() != null && target.eResource().getResourceSet() != null)
targetURI = target.eResource().getResourceSet().getURIConverter().normalize(targetURI);
for (IEObjectDescription desc : scope.getElements(qn))
if (desc.getEObjectURI().equals(targetURI))
return tokenUtil.serializeNode(node);

4
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/FormatterTest.java
View file

@ -246,12 +246,12 @@ public class FormatterTest extends AbstractXtextTests {
assertFormattedNM(expected, model, 0, model.length());
}
@Ignore@Test public void testLinewrapDatatypeRuleRef1() throws Exception {
@Test public void testLinewrapDatatypeRuleRef1() throws Exception {
final String model = "test linewrap fqn ab .cd .ef; fqnref ab. cd. ef;";
final String expected = "test linewrap\nfqn\nab.cd.ef;\nfqnref\nab.cd.ef;";
// assertFormattedPTC(expected, model);
assertFormattedNM(expected, model, 0, model.length());
// assertEqualTokenStreams(model);
assertEqualTokenStreams(model);
}
@Test public void testLinewrapDatatypeRuleRef2() throws Exception {