paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-06 09:59:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Ifdef Markup: only scan if markup is active

Browse Source 
git-svn-id: trunk@41216 -
This commit is contained in:
martin 2013-05-15 20:59:05 +00:00
parent aff6e05312
commit 1084ad7aed
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/synedit/syneditmarkupifdef.pp
View File

@ -2587,7 +2587,7 @@ var
Entry, EntryFound, Peer: TSynMarkupHighIfDefEntry; Entry, EntryFound, Peer: TSynMarkupHighIfDefEntry;
m: TSynMarkupHighAllMatch; m: TSynMarkupHighAllMatch;
begin begin
if (FPaintLock > 0) or (not SynEdit.IsVisible) then begin if (FPaintLock > 0) or (not SynEdit.IsVisible) or (not MarkupInfo.IsEnabled) then begin
FNeedValidate := True; FNeedValidate := True;
exit; exit;
end; end;
@ -2755,6 +2755,7 @@ end;
procedure TSynEditMarkupIfDef.DoMarkupChanged(AMarkup: TSynSelectedColor); procedure TSynEditMarkupIfDef.DoMarkupChanged(AMarkup: TSynSelectedColor);
begin begin
ValidateMatches; ValidateMatches;
SynEdit.Invalidate;
end; end;
procedure TSynEditMarkupIfDef.DoTextChanged(StartLine, EndLine, ACountDiff: Integer); procedure TSynEditMarkupIfDef.DoTextChanged(StartLine, EndLine, ACountDiff: Integer);

6
ide/sourceeditor.pp
View File

@ -4252,6 +4252,10 @@ Begin
EditorOpts.GetSynEditSettings(FEditor,SimilarEditor); EditorOpts.GetSynEditSettings(FEditor,SimilarEditor);
SourceNotebook.UpdateActiveEditColors(FEditor); SourceNotebook.UpdateActiveEditColors(FEditor);
{$IFDEF WithSynMarkupIfDef}
if Visible then
UpdateIfDefNodeStates;
{$ENDIF}
end; end;
procedure TSourceEditor.ccAddMessage(Texts: String); procedure TSourceEditor.ccAddMessage(Texts: String);
@ -5450,6 +5454,8 @@ var
X: integer; X: integer;
SynState: TSynMarkupIfdefNodeStateEx; SynState: TSynMarkupIfdefNodeStateEx;
begin begin
if not EditorComponent.IsIfdefMarkupActive then
exit;
//debugln(['TSourceEditor.UpdateIfDefNodeStates CHECK ',Filename]); //debugln(['TSourceEditor.UpdateIfDefNodeStates CHECK ',Filename]);
UpdateCodeBuffer; UpdateCodeBuffer;
Scanner:=SharedValues.GetMainLinkScanner(true); Scanner:=SharedValues.GetMainLinkScanner(true);

6
ide/sourcesyneditor.pas
View File

@ -258,6 +258,7 @@ type
property HighlightUserWords[AIndex: Integer]: TSourceSynEditMarkupHighlightAllMulti read GetHighlightUserWords; property HighlightUserWords[AIndex: Integer]: TSourceSynEditMarkupHighlightAllMulti read GetHighlightUserWords;
property MarkupMgr; property MarkupMgr;
{$IFDEF WithSynMarkupIfDef} {$IFDEF WithSynMarkupIfDef}
function IsIfdefMarkupActive: Boolean;
procedure InvalidateAllIfdefNodes; procedure InvalidateAllIfdefNodes;
procedure SetIfdefNodeState(ALinePos, AstartPos: Integer; AState: TSynMarkupIfdefNodeState); procedure SetIfdefNodeState(ALinePos, AstartPos: Integer; AState: TSynMarkupIfdefNodeState);
property OnIfdefNodeStateRequest: TSynMarkupIfdefStateRequest read FOnIfdefNodeStateRequest write FOnIfdefNodeStateRequest; property OnIfdefNodeStateRequest: TSynMarkupIfdefStateRequest read FOnIfdefNodeStateRequest write FOnIfdefNodeStateRequest;
@ -1498,6 +1499,11 @@ begin
end; end;
{$IFDEF WithSynMarkupIfDef} {$IFDEF WithSynMarkupIfDef}
function TIDESynEditor.IsIfdefMarkupActive: Boolean;
begin
Result := FMarkupIfDef.MarkupInfo.IsEnabled;
end;
function TIDESynEditor.DoIfDefNodeStateRequest(Sender: TObject; LinePos, function TIDESynEditor.DoIfDefNodeStateRequest(Sender: TObject; LinePos,
XStartPos: Integer; CurrentState: TSynMarkupIfdefNodeStateEx): TSynMarkupIfdefNodeState; XStartPos: Integer; CurrentState: TSynMarkupIfdefNodeStateEx): TSynMarkupIfdefNodeState;
begin begin