paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-21 22:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 61697 #993861b8d4 from trunk:

Browse Source 
IDE: fix SynSourceEditor.SetHighlighter, prevent processing events while old HL is still in use.
........

git-svn-id: branches/fixes_2_0@61701 -
This commit is contained in:
maxim 2019-08-15 22:56:49 +00:00
parent c5febdebb9
commit 88bb6cc5f1
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ide/sourcesyneditor.pas
View File

@ -1708,29 +1708,34 @@ begin
exit
end;
FMarkupIfDef.Highlighter := nil;
inherited SetHighlighter(Value);
//TSynEditMarkupFoldColors(MarkupByClass[TSynEditMarkupFoldColors]).Highlighter := Highlighter; // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
if Highlighter is TSynPasSyn then
FMarkupIfDef.Highlighter := TSynPasSyn(Highlighter)
else
IncPaintLock;
try
FMarkupIfDef.Highlighter := nil;
if Highlighter is TSynCustomFoldHighlighter then
FTopInfoNestList.Highlighter := TSynCustomFoldHighlighter(Highlighter)
else
FTopInfoNestList.Highlighter := nil;
inherited SetHighlighter(Value);
if FUserWordsList = nil then
exit;
if Highlighter <> nil then
for i := 0 to FUserWordsList.Count - 1 do
HighlightUserWords[i].WordBreakChars := Highlighter.WordBreakChars + TSynWhiteChars
else
for i := 0 to FUserWordsList.Count - 1 do
HighlightUserWords[i].ResetWordBreaks;
//TSynEditMarkupFoldColors(MarkupByClass[TSynEditMarkupFoldColors]).Highlighter := Highlighter; // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
if Highlighter is TSynPasSyn then
FMarkupIfDef.Highlighter := TSynPasSyn(Highlighter)
else
FMarkupIfDef.Highlighter := nil;
if Highlighter is TSynCustomFoldHighlighter then
FTopInfoNestList.Highlighter := TSynCustomFoldHighlighter(Highlighter)
else
FTopInfoNestList.Highlighter := nil;
if FUserWordsList = nil then
exit;
if Highlighter <> nil then
for i := 0 to FUserWordsList.Count - 1 do
HighlightUserWords[i].WordBreakChars := Highlighter.WordBreakChars + TSynWhiteChars
else
for i := 0 to FUserWordsList.Count - 1 do
HighlightUserWords[i].ResetWordBreaks;
finally
DecPaintLock;
end;
end;
constructor TIDESynEditor.Create(AOwner: TComponent);