remove fallback logic (following fix for IDEA-154578)

this is for master only - assuming that it's ok to loose folding state information for recently opened files when migrating to a newer IDE version
This commit is contained in:
Dmitry Batrak
2016-04-13 10:37:09 +03:00
parent 017a96da26
commit a69953836c
@@ -68,7 +68,6 @@ class DocumentFoldingInfo implements JDOMExternalizable, CodeFoldingState {
@NonNls private static final String EXPANDED_ATT = "expanded";
@NonNls private static final String MARKER_TAG = "marker";
@NonNls private static final String DATE_ATT = "date";
@NonNls private static final String PLACEHOLDER_OLD_ATT = "placeholder";
@NonNls private static final String PLACEHOLDER_ATT = "ph";
DocumentFoldingInfo(@NotNull Project project, @NotNull Document document) {
@@ -334,7 +333,6 @@ class DocumentFoldingInfo implements JDOMExternalizable, CodeFoldingState {
RangeMarker marker = document.createRangeMarker(start, end);
myRangeMarkers.add(marker);
String placeHolderText = StringUtil.unescapeIllegalXmlChars(e.getAttributeValue(PLACEHOLDER_ATT));
if (placeHolderText == null) e.getAttributeValue(PLACEHOLDER_OLD_ATT);
if (placeHolderText == null) placeHolderText = DEFAULT_PLACEHOLDER;
FoldingInfo fi = new FoldingInfo(placeHolderText, expanded);
marker.putUserData(FOLDING_INFO_KEY, fi);