MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed handling of multiple folding regions per element

Browse Source
This commit is contained in:
Rustam.Vishnyakov
2012-02-21 14:53:26 +04:00
parent 03603edfba
commit c1726429da
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
+25 -12
View File
@@ -177,22 +177,35 @@ class UpdateFoldRegionsOperation implements Runnable {
}
if (element != null && myElementsToFoldMap.containsKey(element)) {
final Collection<FoldingDescriptor> descriptors = myElementsToFoldMap.get(element);
boolean matchingDescriptorFound = false;
for (FoldingDescriptor descriptor : descriptors) {
TextRange range = descriptor.getRange();
if (!region.isValid() ||
region.getGroup() != null ||
descriptor.getGroup() != null ||
region.getStartOffset() != range.getStartOffset() ||
region.getEndOffset() != range.getEndOffset() ||
!region.getPlaceholderText().equals(descriptor.getPlaceholderText()) ||
range.getLength() < 2
) {
rangeToExpandStatusMap.put(range, region.isExpanded());
toRemove.add(region);
if (region.getStartOffset() == range.getStartOffset()
&& region.getEndOffset() == range.getEndOffset()) {
matchingDescriptorFound = true;
if (!region.isValid() ||
region.getGroup() != null ||
descriptor.getGroup() != null ||
!region.getPlaceholderText().equals(descriptor.getPlaceholderText()) ||
range.getLength() < 2
) {
rangeToExpandStatusMap.put(range, region.isExpanded());
toRemove.add(region);
}
else {
myElementsToFoldMap.removeValue(element, descriptor);
}
break;
}
else {
myElementsToFoldMap.remove(element);
}
if (!matchingDescriptorFound) {
for (FoldingDescriptor descriptor : descriptors) {
rangeToExpandStatusMap.put(descriptor.getRange(), region.isExpanded());
}
toRemove.add(region);
}
if (myElementsToFoldMap.get(element).isEmpty()) {
myElementsToFoldMap.remove(element);
}
}
else if (region.isValid() && info.isLightRegion(region)) {