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 branch 'maintenance'

Browse source 
# Conflicts:
#	xtext-website/download.html
This commit is contained in:
Dennis Huebner 2016-03-04 15:46:47 +01:00
commit c4cb85e533
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/internal/FormattableDocument.java
View file

@ -189,7 +189,8 @@ public abstract class FormattableDocument implements IFormattableDocument {
@Override
public void formatConditionally(EObject owner, ISubFormatter... formatters) {
IEObjectRegion region = getTextRegionAccess().regionForEObject(owner);
formatConditionally(region.getOffset(), region.getLength(), formatters);
if (region != null)
formatConditionally(region.getOffset(), region.getLength(), formatters);
}
@Override
@ -325,6 +326,8 @@ public abstract class FormattableDocument implements IFormattableDocument {
public <T extends EObject> T surround(T owner, Procedure1<? super IHiddenRegionFormatter> beforeAndAfter) {
if (owner != null && !owner.eIsProxy()) {
IEObjectRegion region = getTextRegionAccess().regionForEObject(owner);
if (region == null)
return owner;
IHiddenRegion previous = region.getPreviousHiddenRegion();
IHiddenRegion next = region.getNextHiddenRegion();
set(previous, next, beforeAndAfter);