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

SynEdit: Markup-Current-Word, improved dealing with open "begin" closed by next "procedure"

Browse Source 
git-svn-id: trunk@19081 -
This commit is contained in:
martin 2009-03-23 22:47:11 +00:00
parent 06e2f76e25
commit 1473f651bd
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/synedit/synhighlighterpas.pp
View File

@ -162,6 +162,7 @@ type
FNestedComments: boolean;
FStartCodeFoldBlockLevel: integer;
fRange: TRangeStates;
FAtLineStart: Boolean; // Line had only spaces or comments sofar
{$IFDEF SYN_LAZARUS}
fLineStr: string;
fLine: PChar;
@ -1683,6 +1684,7 @@ begin
{$ENDIF}
FNodeInfoLine := -1;
fLineNumber := LineNumber;
FAtLineStart := True;
if not FCatchNodeInfo then
Next;
end; { SetLine }
@ -2117,6 +2119,8 @@ begin
{$IFDEF SYN_LAZARUS}
end;
{$ENDIF}
if not(FTokenID in [tkSpace, tkComment]) then
FAtLineStart := False;
//DebugLn(['TSynPasSyn.Next Run=',Run,' fTokenPos=',fTokenPos,' fLineStr=',fLineStr,' Token=',GetToken]);
end;
@ -2375,13 +2379,23 @@ begin
end;
procedure TSynPasSyn.EndCodeFoldBlockLastLine;
var
i: Integer;
begin
i := FNodeInfoCount;
EndCodeFoldBlock;
if (CurrentCodeFoldBlockLevel < FStartCodeFoldBlockLevel) and
(FStartCodeFoldBlockLevel > 0)
then begin
TSynPasSynRange(CodeFoldRange).DecLastLineCodeFoldLevelFix;
dec(FStartCodeFoldBlockLevel);
if FAtLineStart then begin
// If we are not at linestate, new folds could have been opened => handle as normal close
if (CurrentCodeFoldBlockLevel < FStartCodeFoldBlockLevel) and
(FStartCodeFoldBlockLevel > 0)
then begin
TSynPasSynRange(CodeFoldRange).DecLastLineCodeFoldLevelFix;
dec(FStartCodeFoldBlockLevel);
end
end
else if FNodeInfoCount > i then begin
exclude(FNodeInfoList[FNodeInfoCount - 1].FoldAction, sfaMarkup); // not markup able
FNodeInfoList[FNodeInfoCount - 1].LogXEnd := 0;
end;
end;