paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-04 08:20:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: speed up large operations ([un]indent)

Browse Source 
git-svn-id: trunk@43768 -
This commit is contained in:
martin 2014-01-19 03:03:40 +00:00
parent 1fba2652a7
commit 32fbd71f5c
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
components/synedit/synedit.pp
View File

@ -5232,6 +5232,7 @@ procedure TCustomSynEdit.UndoItem(Item: TSynEditUndoItem);
var var
Line, OldText: PChar; Line, OldText: PChar;
y, Len, Len2, LenT: integer; y, Len, Len2, LenT: integer;
s: String;
function GetLeadWSLen : integer; function GetLeadWSLen : integer;
var var
@ -5258,8 +5259,11 @@ begin
LenT := TSynEditUndoIndent(Item).FTabCnt; LenT := TSynEditUndoIndent(Item).FTabCnt;
for y := TSynEditUndoIndent(Item).FPosY1 to TSynEditUndoIndent(Item).FPosY2 do begin for y := TSynEditUndoIndent(Item).FPosY1 to TSynEditUndoIndent(Item).FPosY2 do begin
Line := PChar(FTheLinesView[y - 1]); Line := PChar(FTheLinesView[y - 1]);
if Len2 > 0 then begin
Len := GetLeadWSLen; Len := GetLeadWSLen;
FTheLinesView.EditDelete(Len+1-Len2, y, Len2); FTheLinesView.EditDelete(Len+1-Len2, y, Len2);
end;
if LenT > 0 then
FTheLinesView.EditDelete(1, y, LenT); FTheLinesView.EditDelete(1, y, LenT);
end; end;
fRedoList.Unlock; fRedoList.Unlock;
@ -5274,11 +5278,14 @@ begin
fRedoList.Lock; fRedoList.Lock;
OldText := PChar(TSynEditUndoUnIndent(Item).FText); OldText := PChar(TSynEditUndoUnIndent(Item).FText);
for y := TSynEditUndoUnIndent(Item).FPosY1 to TSynEditUndoUnIndent(Item).FPosY2 do begin for y := TSynEditUndoUnIndent(Item).FPosY1 to TSynEditUndoUnIndent(Item).FPosY2 do begin
Len2 := GetEOL(OldText) - OldText;
if Len2 > 0 then begin
Line := PChar(FTheLinesView[y - 1]); Line := PChar(FTheLinesView[y - 1]);
Len := GetLeadWSLen; Len := GetLeadWSLen;
Len2 := GetEOL(OldText) - OldText; SetLength(s, Len2);
if Len2 > 0 then Move(OldText^, s[1], Len2);
FTheLinesView.EditInsert(Len+1, y, copy(OldText, 1, Len2)); FTheLinesView.EditInsert(Len+1, y, s);
end;
inc(OldText, Len2+1); inc(OldText, Len2+1);
end; end;
fRedoList.Unlock; fRedoList.Unlock;
@ -7943,9 +7950,9 @@ const
LineEnd = #10; LineEnd = #10;
var var
BB, BE: TPoint; BB, BE: TPoint;
FullStrToDelete: PChar; FullStrToDelete: String;
Line: PChar; Line: PChar;
Len, LogP1, PhyP1, LogP2, PhyP2, y, StrToDeleteLen, e : integer; Len, LogP1, PhyP1, LogP2, PhyP2, y, StrToDeleteLen, StrToDeletePos, e : integer;
i, i2, j: Integer; i, i2, j: Integer;
SomethingDeleted : Boolean; SomethingDeleted : Boolean;
HasTab: Boolean; HasTab: Boolean;
@ -7983,9 +7990,9 @@ begin
// build string to delete // build string to delete
StrToDeleteLen := (fBlockIndent+length(LineEnd)) * (e - BB.y + 1) + 1; StrToDeleteLen := (fBlockIndent+length(LineEnd)) * (e - BB.y + 1) + 1;
// chars per line * lines-1 + last line + null char // chars per line * lines-1 + last line + null char
FullStrToDelete := StrAlloc(StrToDeleteLen); SetLength(FullStrToDelete, StrToDeleteLen);
StrToDeletePos := 1;
try try
FullStrToDelete[0] := #0;
SomethingDeleted := False; SomethingDeleted := False;
fUndoList.Lock; fUndoList.Lock;
@ -8006,8 +8013,10 @@ begin
if PhyP1 - PhyP2 <> FBlockIndent then begin if PhyP1 - PhyP2 <> FBlockIndent then begin
// need tab to space // need tab to space
StrCat(FullStrToDelete, PChar(copy(Line, LogP2, LogP1 - LogP2))); move(Line[LogP2-1], FullStrToDelete[StrToDeletePos], LogP1 - LogP2);
StrCat(FullStrToDelete, PChar(LineEnd)); inc(StrToDeletePos, LogP1 - LogP2);
FullStrToDelete[StrToDeletePos] := LineEnd;
inc(StrToDeletePos, 1);
FTheLinesView.EditDelete(LogP2, y, LogP1 - LogP2); FTheLinesView.EditDelete(LogP2, y, LogP1 - LogP2);
SomethingDeleted := True; SomethingDeleted := True;
@ -8026,9 +8035,12 @@ begin
end; end;
// Remove spaces (or tab) // Remove spaces (or tab)
if LogP1 - LogP2 > 0 then if LogP1 - LogP2 > 0 then begin
StrCat(FullStrToDelete, PChar(copy(Line, LogP2, LogP1 - LogP2))); move(Line[LogP2-1], FullStrToDelete[StrToDeletePos], LogP1 - LogP2);
StrCat(FullStrToDelete, PChar(LineEnd)); inc(StrToDeletePos, LogP1 - LogP2);
end;
FullStrToDelete[StrToDeletePos] := LineEnd;
inc(StrToDeletePos, 1);
if LogP1 - LogP2 > 0 then if LogP1 - LogP2 > 0 then
FTheLinesView.EditDelete(LogP2, y, LogP1 - LogP2); FTheLinesView.EditDelete(LogP2, y, LogP1 - LogP2);
SomethingDeleted := SomethingDeleted or (LogP1 - LogP2 > 0); SomethingDeleted := SomethingDeleted or (LogP1 - LogP2 > 0);
@ -8056,12 +8068,13 @@ begin
fUndoList.Unlock; fUndoList.Unlock;
fRedoList.Unlock; fRedoList.Unlock;
if SomethingDeleted then if SomethingDeleted then begin
SetLength(FullStrToDelete, StrToDeletePos - 1);
fUndoList.AddChange(TSynEditUndoUnIndent.Create(BB.Y, e, FullStrToDelete)); fUndoList.AddChange(TSynEditUndoUnIndent.Create(BB.Y, e, FullStrToDelete));
end;
FTrimmedLinesView.ForceTrim; // Otherwise it may reset the block FTrimmedLinesView.ForceTrim; // Otherwise it may reset the block
finally finally
StrDispose(FullStrToDelete);
FCaret.LineBytePos := FBlockSelection.EndLineBytePos; FCaret.LineBytePos := FBlockSelection.EndLineBytePos;
FBlockSelection.DecPersistentLock; FBlockSelection.DecPersistentLock;
DecPaintLock; DecPaintLock;