paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-07 10:01:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: create individual DefaultBeautifiers. Allows SourceEditor to proper use the callbacks. Also solves issue #0018862

Browse Source 
git-svn-id: trunk@30008 -
This commit is contained in:
martin 2011-03-24 21:25:20 +00:00
parent 047830f98d
commit 4aaa8ceb25
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/synedit/synedit.pp
View File

@ -369,7 +369,7 @@ type
FLastMousePoint: TPoint; // Pixel
FChangedLinesStart: integer; // 1 based, 0 means invalid
FChangedLinesEnd: integer; // 1 based, 0 means invalid, -1 means rest of screen
FBeautifier: TSynCustomBeautifier;
FBeautifier, FDefaultBeautifier: TSynCustomBeautifier;
FBeautifyStartLineIdx, FBeautifyEndLineIdx: Integer;
FFoldedLinesView: TSynEditFoldedView;
@ -1213,9 +1213,6 @@ type
function PerformUndo(Caller: TObject): Boolean; override;
end;
var
SynDefaultBeautifier: TSynCustomBeautifier;
{ TSynEditUndoCaret }
function TSynEditUndoCaret.IsEqualContent(AnItem: TSynEditUndoItem): Boolean;
@ -1609,7 +1606,8 @@ begin
FStatusChangedList := TSynStatusChangedHandlerList.Create;
FBeautifier := SynDefaultBeautifier;
FDefaultBeautifier := TSynBeautifier.Create(self);
FBeautifier := FDefaultBeautifier;
FLines := TSynEditStringList.Create;
TSynEditStringList(FLines).AttachSynEdit(Self);
@ -2021,6 +2019,8 @@ begin
FreeAndNil(fInternalCaret);
FreeAndNil(FScreenCaret);
FreeAndNil(FStatusChangedList);
FBeautifier := nil;
FreeAndNil(FDefaultBeautifier);
inherited Destroy;
end;
@ -2181,7 +2181,7 @@ procedure TCustomSynEdit.SetBeautifier(NewBeautifier: TSynCustomBeautifier);
begin
if fBeautifier = NewBeautifier then exit;
if NewBeautifier = nil then
fBeautifier := SynDefaultBeautifier
fBeautifier := FDefaultBeautifier
else
fBeautifier := NewBeautifier;
end;
@ -9020,7 +9020,6 @@ end;
initialization
InitSynDefaultFont;
SynDefaultBeautifier := TSynBeautifier.Create(Application);
Register;
end.