GH-1510: Add null check to ElkLayoutEngine (#257)

tortmayr · web-flow · commit 474ae6b2356c · 2025-04-18T13:55:56.000+02:00
Add null check for parent position to `getOffset` computation. Fixes eclipse-glsp/glsp/issues/1510
diff --git a/plugins/org.eclipse.glsp.layout/src/org/eclipse/glsp/layout/ElkLayoutEngine.java b/plugins/org.eclipse.glsp.layout/src/org/eclipse/glsp/layout/ElkLayoutEngine.java
@@ -528,8 +528,10 @@ protected GPoint getOffset(final GModelElement gelem, final ElkGraphElement elkE
                   for (GModelElement sParent : sParents) {
                      if (sParent instanceof GBoundsAware) {
                         GPoint position = ((GBoundsAware) sParent).getPosition();
-                        x -= position.getX();
-                        y -= position.getY();
+                        if (position != null) {
+                           x -= position.getX();
+                           y -= position.getY();
+                        }
                      }
                   }
                }

Original file line number	Diff line number	Diff line change
`@@ -528,8 +528,10 @@ protected GPoint getOffset(final GModelElement gelem, final ElkGraphElement elkE`
`528`	`528`	`for (GModelElement sParent : sParents) {`
`529`	`529`	`if (sParent instanceof GBoundsAware) {`
`530`	`530`	`GPoint position = ((GBoundsAware) sParent).getPosition();`
`531`		`- x -= position.getX();`
`532`		`- y -= position.getY();`
	`531`	`+ if (position != null) {`
	`532`	`+ x -= position.getX();`
	`533`	`+ y -= position.getY();`
	`534`	`+ }`
`533`	`535`	`}`
`534`	`536`	`}`
`535`	`537`	`}`