fix restoring expanded state for custom folding regions (WEB-6246 or maybe not)

This commit is contained in:
Dmitry Jemerov
2013-01-31 18:07:13 +01:00
parent 8b6f6905e9
commit d9050f29b4
@@ -134,16 +134,17 @@ class DocumentFoldingInfo implements JDOMExternalizable, CodeFoldingState {
continue;
}
FoldRegion region = FoldingUtil.findFoldRegion(editor, marker.getStartOffset(), marker.getEndOffset());
FoldingInfo info = marker.getUserData(FOLDING_INFO_KEY);
if (region == null) {
FoldingInfo info = marker.getUserData(FOLDING_INFO_KEY);
region = editor.getFoldingModel().addFoldRegion(marker.getStartOffset(), marker.getEndOffset(), info.placeHolder);
if (info != null) {
region = editor.getFoldingModel().addFoldRegion(marker.getStartOffset(), marker.getEndOffset(), info.placeHolder);
}
if (region == null) {
return;
}
}
FoldingInfo fi = region.getUserData(FOLDING_INFO_KEY);
boolean state = fi != null && fi.expanded;
boolean state = info != null && info.expanded;
region.setExpanded(state);
}
}