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

MG: fixed bracket highlighting

Browse Source 
git-svn-id: trunk@1444 -
This commit is contained in:
lazarus 2002-02-17 21:54:46 +00:00
parent 4e0b340ade
commit e058ff76b9
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
components/synedit/synedit.pp
View File

@ -2394,6 +2394,11 @@ var
sToken: string; // highlighter token info sToken: string; // highlighter token info
nTokenPos, nTokenLen: integer; nTokenPos, nTokenLen: integer;
attr: TSynHighlighterAttributes; attr: TSynHighlighterAttributes;
{$IFDEF SYN_LAZARUS}
BracketChar: char;
BracketFGCol, BracketBGCol: TColor;
BracketStyle: TFontStyles;
{$ENDIF}
begin begin
// Initialize rcLine for drawing. Note that Top and Bottom are updated // Initialize rcLine for drawing. Note that Top and Bottom are updated
// inside the loop. Get only the starting point for this. // inside the loop. Get only the starting point for this.
@ -2527,12 +2532,47 @@ var
Font.Style); Font.Style);
end else begin end else begin
// Bracket Highlighting // Bracket Highlighting
if Assigned(attr) then if Assigned(attr) then begin
AddHighlightToken(sToken, nTokenPos, nTokenLen, attr.Foreground, BracketFGCol:=attr.Foreground;
attr.Background, attr.Style+[fsBold]) BracketBGCol:=attr.Background;
else BracketStyle:=attr.Style;
AddHighlightToken(sToken, nTokenPos, nTokenLen, colFG, colBG, end else begin
Font.Style+[fsBold]); BracketFGCol:=colFG;
BracketBGCol:=colBG;
BracketStyle:=Font.Style;
end;
if ((nTokenPos=nBracketX) and (nLine=nBracketY))
or ((nTokenPos=nAntiBracketX) and (nLine=nAntiBracketY)) then
begin
// bracket at start
// draw the bracket bold
AddHighlightToken(sToken[1], nTokenPos, 1,
BracketFGCol, BracketBGCol, BracketStyle+[fsBold]);
System.Delete(sToken,1,1);
dec(nTokenLen);
inc(nTokenPos);
end;
if (nTokenLen>0) then begin
// draw the rest
if ((nTokenPos+nTokenLen-1=nBracketX) and (nLine=nBracketY))
or ((nTokenPos+nTokenLen-1=nAntiBracketX)
and (nLine=nAntiBracketY)) then
begin
// bracket at end
BracketChar:=sToken[nTokenLen];
System.Delete(sToken,nTokenLen,1);
dec(nTokenLen);
AddHighlightToken(sToken, nTokenPos, nTokenLen,
BracketFGCol, BracketBGCol, BracketStyle);
inc(nTokenPos,nTokenLen);
AddHighlightToken(BracketChar, nTokenPos, 1,
BracketFGCol, BracketBGCol, BracketStyle+[fsBold]);
end else begin
// draw rest
AddHighlightToken(sToken,nTokenPos,nTokenLen,BracketFGCol,
BracketBGCol, BracketStyle)
end;
end;
end; end;
{$ELSE} {$ELSE}
if Assigned(attr) then if Assigned(attr) then

2
ide/editoroptions.pp
View File

@ -706,7 +706,7 @@ begin
SynClass:=LazSyntaxHighlighterClasses[TheType]; SynClass:=LazSyntaxHighlighterClasses[TheType];
FileExtensions:='pp;pas;inc;lpr;lrs;dpr;dpk'; FileExtensions:='pp;pas;inc;lpr;lrs;dpr;dpk';
SampleSource:= SampleSource:=
' { Comment }'#13+ '{ Comment }'#13+
'{$R- compiler directive}'#13+ '{$R- compiler directive}'#13+
'procedure TForm1.Button1Click(Sender: TObject);'#13+ 'procedure TForm1.Button1Click(Sender: TObject);'#13+
'var // Delphi Comment'#13+ 'var // Delphi Comment'#13+