paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 14:39:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: DisplayView, add token origin/kind indicator

Browse Source
This commit is contained in:
Martin 2025-01-28 00:44:10 +01:00
parent 986cea52b7
commit 137485b0ab
7 changed files with 89 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/synedit/lazsynedittext.pas
View File

@ -196,10 +196,20 @@ type
- Can be Edited
*)
TLazSynDisplayTokenOrigin = (
dtoVirtualText, // The token is part of the (virtual) line text
dtoBeforeText, // Before start of text
dtoAfterText, // After end of Text
dtoBeforeWrapped, // Before a wrapped subline (any line but the very first line)
dtoAfterWrapped // After a wrapped subline (any line but the very last line)
//dtoInjected // In the middle of existing text
);
TLazSynDisplayTokenInfo = record
TokenStart: PChar;
TokenLength: integer;
TokenAttr: TSynHighlighterAttributes;
TokenOrigin: TLazSynDisplayTokenOrigin;
end;
TLineRange = record

97
components/synedit/lazsyntextarea.pp
View File

@ -84,7 +84,7 @@ type
FNextMarkupPhysPos, FNextMarkupLogPos: Integer;
FCurMarkupNextStart: TLazSynDisplayTokenBound;
FCurMarkupNextRtlInfo: TLazSynDisplayRtlInfo;
FCurMarkupState: (cmPreInit, cmLine, cmPastEOL, cmPastWrapEnd);
FTokenOrigin: TLazSynDisplayTokenOrigin;
FMarkupTokenAttr: TSynSelectedColorMergeResult;
procedure InitCurMarkup;
public
@ -277,8 +277,6 @@ procedure TLazSynPaintTokenBreaker.InitCurMarkup;
var
TmpTokenInfo: TLazSynDisplayTokenInfoEx;
begin
FCurMarkupState := cmLine;
if GetNextHighlighterTokenFromView(TmpTokenInfo, -1, 1) then begin
FCurMarkupNextStart := TmpTokenInfo.NextPos;
FCurMarkupNextRtlInfo := TmpTokenInfo.NextRtlInfo;
@ -361,11 +359,11 @@ begin
FVirtualFirstCol := FCurLinePhysStart + FFirstCol;
FVirtualLastCol := FCurLinePhysStart + FLastCol;
FNextMarkupPhysPos := -1;
FNextMarkupPhysPos := low(FNextMarkupPhysPos); // Marker for first call to GetNextHighlighterTokenEx
FNextMarkupLogPos := -1;
FCurMarkupState := cmPreInit;
FCurTxtLineIdx := ARealLine;
FIsLastViewedSubLine := FCurLineByteLen >= FCharWidthsLen;
FTokenOrigin := dtoVirtualText;
end;
function TLazSynPaintTokenBreaker.GetNextHighlighterTokenEx(out
@ -373,52 +371,47 @@ function TLazSynPaintTokenBreaker.GetNextHighlighterTokenEx(out
const
Space = ' ';
begin
if FCurMarkupState = cmPreInit then
if FNextMarkupPhysPos = low(FNextMarkupPhysPos) then begin
InitCurMarkup;
if (FCurLineByteLen < FCharWidthsLen) and (FCurViewScannerPos.Logical > FCurLineByteLen)
then begin
if FCurMarkupState <> cmPastWrapEnd then begin
assert(FCurViewScannerPos.Logical = FCurLineByteLen + 1, 'TLazSynPaintTokenBreaker.GetNextHighlighterTokenEx: FCurViewScannerPos.Logical = FCurLineByteLen + 1');
FCurMarkupState := cmPastWrapEnd;
FWrapEndBound := FCurViewScannerPos;
end;
FNextMarkupPhysPos := -1;
end;
if (FCurMarkupState = cmPastWrapEnd) then begin
FTokenOrigin := FCurViewToken.TokenOrigin;
if FTokenOrigin in [dtoAfterWrapped] then begin
FNextMarkupPhysPos := MaxInt;
FNextMarkupLogPos := MaxInt;
end
else
if (FNextMarkupPhysPos < 0) or
(FCurMarkupNextRtlInfo.IsRtl and (FNextMarkupPhysPos >= FCurMarkupNextStart.Physical)) or
((not FCurMarkupNextRtlInfo.IsRtl) and (FNextMarkupPhysPos <= FCurMarkupNextStart.Physical)) or
(FNextMarkupLogPos < 0) or (FNextMarkupLogPos <= FCurMarkupNextStart.Logical)
then begin
FMarkupManager.GetNextMarkupColAfterRowCol(FCurTxtLineIdx+1,
FCurMarkupNextStart, FCurMarkupNextRtlInfo, FNextMarkupPhysPos, FNextMarkupLogPos);
begin
if (FNextMarkupPhysPos < 0) or
(FCurMarkupNextRtlInfo.IsRtl and (FNextMarkupPhysPos >= FCurMarkupNextStart.Physical)) or
((not FCurMarkupNextRtlInfo.IsRtl) and (FNextMarkupPhysPos <= FCurMarkupNextStart.Physical)) or
(FNextMarkupLogPos < 0) or (FNextMarkupLogPos <= FCurMarkupNextStart.Logical)
then begin
FMarkupManager.GetNextMarkupColAfterRowCol(FCurTxtLineIdx+1,
FCurMarkupNextStart, FCurMarkupNextRtlInfo, FNextMarkupPhysPos, FNextMarkupLogPos);
if FNextMarkupPhysPos < 1 then
if FCurMarkupNextRtlInfo.IsRtl
then FNextMarkupPhysPos := 1
else FNextMarkupPhysPos := MaxInt;
if FNextMarkupLogPos < 1 then
FNextMarkupLogPos := MaxInt;
if FNextMarkupPhysPos < 1 then
if FCurMarkupNextRtlInfo.IsRtl
then FNextMarkupPhysPos := 1
else FNextMarkupPhysPos := MaxInt;
if FNextMarkupLogPos < 1 then
FNextMarkupLogPos := MaxInt;
end;
if (FTokenOrigin <> dtoAfterText) and (FCurLineByteLen < FCharWidthsLen) and
(FNextMarkupLogPos > FCurLineByteLen + 1)
then
FNextMarkupLogPos := FCurLineByteLen + 1; // stop at WrapEnd / EOL // tokens should have a bound there anyway
end;
if (FCurMarkupState <> cmPastWrapEnd) and (FCurLineByteLen < FCharWidthsLen) and
(FNextMarkupLogPos > FCurLineByteLen + 1)
then
FNextMarkupLogPos := FCurLineByteLen + 1; // stop at WrapEnd / EOL // tokens should have a bound there anyway
ATokenInfo.Attr := nil;
if FCurMarkupState in [cmPastEOL, cmPastWrapEnd]
then Result := False
else Result := GetNextHighlighterTokenFromView(ATokenInfo, FNextMarkupPhysPos, FNextMarkupLogPos);
Result := GetNextHighlighterTokenFromView(ATokenInfo, FNextMarkupPhysPos, FNextMarkupLogPos);
if not Result then begin
// the first run StartPos is set by GetNextHighlighterTokenFromView
if FCurMarkupState in [cmPastEOL, cmPastWrapEnd] then begin
if FTokenOrigin in [dtoAfterText, dtoAfterWrapped] then begin
ATokenInfo.StartPos := FCurMarkupNextStart
end
else
@ -427,13 +420,11 @@ begin
ATokenInfo.StartPos.Physical := FVirtualFirstCol;
end;
if (FCurMarkupState <> cmPastWrapEnd) then
FCurMarkupState := cmPastEOL;
Result := (ATokenInfo.StartPos.Physical < FVirtualLastCol);
if not Result then
exit;
assert((FNextMarkupPhysPos <= 0) or (FNextMarkupPhysPos > ATokenInfo.StartPos.Physical), 'FNextMarkupPhysPos > ATokenInfo.StartPos.Physical');
assert(FTokenOrigin in [dtoAfterText, dtoAfterWrapped], 'TLazSynPaintTokenBreaker.GetNextHighlighterTokenEx: FTokenOrigin in [dtoAfterText, dtoAfterWrapped]');
ATokenInfo.Tk.TokenStart := @Space[1];
ATokenInfo.Tk.TokenLength := 1;
@ -490,7 +481,7 @@ begin
FMarkupTokenAttr.CurrentEndX := ATokenInfo.EndPos;
end;
if FCurMarkupState = cmPastWrapEnd then
if FTokenOrigin = dtoAfterWrapped then
fMarkupManager.MergeMarkupAttributeAtWrapEnd(FCurTxtLineIdx + 1,
FWrapEndBound, FMarkupTokenAttr)
else
@ -541,15 +532,27 @@ function TLazSynPaintTokenBreaker.GetNextHighlighterTokenFromView(out
end;
function MaybeFetchToken: Boolean; inline;
var
CurTokenOrigin: TLazSynDisplayTokenOrigin;
begin
Result := FCurViewToken.TokenLength > 0;
if Result or (FCurViewToken.TokenLength < 0) then exit;
FCurViewCurTokenStartPos := FCurViewScannerPos;
CurTokenOrigin := FCurViewToken.TokenOrigin;
while FCurViewToken.TokenLength = 0 do begin // Todo: is SyncroEd-test a zero size token is returned
Result := FDisplayView.GetNextHighlighterToken(FCurViewToken);
if not Result then
if (not (CurTokenOrigin in [dtoAfterText, dtoAfterWrapped])) and
(FCurViewToken.TokenOrigin in [dtoAfterText, dtoAfterWrapped])
then
FWrapEndBound := FCurViewScannerPos;
if not Result then begin
FCurViewToken.TokenStart := nil;
FCurViewToken.TokenAttr := nil;
Result := Result and (FCurViewToken.TokenStart <> nil); // False for end of line token
FCurViewToken.TokenOrigin := dtoAfterText;
end
else
Result := Result and (FCurViewToken.TokenStart <> nil); // False for end of line token
if not Result then begin
FCurViewToken.TokenLength := -1;
exit;
@ -758,10 +761,18 @@ begin
ATokenInfo.Attr := nil;
while True do begin
Result := MaybeFetchToken; // Get token from View/Highlighter
FTokenOrigin := FCurViewToken.TokenOrigin;
if (FTokenOrigin in [{dtoAfterText,} dtoAfterWrapped]) and (APhysEnd >= 0) then begin
APhysEnd := MaxInt;
ALogEnd := MaxInt;
end;
if not Result then begin
ATokenInfo.StartPos := FCurViewScannerPos;
ATokenInfo.RtlInfo.IsRtl := False;
ATokenInfo.NextRtlInfo.IsRtl := False;
ATokenInfo.Tk := FCurViewToken;
if FCurViewToken.TokenAttr <> nil then begin
InitSynAttr(FCurViewAttr, FCurViewToken.TokenAttr, FCurViewCurTokenStartPos);
ATokenInfo.Attr := FCurViewAttr;

2
components/synedit/syneditfoldedview.pp
View File

@ -778,6 +778,7 @@ begin
inc(FLineState, 2); // LSTATE_BOL_GAP(2), if was at bol // LSTATE_GAP(3) otherwise
ATokenInfo.TokenStart := PChar(MarkSpaces);
ATokenInfo.TokenLength := 3;
ATokenInfo.TokenOrigin := dtoAfterText;
if Assigned(CurrentTokenHighlighter)
then EolAttr := CurrentTokenHighlighter.GetEndOfLineAttribute
else EolAttr := nil;
@ -798,6 +799,7 @@ begin
ATokenInfo.TokenStart := PChar(MarkDots);
ATokenInfo.TokenLength := 3;
ATokenInfo.TokenAttr := FTokenAttr;
ATokenInfo.TokenOrigin := dtoAfterText;
Result := True;
end;
else begin

7
components/synedit/synedittextbuffer.pp
View File

@ -399,13 +399,18 @@ end;
function TLazSynDisplayBuffer.GetNextHighlighterToken(out ATokenInfo: TLazSynDisplayTokenInfo): Boolean;
begin
Result := False;
ATokenInfo := Default(TLazSynDisplayTokenInfo);
if not Initialized then exit;
if CurrentTokenHighlighter = nil then begin
ATokenInfo.TokenOrigin := dtoAfterText;
Result := FAtLineStart;
if not Result then exit;
ATokenInfo.TokenStart := FBuffer.GetPChar(CurrentTokenLine, ATokenInfo.TokenLength);
Result := ATokenInfo.TokenLength > 0;
if not Result then exit;
ATokenInfo.TokenAttr := nil;
ATokenInfo.TokenOrigin := dtoVirtualText;
FAtLineStart := False;
end
else begin
@ -418,12 +423,14 @@ begin
ATokenInfo.TokenStart := nil;
ATokenInfo.TokenLength := 0;
ATokenInfo.TokenAttr := CurrentTokenHighlighter.GetEndOfLineAttribute;
ATokenInfo.TokenOrigin := dtoAfterText;
Result := ATokenInfo.TokenAttr <> nil;
exit;
end;
CurrentTokenHighlighter.GetTokenEx(ATokenInfo.TokenStart, ATokenInfo.TokenLength);
ATokenInfo.TokenAttr := CurrentTokenHighlighter.GetTokenAttribute;
ATokenInfo.TokenOrigin := dtoVirtualText;
CurrentTokenHighlighter.Next;
end;
end;

1
components/synedit/synedittexttrimmer.pas
View File

@ -345,6 +345,7 @@ begin
ATokenInfo.TokenStart := PChar(FTempLineStringForPChar);
ATokenInfo.TokenLength := length(FTempLineStringForPChar);
ATokenInfo.TokenAttr := nil;
ATokenInfo.TokenOrigin := dtoVirtualText;
FAtLineStart := False;
exit;
end;

19
components/synedit/syneditwrappedview.pp
View File

@ -180,7 +180,7 @@ type
private
FWrapPlugin: TLazSynEditLineWrapPlugin;
FCurSubLineLogStartIdx, FCurSubLineNextLogStartIdx: Integer;
FCurSubLineLogStartIdx, FCurSubLineNextLogStartIdx, FCurRealLineByteLen: Integer;
FCurSubLinePhysStartIdx, FPrevSubLinePhysWidth: Integer;
FCurToken: TLazSynDisplayTokenInfo;
FCurLineLogIdx: Integer;
@ -1496,7 +1496,7 @@ begin
IsNext := (AWrappedLine = FCurWrappedLine + 1) and (FCurWrappedLine >= 0);
PrevSub := FCurrentWrapSubline;
inherited SetHighlighterTokensLine(AWrappedLine, ARealLine, AStartBytePos, AStartPhysPos, ALineByteLen);
inherited SetHighlighterTokensLine(AWrappedLine, ARealLine, AStartBytePos, AStartPhysPos, FCurRealLineByteLen);
LineTxt := FLineMappingView.NextLines.Strings[ARealLine];
FLineMappingView.LogPhysConvertor.CurrentLine := ARealLine;
@ -1527,8 +1527,9 @@ var
PreStart: Integer;
begin
ATokenInfo := Default(TLazSynDisplayTokenInfo);
If FCurLineLogIdx >= FCurSubLineNextLogStartIdx then begin
Result := False;
If (FCurLineLogIdx >= FCurSubLineNextLogStartIdx) and (FCurSubLineNextLogStartIdx < FCurRealLineByteLen) then begin
ATokenInfo.TokenOrigin := dtoAfterWrapped;
Result := True; // TokenStart = nil => no text
exit;
end;
@ -1547,14 +1548,22 @@ begin
ATokenInfo.TokenStart := ATokenInfo.TokenStart + PreStart;
ATokenInfo.TokenLength := ATokenInfo.TokenLength - PreStart;
Result := ATokenInfo.TokenLength > 0;
if not Result then
if not Result then begin
ATokenInfo.TokenOrigin := dtoAfterWrapped;
Result := False;
exit;
end;
end;
If FCurLineLogIdx > FCurSubLineNextLogStartIdx then begin
ATokenInfo.TokenLength := ATokenInfo.TokenLength - (FCurLineLogIdx - FCurSubLineNextLogStartIdx);
Result := ATokenInfo.TokenLength > 0;
if not Result then begin
ATokenInfo.TokenOrigin := dtoAfterWrapped;
Result := False;
exit;
end;
end;
end;

1
components/synedit/test/testwordwrap.pas
View File

@ -1550,6 +1550,7 @@ begin
(* After "DoTestInit" each node should be filled to the max.
So the test knows where each node begins
*)
FTree.Free;
FTree := CreateTree(10, 30, 4); // APageJoinSize, APageSplitSize, APageJoinDistance
For OffsetAtStart := 0 to 3 do