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

[xtext][partialParsing] Fixed corner case with production rules that return null

Browse source 
Change-Id: I80527ba9776560e6356a865465f654fe269c6fbd
This commit is contained in:
Sebastian Zarnekow 2015-01-23 10:55:42 +01:00
parent 70873885e0
commit 1e90ab8f49
2 changed files with 101 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/PartialParsingHelper.java
View file

@ -157,7 +157,12 @@ public class PartialParsingHelper implements IPartialParsingHelper {
List featureValueList = (List) oldSemanticParentElement.eGet(feature);
int index = featureValueList.indexOf(oldSemanticElement);
unloadSemanticObject(oldSemanticElement);
featureValueList.set(index, newParseResult.getRootASTElement());
EObject newSemanticObject = newParseResult.getRootASTElement();
if (newSemanticObject != null) {
featureValueList.set(index, newParseResult.getRootASTElement());
} else {
featureValueList.remove(index);
}
} else {
unloadSemanticObject(oldSemanticElement);
oldSemanticParentElement.eSet(feature, newParseResult.getRootASTElement());

95
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/Bug410560Test.xtend Normal file
View file

@ -0,0 +1,95 @@
/*******************************************************************************
* Copyright (c) 2015 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.parser
import org.eclipse.xtext.junit4.AbstractXtextTests
import org.eclipse.xtext.parsetree.reconstr.SerializationErrorTestLanguageStandaloneSetup
import org.eclipse.xtext.parsetree.reconstr.serializationerror.Model
import org.eclipse.xtext.resource.XtextResource
import org.junit.Test
import org.eclipse.xtext.junit4.smoketest.processors.PartialParsingProcessor
/**
* @author Sebastian Zarnekow - Initial contribution and API
*/
class Bug410560Test extends AbstractXtextTests {
override boolean shouldTestSerializer(XtextResource resource) {
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=361355
return false;
}
override void setUp() throws Exception {
super.setUp();
with(SerializationErrorTestLanguageStandaloneSetup);
}
@Test def void testParsingWithoutIndent_01() {
val model = getModel('''
{}
''') as Model
assertNotNull(model)
assertNull(model.test)
}
@Test def void testParsingWithoutIndent_02() {
val model = getModel('''
({})
''') as Model
assertNotNull(model)
assertNull(model.test)
}
@Test def void testParsingWithIndent_01() {
val model = getModel('''
{tworequired a b}
''') as Model
assertNotNull(model)
assertNotNull(model.test)
}
@Test def void testParsingWithIndent_02() {
val model = getModel('''
({tworequired a b})
''') as Model
assertNotNull(model)
assertNotNull(model.test)
}
@Test def void testPartialParsingChangeIndent() {
val modelAsString = '({tworequired a b})'
val model = getModel(modelAsString) as Model
val res = model.eResource as XtextResource
res.update(modelAsString.indexOf('a'), 1, "b")
assertSame(model, res.contents.head)
}
@Test def void testPartialParsingRemoveIndent() {
val modelAsString = '({ tworequired a b })'
val model = getModel(modelAsString) as Model
val res = model.eResource as XtextResource
res.update(modelAsString.indexOf('t'), 'tworequired a b'.length, " ")
assertSame(model, res.contents.head)
}
@Test def void testPartialParsingRemoveNestedIndent() {
val modelAsString = '({{ tworequired a b }})'
val model = getModel(modelAsString) as Model
val res = model.eResource as XtextResource
res.update(modelAsString.indexOf('t'), 'tworequired a b'.length, " ")
assertSame(model, res.contents.head)
}
@Test def void testPartialParsingRemoveNestedIndent_01() {
val modelAsString = '({{ tworequired a b }})'
get(PartialParsingProcessor).processFile(modelAsString, modelAsString, modelAsString.indexOf('t'), 'tworequired a b'.length, " ")
}
}