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

inplace editing: undo should treat multiple start/finish labels inside one group correctly (IDEA-84143)

Browse Source
This commit is contained in:
anna
2012-04-06 15:01:11 +02:00
parent 289f64b764
commit 1dd1335a4e
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java
+16 -7
View File
@@ -173,22 +173,31 @@ class UndoableGroup {
}
boolean isInsideStartFinishGroup(boolean isUndo, boolean isInsideStartFinishGroup) {
final FinishMarkAction finishMark = getFinishMark();
final StartMarkAction startMark = getStartMark();
if (startMark == null || finishMark == null) {
final List<FinishMarkAction> finishMarks = new ArrayList<FinishMarkAction>();
final List<StartMarkAction> startMarks = new ArrayList<StartMarkAction>();
for (UndoableAction action : myActions) {
if (action instanceof StartMarkAction) {
startMarks.add((StartMarkAction)action);
} else if (action instanceof FinishMarkAction) {
finishMarks.add((FinishMarkAction)action);
}
}
final int startNmb = startMarks.size();
final int finishNmb = finishMarks.size();
if (startNmb != finishNmb) {
if (isUndo) {
if (finishMark != null) {
if (finishNmb > startNmb) {
return true;
}
else if (startMark != null) {
else {
return false;
}
}
else {
if (startMark != null) {
if (startNmb > finishNmb) {
return true;
}
else if (finishMark != null) {
else {
return false;
}
}