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 #86 from kthoms/kth/bug478377

Browse source 
[478377] Add null guard
This commit is contained in:
Moritz Eysholdt 2016-08-17 08:54:38 +02:00 committed by GitHub
commit c73065d2dd
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
org.eclipse.xtext.tests/src/org/eclipse/xtext/nodemodel/util/NodeModelUtilsTest.java
View file

@ -54,6 +54,9 @@ public class NodeModelUtilsTest extends AbstractXtextTests {
nodes = NodeModelUtils.findNodesForFeature(declaration, XtextPackage.eINSTANCE.getGeneratedMetamodel_Name());
assertEquals(1, nodes.size());
assertEquals("foo", nodes.get(0).getText().trim());
nodes = NodeModelUtils.findNodesForFeature(declaration, null);
assertEquals(0, nodes.size());
}
@Test public void testFindNodesForFeature_MultipleFeature() throws Exception {

2
org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java
View file

@ -164,7 +164,7 @@ public class NodeModelUtils extends InternalNodeModelUtils {
/* @NonNull */
public static List<INode> findNodesForFeature(EObject semanticObject, EStructuralFeature structuralFeature) {
ICompositeNode node = findActualNodeFor(semanticObject);
if (node != null) {
if (node != null && structuralFeature != null) {
return findNodesForFeature(semanticObject, node, structuralFeature);
}
return Collections.emptyList();