Added try finally to some UndoBlock (editor)

git-svn-id: trunk@34977 -

components/synedit/syncompletion.pas

@@ -1593,6 +1593,7 @@ begin
     with TCustomSynEdit(F.CurrentEditor) do begin
       BeginUndoBlock;
       BeginUpdate;
+      try
         LogCaret := LogicalCaretXY;
         NewBlockBegin:=LogCaret;
         CurLine:=Lines[NewBlockBegin.Y - 1];
@@ -1631,9 +1632,11 @@ begin
         else
         if (ItemList.Count = 0) then
           Cancel(Sender);
+      finally
         EndUpdate;
         EndUndoBlock;
       end;
+    end;
 end;
 
 procedure TSynCompletion.UTF8KeyPress(Sender: TObject; var Key: TUTF8Char);

components/synedit/synedit.pp

@@ -6192,9 +6192,12 @@ end;
 procedure TCustomSynEdit.ClearAll;
 begin
   InternalBeginUndoBlock;
+  try
     SelectAll;
     SelText:='';
+  finally
     InternalEndUndoBlock;
+  end;
 end;
 
 procedure TCustomSynEdit.ClearSelection;

ide/codecontextform.pas

@@ -979,13 +979,16 @@ procedure TCodeContextFrm.CompleteParameters(DeclCode: string);
     end;
     // insert
     ASynEdit.BeginUndoBlock;
+    try
       XY:=Point(X,Y);
       ASynEdit.BlockBegin:=XY;
       ASynEdit.BlockEnd:=XY;
       ASynEdit.LogicalCaretXY:=XY;
       ASynEdit.SelText:=NewCode;
+    finally
       ASynEdit.EndUndoBlock;
     end;
+  end;
 
 var
   SrcEdit: TSourceEditorInterface;

ide/frames/compiler_buildmacro_options.pas

@@ -325,10 +325,13 @@ begin
       TxtXY:=CondSynEdit.LogicalCaretXY;
       CondSynEdit.GetWordBoundsAtRowCol(TxtXY,TxtStartX,TxtEndX);
       CondSynEdit.BeginUndoBlock();
+      try
         CondSynEdit.BlockBegin:=Point(TxtStartX,TxtXY.Y);
         CondSynEdit.BlockEnd:=Point(TxtEndX,TxtXY.Y);
         CondSynEdit.SelText:=s;
+      finally
         CondSynEdit.EndUndoBlock();
+      end;
       FCompletionHistory.Insert(0,s);
       if FCompletionHistory.Count>100 then
         FCompletionHistory.Delete(FCompletionHistory.Count-1);

ide/sourceeditor.pp

@@ -3404,6 +3404,7 @@ var
 begin
   if ReadOnly then exit;
   FEditor.BeginUndoBlock;
+  try
     if not EditorComponent.SelAvail then begin
       P.Y := FEditor.CaretY;
       P.X := 1;
@@ -3418,7 +3419,9 @@ begin
       IsPascal := EditorOpts.HighlighterList[i].DefaultCommentType <> comtCPP;
     // will show modal dialog - must not be in Editor.BeginUpdate block, or painting will not work
     FEditor.SelText:=AddConditional(EditorComponent.SelText,IsPascal);
+  finally
     FEditor.EndUndoBlock;
+  end;
 end;
 
 procedure TSourceEditor.SortSelection;
@@ -3443,10 +3446,13 @@ begin
   FEditor.BeginUpdate;
   FEditor.BeginUndoBlock;
   // ToDo: replace step by step to keep bookmarks and breakpoints
+  try
     OldSelection:=EditorComponent.SelText;
     FEditor.SelText:=BreakLinesInText(OldSelection,FEditor.RightEdge);
+  finally
     FEditor.EndUndoBlock;
     FEditor.EndUpdate;
+  end;
 end;
 
 procedure TSourceEditor.InvertAssignment;
@@ -3455,10 +3461,13 @@ begin
   if not EditorComponent.SelAvail then exit;
   FEditor.BeginUpdate;
   FEditor.BeginUndoBlock;
+  try
     // ToDo: replace step by step to keep bookmarks and breakpoints
     FEditor.SelText := InvertAssignTool.InvertAssignment(FEditor.SelText);
+  finally
     FEditor.EndUndoBlock;
     FEditor.EndUpdate;
+  end;
 end;
 
 procedure TSourceEditor.SelectToBrace;
@@ -3882,11 +3891,14 @@ begin
       if not (Line[x2] in [' ',#9]) then
         s:=s+' ';
       FEditor.BeginUndoBlock;
+      try
         FEditor.InsertTextAtCaret(s);
         FEditor.LogicalCaretXY:=aTextPos;
+      finally
         FEditor.EndUndoBlock;
       end;
     end;
+  end;
 end;
 
 function TSourceEditor.AutoBlockCompleteChar(Char: TUTF8Char): boolean;

ideintf/srceditorintf.pas

@@ -534,11 +534,14 @@ procedure TSourceEditorInterface.ReplaceText(const StartPos, EndPos: TPoint;
 begin
   BeginUpdate;
   BeginUndoBlock;
+  try
     SelectText(StartPos,EndPos);
     CursorTextXY:=StartPos;
     Selection:=NewText;
+  finally
     EndUndoBlock;
     EndUpdate;
+  end;
 end;
 
 { TIDECodeMacro }