paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 23:10:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: fix fold-lines in the gutter. Gutter would partially draw IFDEF/REGION lines if those where not foldable. Issue #31296

Browse Source
This commit is contained in:
Martin 2023-06-22 18:03:20 +02:00
parent b6f06a7e0c
commit bc8f26b1e8
4 changed files with 262 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/synedit/syneditfoldedview.pp
View File

@ -556,6 +556,7 @@ type
end;
function dbgs(AClassification: TFoldNodeClassification): String; overload;
function dbgs(AFoldLineCapability: TSynEditFoldLineCapability): String; overload;
implementation
@ -4607,6 +4608,11 @@ begin
WriteStr(Result{%H-}, AClassification);
end;
function dbgs(AFoldLineCapability: TSynEditFoldLineCapability): String;
begin
WriteStr(Result{%H-}, AFoldLineCapability);
end;
{$IFDEF SynDebug}
procedure TSynEditFoldedView.debug;
begin

34
components/synedit/synhighlighterpas.pp
View File

@ -4220,13 +4220,13 @@ var
begin
Assert(CurrentRanges <> nil, 'TSynCustomFoldHighlighter.FoldBlockEndLevel requires CurrentRanges');
Result := 0;
if (ALineIndex < 0) or (ALineIndex >= CurrentLines.Count - 1) then
exit;
inf.EndLevelIfDef := 0;
inf.MinLevelIfDef := 0;
inf.EndLevelRegion := 0;
inf.MinLevelRegion := 0;
if (ALineIndex < 0) or (ALineIndex >= CurrentLines.Count - 1) then
exit;
if AFilter.FoldGroup in [0, FOLDGROUP_REGION, FOLDGROUP_IFDEF] then
inf := TSynHighlighterPasRangeList(CurrentRanges).PasRangeInfo[ALineIndex];
@ -4250,7 +4250,9 @@ begin
if AFilter.FoldGroup in [0, FOLDGROUP_REGION] then begin
// All or REGION
if FFoldConfig[ord(cfbtRegion)].Enabled or
if ( FFoldConfig[ord(cfbtRegion)].Enabled and
(FFoldConfig[ord(cfbtRegion)].Modes * [fmFold, fmHide] <> [])
) or
(sfbIncludeDisabled in AFilter.Flags)
then
Result := Result + inf.EndLevelRegion;
@ -4258,7 +4260,9 @@ begin
if AFilter.FoldGroup in [0, FOLDGROUP_IFDEF] then begin
// All or IFDEF
if FFoldConfig[ord(cfbtIfDef)].Enabled or
if ( FFoldConfig[ord(cfbtIfDef)].Enabled and
(FFoldConfig[ord(cfbtIfDef)].Modes * [fmFold, fmHide] <> [])
) or
(sfbIncludeDisabled in AFilter.Flags)
then
Result := Result + inf.EndLevelIfDef;
@ -4273,13 +4277,13 @@ var
begin
Assert(CurrentRanges <> nil, 'TSynCustomFoldHighlighter.FoldBlockMinLevel requires CurrentRanges');
Result := 0;
if (ALineIndex < 0) or (ALineIndex >= CurrentLines.Count - 1) then
exit;
inf.EndLevelIfDef := 0;
inf.MinLevelIfDef := 0;
inf.EndLevelRegion := 0;
inf.MinLevelRegion := 0;
if (ALineIndex < 0) or (ALineIndex >= CurrentLines.Count - 1) then
exit;
if AFilter.FoldGroup in [0, FOLDGROUP_REGION, FOLDGROUP_IFDEF] then
inf := TSynHighlighterPasRangeList(CurrentRanges).PasRangeInfo[ALineIndex];
@ -4309,12 +4313,22 @@ begin
if AFilter.FoldGroup in [0, FOLDGROUP_REGION] then begin
// All or REGION
Result := Result + inf.MinLevelRegion;
if ( FFoldConfig[ord(cfbtRegion)].Enabled and
(FFoldConfig[ord(cfbtRegion)].Modes * [fmFold, fmHide] <> [])
) or
(sfbIncludeDisabled in AFilter.Flags)
then
Result := Result + inf.MinLevelRegion;
end;
if AFilter.FoldGroup in [0, FOLDGROUP_IFDEF] then begin
// All or IFDEF
Result := Result + inf.MinLevelIfDef;
if ( FFoldConfig[ord(cfbtIfDef)].Enabled and
(FFoldConfig[ord(cfbtIfDef)].Modes * [fmFold, fmHide] <> [])
) or
(sfbIncludeDisabled in AFilter.Flags)
then
Result := Result + inf.MinLevelIfDef;
end;
end;

236
components/synedit/test/testfoldedview.pas
View File

@ -50,6 +50,7 @@ type
function TestText10: TStringArray;
function TestText11: TStringArray;
function TestText12: TStringArray;
function TestText13: TStringArray;
function TestTextHide(ALen: Integer): TStringArray;
function TestTextHide2(ALen: Integer): TStringArray;
function TestTextHide3: TStringArray;
@ -85,6 +86,9 @@ type
LogXStart, LogXEnd, FoldLvlStart, FoldLvlEnd, NestLvlStart, NestLvlEnd: Integer;
FoldType: integer; FoldTypeCompatible: integer; FoldGroup: Integer;
FoldAction: TSynFoldActions);
procedure CheckFoldTypes(AName: String; AStartLine: Integer;
AnExpIncluded: Array of TSynEditFoldLineCapabilities;
AnExpExcluded: Array of TSynEditFoldLineCapabilities);
Procedure CheckNodeLines(AList: TLazSynEditNestedFoldsList; ALines: array of integer);
Procedure CheckNodeEndLines(AList: TLazSynEditNestedFoldsList; ALines: array of integer);
procedure InitList(const AName: String; AList: TLazSynEditNestedFoldsList;
@ -99,6 +103,7 @@ type
procedure TestFoldProvider;
procedure TestNestedFoldsList;
procedure TestNestedFoldsListCache;
procedure TestFoldTypeForGutter;
end;
implementation
@ -579,6 +584,24 @@ begin
Result[17] := '';
end;
function TTestFoldedView.TestText13: TStringArray;
begin
SetLength(Result, 12);
Result[0] := 'program Foo;';
Result[1] := '';
Result[2] := '{$IFDEF x}';
Result[3] := '';
Result[4] := '{$ENDIF}';
Result[5] := '';
Result[6] := 'procedure a;';
Result[7] := 'begin';
Result[8] := '';
Result[9] := 'end;';
Result[10]:= '';
Result[11]:= '';
end;
function TTestFoldedView.TestTextHide(ALen: Integer): TStringArray;
begin
SetLength(Result, 3+ALen);
@ -2047,10 +2070,10 @@ begin
end;
Procedure TTestFoldedView.CheckNode(nd: TSynFoldNodeInfo; ALine: TLineIdx; AColumn: integer;
LogXStart, LogXEnd, FoldLvlStart, FoldLvlEnd, NestLvlStart, NestLvlEnd: Integer;
FoldType: integer; FoldTypeCompatible: integer; FoldGroup: Integer;
FoldAction: TSynFoldActions);
procedure TTestFoldedView.CheckNode(nd: TSynFoldNodeInfo; ALine: TLineIdx;
AColumn: integer; LogXStart, LogXEnd, FoldLvlStart, FoldLvlEnd, NestLvlStart,
NestLvlEnd: Integer; FoldType: integer; FoldTypeCompatible: integer;
FoldGroup: Integer; FoldAction: TSynFoldActions);
begin
CheckPasFoldNodeInfo('', nd, ALine, AColumn, LogXStart, LogXEnd, FoldLvlStart,
FoldLvlEnd, NestLvlStart, NestLvlEnd,
@ -2058,7 +2081,33 @@ begin
FoldGroup, FoldAction);
end;
Procedure TTestFoldedView.CheckNodeLines(AList: TLazSynEditNestedFoldsList; ALines: array of integer);
procedure TTestFoldedView.CheckFoldTypes(AName: String; AStartLine: Integer;
AnExpIncluded: array of TSynEditFoldLineCapabilities;
AnExpExcluded: array of TSynEditFoldLineCapabilities);
var
f: TSynEditFoldLineCapabilities;
j: TSynEditFoldLineCapability;
i: Integer;
begin
for i := 0 to max(Length(AnExpIncluded), Length(AnExpExcluded)) - 1 do begin
f := FoldedView.FoldType[AStartLine + i];
if i < Length(AnExpIncluded) then begin
for j in AnExpIncluded[i] do
AssertTrue(format('%20s Idx=%d (Line=%d): Has %s included',
[AName, i, AStartLine+i, dbgs(j)]
), j in f);
end;
if i < Length(AnExpExcluded) then begin
for j in AnExpExcluded[i] do
AssertTrue(format('%20s Idx=%d (Line=%d): Does NOT have %s included',
[AName, i, AStartLine+i, dbgs(j)]
), not (j in f));
end;
end;
end;
procedure TTestFoldedView.CheckNodeLines(AList: TLazSynEditNestedFoldsList;
ALines: array of integer);
var
i: Integer;
begin
@ -2066,7 +2115,8 @@ begin
AssertEquals(BaseTestName+ ' Node line=' + IntToStr(i), ALines[i], AList.NodeLine[i]);
end;
Procedure TTestFoldedView.CheckNodeEndLines(AList: TLazSynEditNestedFoldsList; ALines: array of integer);
procedure TTestFoldedView.CheckNodeEndLines(AList: TLazSynEditNestedFoldsList;
ALines: array of integer);
var
i: Integer;
begin
@ -2678,6 +2728,180 @@ begin
PopBaseName;
end;
procedure TTestFoldedView.TestFoldTypeForGutter;
const AllCap = [low(TSynEditFoldLineCapability)..high(TSynEditFoldLineCapability)] - [cfNone];
begin
ReCreateEdit;
SetLines(TestText3);
EnableFolds([cfbtTopBeginEnd,cfbtBeginEnd,cfbtIfDef], [], []);
CheckFoldTypes('begin/ifdef',0,
[ [], // Program
[cfFoldStart], // IFDEF
[cfFoldBody],
[cfFoldEnd], // Endif
[cfFoldStart], // begin
[cfFoldBody], // region
[cfFoldBody],
[cfFoldBody], // endregion
[cfFoldBody],
[cfFoldBody],
[cfFoldEnd], // end
[]
],
[ AllCap,
AllCap - [cfFoldStart], // IFDEF
AllCap - [cfFoldBody],
AllCap - [cfFoldEnd, cfFoldBody], // Endif
AllCap - [cfFoldStart], // begin
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldEnd, cfFoldBody] // end
]
);
EnableFolds([cfbtTopBeginEnd,cfbtBeginEnd], [], []);
CheckFoldTypes('begin/ NO ifdef',0,
[ [], // Program
[], // IFDEF
[],
[], // Endif
[cfFoldStart], // begin
[cfFoldBody], // region
[cfFoldBody],
[cfFoldBody], // endregion
[cfFoldBody],
[cfFoldBody],
[cfFoldEnd], // end
[]
],
[ AllCap,
AllCap, // IFDEF
AllCap,
AllCap, // Endif
AllCap - [cfFoldStart], // begin
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldBody, cfFoldStart, cfFoldEnd],
AllCap - [cfFoldEnd, cfFoldBody] // end
]
);
SetLines(TestText13);
EnableFolds([], [], []);
CheckFoldTypes('TestText13 NONE',0,
[ [], // Program
[],
[], // IFDEF
[],
[],
[],
[]
],
[ AllCap,
AllCap,
AllCap,
AllCap,
AllCap,
AllCap,
AllCap,
AllCap
]
);
SetLines(TestText13);
EnableFolds([cfbtTopBeginEnd], [], []);
CheckFoldTypes('TestText13 NONE',0,
[ [], // Program
[],
[], // IFDEF
[],
[], // Endif
[],
[], // procedure
[cfFoldStart], // begin
[cfFoldBody],
[cfFoldBody,cfFoldEnd], // end
[]
],
[ AllCap, // Program
AllCap,
AllCap, // IFDEF
AllCap,
AllCap, // Endif
AllCap,
AllCap, // procedure
AllCap - [cfFoldStart], // begin
AllCap - [cfFoldBody],
AllCap - [cfFoldBody,cfFoldEnd], // end
AllCap
]
);
SetLines(TestText13);
EnableFolds([cfbtIfDef], [], []);
CheckFoldTypes('TestText13 NONE',0,
[ [],// Program
[],
[cfFoldStart], // IFDEF
[cfFoldBody],
[cfFoldBody,cfFoldEnd],
[],
[],
[],
[]
],
[ AllCap,
AllCap,
AllCap - [cfFoldStart],
AllCap - [cfFoldBody],
AllCap - [cfFoldBody,cfFoldEnd],
AllCap,
AllCap,
AllCap
]
);
SetLines(TestText13);
EnableFolds([cfbtTopBeginEnd, cfbtIfDef], [], []);
CheckFoldTypes('TestText13 NONE',0,
[ [], // Program
[],
[cfFoldStart], // IFDEF
[cfFoldBody],
[cfFoldBody,cfFoldEnd],
[],
[], // procedure
[cfFoldStart], // begin
[cfFoldBody],
[cfFoldBody,cfFoldEnd], // end
[]
],
[ AllCap, // Program
AllCap,
AllCap - [cfFoldStart],
AllCap - [cfFoldBody],
AllCap - [cfFoldBody,cfFoldEnd],
AllCap,
AllCap, // procedure
AllCap - [cfFoldStart], // begin
AllCap - [cfFoldBody],
AllCap - [cfFoldBody,cfFoldEnd], // end
AllCap
]
);
end;
initialization
RegisterTest(TTestFoldedView);

2
components/synedit/test/testhighlightpas.pas
View File

@ -113,6 +113,7 @@ procedure TTestBaseHighlighterPas.EnableFolds(AEnbledTypes: TPascalCodeFoldBlock
var
i: TPascalCodeFoldBlockType;
begin
PasHighLighter.BeginUpdate;
for i := low(TPascalCodeFoldBlockType) to high(TPascalCodeFoldBlockType) do begin
PasHighLighter.FoldConfig[ord(i)].Enabled := i in AEnbledTypes;
if (i in ANoFoldTypes) then
@ -125,6 +126,7 @@ begin
PasHighLighter.FoldConfig[ord(i)].Modes := PasHighLighter.FoldConfig[ord(i)].Modes +
PasHighLighter.FoldConfig[ord(i)].SupportedModes * [fmMarkup];
end;
PasHighLighter.EndUpdate;
end;
procedure TTestBaseHighlighterPas.DebugFoldInfo(ALineIdx: Integer;